From abc2fb0e40f461615adb022dbed16ca426061ee3 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Mon, 7 Mar 2022 15:38:43 +0200 Subject: [PATCH] Hide FAB on search suggestions --- .../org/koitharu/kotatsu/main/ui/MainActivity.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt index c1ed3e274..3d9332627 100644 --- a/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt +++ b/app/src/main/java/org/koitharu/kotatsu/main/ui/MainActivity.kt @@ -42,8 +42,8 @@ import org.koitharu.kotatsu.history.ui.HistoryListFragment import org.koitharu.kotatsu.local.ui.LocalListFragment import org.koitharu.kotatsu.reader.ui.ReaderActivity import org.koitharu.kotatsu.remotelist.ui.RemoteListFragment -import org.koitharu.kotatsu.search.ui.SearchActivity import org.koitharu.kotatsu.search.ui.MangaListActivity +import org.koitharu.kotatsu.search.ui.SearchActivity import org.koitharu.kotatsu.search.ui.global.GlobalSearchActivity import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionFragment import org.koitharu.kotatsu.search.ui.suggestion.SearchSuggestionListener @@ -358,17 +358,19 @@ class MainActivity : BaseActivity(), supportFragmentManager.beginTransaction() .replace(R.id.container, fragment, TAG_PRIMARY) .commit() - if (fragment is HistoryListFragment) binding.fab.show() else binding.fab.hide() + adjustFabVisibility(topFragment = fragment) } private fun onSearchOpened() { binding.drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) drawerToggle.isDrawerIndicatorEnabled = false + adjustFabVisibility(isSearchOpened = true) } private fun onSearchClosed() { binding.drawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED) drawerToggle.isDrawerIndicatorEnabled = true + adjustFabVisibility(isSearchOpened = false) } private fun onFirstStart() { @@ -383,4 +385,11 @@ class MainActivity : BaseActivity(), } } } + + private fun adjustFabVisibility( + topFragment: Fragment? = supportFragmentManager.findFragmentByTag(TAG_PRIMARY), + isSearchOpened: Boolean = supportFragmentManager.findFragmentByTag(TAG_SEARCH)?.isVisible == true, + ) { + if (!isSearchOpened && topFragment is HistoryListFragment) binding.fab.show() else binding.fab.hide() + } } \ No newline at end of file