From 1fe46ef475b92e2b1a8e920008b461f90ef3be03 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Wed, 7 Apr 2021 18:29:31 -0400 Subject: [PATCH] Fix back closing the app when dl/extensions sheet is still expanding up --- .../java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt | 2 +- .../main/java/eu/kanade/tachiyomi/ui/source/BrowseController.kt | 2 +- 2 files changed, 2 insertions(+), 2 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 c6de61a478..e876eb2452 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 @@ -276,7 +276,7 @@ class RecentsController(bundle: Bundle? = null) : } override fun handleSheetBack(): Boolean { - if (binding.downloadBottomSheet.dlBottomSheet.sheetBehavior?.state == BottomSheetBehavior.STATE_EXPANDED) { + if (showingDownloads) { binding.downloadBottomSheet.dlBottomSheet.dismiss() return true } 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 63f464ebb0..ebed292c17 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 @@ -318,7 +318,7 @@ class BrowseController : override fun sheetIsExpanded(): Boolean = binding.bottomSheet.root.sheetBehavior.isExpanded() override fun handleSheetBack(): Boolean { - if (!binding.bottomSheet.root.sheetBehavior.isCollapsed()) { + if (showingExtensions) { if (binding.bottomSheet.root.canGoBack()) { binding.bottomSheet.root.sheetBehavior?.collapse() }