From ec3a88dc5790fe66809664496c10c23ada96ded5 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Wed, 12 Jun 2024 14:35:03 +0100 Subject: [PATCH] Fix: Fixed the way the app is navigated. Signed-off-by: HeCodes2Much --- .../launcher/ui/activities/MainActivity.kt | 8 ++++---- .../droidworksstudio/launcher/ui/drawer/DrawFragment.kt | 4 ++-- .../launcher/ui/favorite/FavoriteFragment.kt | 4 ++-- .../droidworksstudio/launcher/ui/hidden/HiddenFragment.kt | 4 ++-- .../launcher/ui/settings/SettingsFragment.kt | 4 ++-- .../launcher/ui/widgets/WidgetFragment.kt | 4 ++-- .../launcher/ui/widgets/settings/SettingsFragment.kt | 4 ++-- 7 files changed, 16 insertions(+), 16 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 c1a0bf7..5edfda2 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 @@ -35,7 +35,7 @@ import androidx.navigation.NavController import androidx.navigation.findNavController import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.AppBarConfiguration -import androidx.navigation.ui.popBackStack +import androidx.navigation.ui.navigateUp import com.github.droidworksstudio.common.hasInternetPermission import com.github.droidworksstudio.common.isTablet import com.github.droidworksstudio.common.showLongToast @@ -275,10 +275,10 @@ class MainActivity : AppCompatActivity(), LocationListener { } } - override fun onSupportpopBackStack(): Boolean { + override fun onSupportNavigateUp(): Boolean { val navController = findNavController(R.id.nav_host_fragment_content_main) - return navController.popBackStack(appBarConfiguration) - || super.onSupportpopBackStack() + return navController.navigateUp(appBarConfiguration) + || super.onSupportNavigateUp() } @RequiresApi(Build.VERSION_CODES.R) diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt index 754e4ba..99f2d6e 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt @@ -160,12 +160,12 @@ class DrawFragment : Fragment(), return object : OnSwipeTouchListener(context) { override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } } } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt index 78a6504..782cd5b 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt @@ -189,12 +189,12 @@ class FavoriteFragment : Fragment(), return object : OnSwipeTouchListener(context) { override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } } } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt index 075d50c..818b707 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt @@ -106,12 +106,12 @@ class HiddenFragment : Fragment(), return object : OnSwipeTouchListener(context) { override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } } } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt index 7ceba8f..380cbd1 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt @@ -240,12 +240,12 @@ class SettingsFragment : Fragment(), return object : OnSwipeTouchListener(context) { override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt index 3cc794f..3a10c1e 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt @@ -369,12 +369,12 @@ class WidgetFragment : Fragment(), override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } } } diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/settings/SettingsFragment.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/settings/SettingsFragment.kt index edb5330..ec61040 100644 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/settings/SettingsFragment.kt +++ b/app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/settings/SettingsFragment.kt @@ -123,12 +123,12 @@ class SettingsFragment : Fragment(), return object : OnSwipeTouchListener(context) { override fun onSwipeLeft() { super.onSwipeLeft() - findNavController().popBackStack() + findNavController().navigateUp() } override fun onSwipeRight() { super.onSwipeRight() - findNavController().popBackStack() + findNavController().navigateUp() } }