From 5322c3c4b1c118f7d453b2884bd5acd0fc1d9d39 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Fri, 14 Apr 2023 23:40:01 -0400 Subject: [PATCH] refactor MainActivity.pressingBack --- .../kanade/tachiyomi/ui/main/MainActivity.kt | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 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 a5a3f81db3..66629531f1 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 @@ -950,23 +950,17 @@ open class MainActivity : BaseActivity(), DownloadServiceLi } private fun pressingBack() { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { - val insets = window.decorView.rootWindowInsets - if (insets?.isVisible(WindowInsetsCompat.Type.ime()) == true) { - val vic = WindowInsetsControllerCompat(window, binding.root) - vic.hide(WindowInsetsCompat.Type.ime()) - return - } - } - if (actionMode != null) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && + window.decorView.rootWindowInsets?.isVisible(WindowInsetsCompat.Type.ime()) == true + ) { + WindowInsetsControllerCompat(window, binding.root).hide(WindowInsetsCompat.Type.ime()) + } else if (actionMode != null) { actionMode?.finish() - return - } - if (binding.searchToolbar.hasExpandedActionView() && binding.cardFrame.isVisible) { + } else if (binding.searchToolbar.hasExpandedActionView() && binding.cardFrame.isVisible) { binding.searchToolbar.collapseActionView() - return + } else { + backPress() } - backPress() } override fun finish() {