jonas/EasyLauncher
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 6 Wiki Activity

Fix: Fixed the way the app is navigated.

Browse Source 
Signed-off-by: HeCodes2Much <wayne6324@gmail.com>
This commit is contained in:
HeCodes2Much
2024-06-12 14:35:03 +01:00
parent 63465c088e
commit ec3a88dc57
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/MainActivity.kt
View File

@@ -35,7 +35,7 @@ import androidx.navigation.NavController
import androidx.navigation.findNavController import androidx.navigation.findNavController
import androidx.navigation.fragment.NavHostFragment import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.ui.AppBarConfiguration 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.hasInternetPermission
import com.github.droidworksstudio.common.isTablet import com.github.droidworksstudio.common.isTablet
import com.github.droidworksstudio.common.showLongToast 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) val navController = findNavController(R.id.nav_host_fragment_content_main)
return navController.popBackStack(appBarConfiguration) return navController.navigateUp(appBarConfiguration)
|| super.onSupportpopBackStack() || super.onSupportNavigateUp()
} }
@RequiresApi(Build.VERSION_CODES.R) @RequiresApi(Build.VERSION_CODES.R)

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/drawer/DrawFragment.kt
View File

@@ -160,12 +160,12 @@ class DrawFragment : Fragment(),
return object : OnSwipeTouchListener(context) { return object : OnSwipeTouchListener(context) {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }
} }

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/favorite/FavoriteFragment.kt
View File

@@ -189,12 +189,12 @@ class FavoriteFragment : Fragment(),
return object : OnSwipeTouchListener(context) { return object : OnSwipeTouchListener(context) {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }
} }

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/hidden/HiddenFragment.kt
View File

@@ -106,12 +106,12 @@ class HiddenFragment : Fragment(),
return object : OnSwipeTouchListener(context) { return object : OnSwipeTouchListener(context) {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }
} }

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/settings/SettingsFragment.kt
View File

@@ -240,12 +240,12 @@ class SettingsFragment : Fragment(),
return object : OnSwipeTouchListener(context) { return object : OnSwipeTouchListener(context) {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/WidgetFragment.kt
View File

@@ -369,12 +369,12 @@ class WidgetFragment : Fragment(),
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }
} }

4
app/src/main/java/com/github/droidworksstudio/launcher/ui/widgets/settings/SettingsFragment.kt
View File

@@ -123,12 +123,12 @@ class SettingsFragment : Fragment(),
return object : OnSwipeTouchListener(context) { return object : OnSwipeTouchListener(context) {
override fun onSwipeLeft() { override fun onSwipeLeft() {
super.onSwipeLeft() super.onSwipeLeft()
findNavController().popBackStack() findNavController().navigateUp()
} }
override fun onSwipeRight() { override fun onSwipeRight() {
super.onSwipeRight() super.onSwipeRight()
findNavController().popBackStack() findNavController().navigateUp()
} }
} }