null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix recents not persisting query when moving app to background/foreground

Browse source 
The method I added for debug bugs breaks this so making it exclusive to that
This commit is contained in:
Jays2Kings 2021-09-15 12:23:34 -04:00
parent 7faa67687d
commit a71ee947dd
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
View file

@ -25,6 +25,7 @@ import com.google.android.material.snackbar.BaseTransientBottomBar
import com.google.android.material.snackbar.Snackbar
import com.google.android.material.tabs.TabLayout
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.backup.BackupRestoreService
import eu.kanade.tachiyomi.data.database.models.History
@ -454,17 +455,19 @@ class RecentsController(bundle: Bundle? = null) :
setBottomPadding()
binding.downloadBottomSheet.dlBottomSheet.update()
val searchItem =
(activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
val searchView = searchItem?.actionView as? SearchView ?: return
if (router.backstack.lastOrNull()?.controller != this) return
setOnQueryTextChangeListener(searchView) {
if (query != it) {
query = it ?: return@setOnQueryTextChangeListener false
resetProgressItem()
refresh()
if (BuildConfig.DEBUG && query.isBlank()) {
val searchItem =
(activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
val searchView = searchItem?.actionView as? SearchView ?: return
if (router.backstack.lastOrNull()?.controller != this) return
setOnQueryTextChangeListener(searchView) {
if (query != it) {
query = it ?: return@setOnQueryTextChangeListener false
resetProgressItem()
refresh()
}
true
}
true
}
}

14
app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt
View file

@ -18,6 +18,7 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.snackbar.Snackbar
import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.davidea.flexibleadapter.items.IFlexible
import eu.kanade.tachiyomi.BuildConfig
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.preference.PreferencesHelper
@ -465,11 +466,14 @@ open class BrowseSourceController(bundle: Bundle) :
override fun onActivityResumed(activity: Activity) {
super.onActivityResumed(activity)
val searchItem = (activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
val searchView = searchItem?.actionView as? SearchView ?: return
setOnQueryTextChangeListener(searchView, onlyOnSubmit = true, hideKbOnSubmit = false) {
searchWithQuery(it ?: "")
true
if (BuildConfig.DEBUG && presenter.query.isBlank()) {
val searchItem =
(activity as? MainActivity)?.binding?.cardToolbar?.menu?.findItem(R.id.action_search)
val searchView = searchItem?.actionView as? SearchView ?: return
setOnQueryTextChangeListener(searchView, onlyOnSubmit = true, hideKbOnSubmit = false) {
searchWithQuery(it ?: "")
true
}
}
}