diff options
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | 9 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 10 |
2 files changed, 13 insertions, 6 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt index 27f959cf..1a96601d 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt @@ -56,7 +56,7 @@ import com.pitchedapps.frost.fragments.WebFragment import com.pitchedapps.frost.parsers.SearchParser import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.utils.iab.FrostBilling -import com.pitchedapps.frost.utils.iab.IABMain +import com.pitchedapps.frost.utils.iab.IabMain import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import com.pitchedapps.frost.views.BadgedIcon import com.pitchedapps.frost.views.FrostViewPager @@ -71,7 +71,7 @@ import java.util.concurrent.TimeUnit class MainActivity : BaseActivity(), ActivityWebContract, FileChooserContract by FileChooserDelegate(), - FrostBilling by IABMain() { + FrostBilling by IabMain() { lateinit var adapter: SectionsPagerAdapter val toolbar: Toolbar by bindView(R.id.toolbar) @@ -92,7 +92,7 @@ class MainActivity : BaseActivity(), field = value } var searchView: SearchView? = null - val searchViewCache = mutableMapOf<String, List<SearchItem>>() + private val searchViewCache = mutableMapOf<String, List<SearchItem>>() companion object { const val ACTIVITY_SETTINGS = 97 @@ -343,7 +343,8 @@ class MainActivity : BaseActivity(), else doAsync { val data = SearchParser.query(query) ?: return@doAsync - val items = data.map { SearchItem(it.href, it.title, it.description) } + val items = data.map { SearchItem(it.href, it.title, it.description) }.toMutableList() + items.add(SearchItem("${FbItem.SEARCH.url}?q=$query", string(R.string.show_all_results), iicon = null)) searchViewCache.put(query, items) uiThread { searchView?.results = items } } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt index 0e0599bf..0511a74f 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -22,14 +22,14 @@ import com.pitchedapps.frost.enums.Support import com.pitchedapps.frost.settings.* import com.pitchedapps.frost.utils.* import com.pitchedapps.frost.utils.iab.FrostBilling -import com.pitchedapps.frost.utils.iab.IABSettings import com.pitchedapps.frost.utils.iab.IS_FROST_PRO +import com.pitchedapps.frost.utils.iab.IabSettings /** * Created by Allan Wang on 2017-06-06. */ -class SettingsActivity : KPrefActivity(), FrostBilling by IABSettings() { +class SettingsActivity : KPrefActivity(), FrostBilling by IabSettings() { var resultFlag = Activity.RESULT_CANCELED @@ -114,6 +114,12 @@ class SettingsActivity : KPrefActivity(), FrostBilling by IABSettings() { onClick = { _, _, _ -> startActivityForResult(AboutActivity::class.java, 9, true); true } } + plainText(R.string.help_translate) { + descRes = R.string.help_translate_desc + iicon = GoogleMaterial.Icon.gmd_translate + onClick = { _, _, _ -> startLink(R.string.translation_url); true } + } + plainText(R.string.replay_intro) { iicon = GoogleMaterial.Icon.gmd_replay onClick = { _, _, _ -> launchIntroActivity(cookies()); true } |