diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-14 00:07:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-14 00:07:42 -0400 |
| commit | a4b3e990228c90c53eaf3ca1424a1e5f6d582d07 (patch) | |
| tree | 84e13c141485df3c527ce0d70d48ab1106978fd8 /app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | |
| parent | cf52d0f875c2c50a87143872a125966bfe23a0ad (diff) | |
| download | frost-a4b3e990228c90c53eaf3ca1424a1e5f6d582d07.tar.gz frost-a4b3e990228c90c53eaf3ca1424a1e5f6d582d07.tar.bz2 frost-a4b3e990228c90c53eaf3ca1424a1e5f6d582d07.zip | |
V1.5.8 (#410)v1.5.8
* Add show all to searchview
* Remove web search view
* Update kau
* Add translation links
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | 9 |
1 files changed, 5 insertions, 4 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 } } |