From f6f236e1d9dfab3e7ca0ed2d0748be3529a940af Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 7 May 2021 23:16:51 -0400 Subject: [PATCH] Fix floating toolbar showing on some screens while bottom sheet is collapsing --- .../eu/kanade/tachiyomi/ui/recents/RecentsController.kt | 6 ++++-- .../eu/kanade/tachiyomi/ui/source/BrowseController.kt | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt index 39e207f0db..7e3145c34d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt @@ -333,8 +333,10 @@ class RecentsController(bundle: Bundle? = null) : } fun updateTitleAndMenu() { - (activity as? MainActivity)?.setFloatingToolbar(!showingDownloads, true) - setTitle() + if (router.backstack.lastOrNull()?.controller == this) { + (activity as? MainActivity)?.setFloatingToolbar(!showingDownloads, true) + setTitle() + } } private fun setBottomPadding() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt index 81750b587e..3cad5ebc18 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt @@ -229,9 +229,11 @@ class BrowseController : } fun updateTitleAndMenu() { - (activity as? MainActivity)?.setFloatingToolbar(!showingExtensions) - activity?.invalidateOptionsMenu() - setTitle() + if (router.backstack.lastOrNull()?.controller == this) { + (activity as? MainActivity)?.setFloatingToolbar(!showingExtensions) + activity?.invalidateOptionsMenu() + setTitle() + } } fun setBottomSheetTabs(progress: Float) {