From 8771956e4b28c235004baef14ad1db062519ecd1 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Sat, 24 Aug 2024 16:19:04 +0100 Subject: [PATCH] Fix: Fixed back button from breaking Signed-off-by: HeCodes2Much --- .../launcher/ui/activities/MainActivity.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt index da8256f..84602ad 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt @@ -18,6 +18,7 @@ import android.os.Looper import android.view.Menu import android.view.MenuItem import android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS +import androidx.activity.OnBackPressedCallback import androidx.activity.viewModels import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity @@ -214,6 +215,12 @@ class MainActivity : AppCompatActivity() { // Retrieve the NavController val navController = navHostFragment.navController appBarConfiguration = AppBarConfiguration(navController.graph) + + onBackPressedDispatcher.addCallback(this, object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + backToHomeScreen() + } + }) } @SuppressLint("SourceLockedOrientationActivity") @@ -259,13 +266,6 @@ class MainActivity : AppCompatActivity() { super.onUserLeaveHint() } - @Deprecated("Deprecated in Java") - override fun onBackPressed() { - backToHomeScreen() - @Suppress("DEPRECATION") - super.onBackPressed() - } - private fun backToHomeScreen() { navController = findNavController(R.id.nav_host_fragment_content_main) if (navController.currentDestination?.id != R.id.HomeFragment)