From 797f0eb2b053f7f32b6783b8934aba14e8c13118 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 20 Apr 2023 11:47:27 +0530 Subject: [PATCH] Rework exit logic - If drawer is open, always close it first (existing) - If drawer is closed, quick exit is enabled, close the app (only on apps, games or updates fragment) - If drawer is closed, quick exit is disabled, ask to press back twice (existing) Signed-off-by: Aayush Gupta --- app/src/main/java/com/aurora/store/MainActivity.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt index 50a911929..7d6fc409d 100644 --- a/app/src/main/java/com/aurora/store/MainActivity.kt +++ b/app/src/main/java/com/aurora/store/MainActivity.kt @@ -213,12 +213,11 @@ class MainActivity : BaseActivity() { return navController.navigateUp() } + @Deprecated("Deprecated in Java") override fun onBackPressed() { - if (B.drawerLayout.isDrawerOpen(GravityCompat.START)) { - B.drawerLayout.close() - } else if (!navController.navigateUp()) { + if (!B.drawerLayout.isDrawerOpen(GravityCompat.START)) { if (Preferences.getBoolean(this, Preferences.PREFERENCE_QUICK_EXIT)) { - super.onBackPressed() + this.finish() } else { if (lastBackPressed + 1000 > System.currentTimeMillis()) { super.onBackPressed() @@ -227,6 +226,8 @@ class MainActivity : BaseActivity() { Toast.makeText(this, getString(R.string.toast_double_press_to_exit), Toast.LENGTH_SHORT).show() } } + } else { + B.drawerLayout.close() } }