From 3abbca2bdd5634a758b63144df14c8dc2c626033 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sat, 21 May 2022 14:04:15 -0400 Subject: [PATCH] Fix not being able to back out of search activities --- .../eu/kanade/tachiyomi/ui/main/MainActivity.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index b69c3ab800..6b86fdf960 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -395,10 +395,12 @@ open class MainActivity : BaseActivity(), DownloadServiceLi binding.appBar.y = 0f binding.appBar.updateAppBarAfterY(controller?.mainRecyclerView) } - (controller as? BaseController<*>)?.onActionViewExpand(item) - (controller as? SettingsController)?.onActionViewExpand(item) binding.searchToolbar.menu.forEach { it.isVisible = false } - lifecycleScope.launchUI { reEnableBackPressedCallBack() } + lifecycleScope.launchUI { + (controller as? BaseController<*>)?.onActionViewExpand(item) + (controller as? SettingsController)?.onActionViewExpand(item) + reEnableBackPressedCallBack() + } return true } @@ -407,9 +409,11 @@ open class MainActivity : BaseActivity(), DownloadServiceLi binding.appBar.compactSearchMode = false controller?.mainRecyclerView?.requestApplyInsets() setupSearchTBMenu(binding.toolbar.menu, true) - (controller as? BaseController<*>)?.onActionViewCollapse(item) - (controller as? SettingsController)?.onActionViewCollapse(item) - lifecycleScope.launchUI { reEnableBackPressedCallBack() } + lifecycleScope.launchUI { + (controller as? BaseController<*>)?.onActionViewCollapse(item) + (controller as? SettingsController)?.onActionViewCollapse(item) + reEnableBackPressedCallBack() + } return true } },