diff options
| author | Allan Wang <me@allanwang.ca> | 2017-10-25 12:41:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 12:41:05 -0400 |
| commit | e04487f5b1a4c6a5999db8d9746a07919ae9a333 (patch) | |
| tree | 4a60e9369dbb957c0f47f6052510433bc9d37e01 /app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt | |
| parent | 2d6b790643078b9b5ff2869c74dc941212087864 (diff) | |
| download | frost-e04487f5b1a4c6a5999db8d9746a07919ae9a333.tar.gz frost-e04487f5b1a4c6a5999db8d9746a07919ae9a333.tar.bz2 frost-e04487f5b1a4c6a5999db8d9746a07919ae9a333.zip | |
Update search logic (#444)
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 | 7 |
1 files changed, 4 insertions, 3 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 b6232272..a346e809 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/MainActivity.kt @@ -56,8 +56,8 @@ 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.IS_FROST_PRO +import com.pitchedapps.frost.utils.iab.IabMain import com.pitchedapps.frost.views.BadgedIcon import com.pitchedapps.frost.views.FrostVideoViewer import com.pitchedapps.frost.views.FrostViewPager @@ -355,13 +355,14 @@ class MainActivity : BaseActivity(), doAsync { val data = SearchParser.query(query) ?: return@doAsync 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)) + if (items.isNotEmpty()) + items.add(SearchItem("${FbItem._SEARCH.url}?q=$query", string(R.string.show_all_results), iicon = null)) searchViewCache.put(query, items) uiThread { searchView?.results = items } } } textDebounceInterval = 300 - searchCallback = { query, _ -> launchWebOverlay("${FbItem.SEARCH.url}/?q=$query"); true } + searchCallback = { query, _ -> launchWebOverlay("${FbItem._SEARCH.url}/?q=$query"); true } closeListener = { _ -> searchViewCache.clear() } foregroundColor = Prefs.textColor backgroundColor = Prefs.bgColor.withMinAlpha(200) |