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 to the search toolbar in search activity

Browse source
This commit is contained in:
Jays2Kings 2022-04-22 12:25:46 -04:00
parent 59e83f3e91
commit 1657a088ef
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/src/main/java/eu/kanade/tachiyomi/ui/main/SearchActivity.kt
View file

@ -32,9 +32,17 @@ class SearchActivity : MainActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding.toolbar.navigationIcon = backDrawable
binding.searchToolbar.navigationIcon = backDrawable
binding.toolbar.setNavigationOnClickListener { popToRoot() }
binding.searchToolbar.setNavigationOnClickListener { popToRoot() }
binding.searchToolbar.setNavigationOnClickListener {
val rootSearchController = router.backstack.lastOrNull()?.controller
if ((
rootSearchController is RootSearchInterface ||
(currentToolbar != binding.searchToolbar && binding.appBar.useLargeToolbar)
) && rootSearchController !is SmallToolbarInterface
) {
binding.searchToolbar.menu.findItem(R.id.action_search)?.expandActionView()
} else popToRoot()
}
(router.backstack.lastOrNull()?.controller as? BaseController<*>)?.setTitle()
(router.backstack.lastOrNull()?.controller as? SettingsController)?.setTitle()
}
@ -68,16 +76,12 @@ class SearchActivity : MainActivity() {
override fun setFloatingToolbar(show: Boolean, solidBG: Boolean, changeBG: Boolean, showSearchAnyway: Boolean) {
super.setFloatingToolbar(show, solidBG, changeBG, showSearchAnyway)
binding.toolbar.setNavigationOnClickListener { popToRoot() }
binding.searchToolbar.setNavigationOnClickListener {
val rootSearchController = router.backstack.lastOrNull()?.controller
if ((
rootSearchController is RootSearchInterface ||
(currentToolbar != binding.searchToolbar && binding.appBar.useLargeToolbar)
) && rootSearchController !is SmallToolbarInterface
) {
binding.searchToolbar.menu.findItem(R.id.action_search)?.expandActionView()
} else popToRoot()
val useLargeTB = binding.appBar.useLargeToolbar
if (!useLargeTB) {
binding.searchToolbar.navigationIcon = backDrawable
} else if (showSearchAnyway) {
binding.searchToolbar.navigationIcon =
if (!show) searchDrawable else backDrawable
}
}
@ -93,10 +97,6 @@ class SearchActivity : MainActivity() {
if (from is DialogController || to is DialogController) {
return
}
setFloatingToolbar(canShowFloatingToolbar(to))
binding.searchToolbar.navigationIcon = if (binding.appBar.useLargeToolbar) searchDrawable else backDrawable
binding.toolbar.navigationIcon = backDrawable
nav.isVisible = false
binding.bottomView?.isVisible = false
}