changed bottom navigation return behavior

DroidKaigi · Sep 14, 2023 · f3de5cd · f3de5cd
1 parent 9c76e6b
commit f3de5cd
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/feature/about/src/main/java/io/github/droidkaigi/confsched2023/about/AboutScreen.kt b/feature/about/src/main/java/io/github/droidkaigi/confsched2023/about/AboutScreen.kt
@@ -23,6 +23,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.font.FontWeight
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import io.github.droidkaigi.confsched2023.about.component.AboutDroidKaigiDetail
@@ -49,6 +50,9 @@ fun NavGraphBuilder.nestedAboutScreen(
 
 fun NavController.navigateAboutScreen() {
     navigate(aboutScreenRoute) {
+        popUpTo(id = graph.findStartDestination().id) {
+            saveState = true
+        }
         launchSingleTop = true
         restoreState = true
     }

diff --git a/...ments/src/main/java/io/github/droidkaigi/confsched2023/achievements/AchievementsScreen.kt b/...ments/src/main/java/io/github/droidkaigi/confsched2023/achievements/AchievementsScreen.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import io.github.droidkaigi.confsched2023.achievements.section.AchievementList
@@ -55,6 +56,9 @@ fun NavGraphBuilder.nestedAchievementsScreen(
 
 fun NavController.navigateAchievementsScreen() {
     navigate(achievementsScreenRoute) {
+        popUpTo(id = graph.findStartDestination().id) {
+            saveState = true
+        }
         launchSingleTop = true
         restoreState = true
     }

diff --git a/...ure/floor-map/src/main/java/io/github/droidkaigi/confsched2023/floormap/FloorMapScreen.kt b/...ure/floor-map/src/main/java/io/github/droidkaigi/confsched2023/floormap/FloorMapScreen.kt
@@ -47,6 +47,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import io.github.droidkaigi.confsched2023.designsystem.preview.MultiLanguagePreviews
@@ -83,6 +84,9 @@ fun NavGraphBuilder.nestedFloorMapScreen(
 
 fun NavController.navigateFloorMapScreen() {
     navigate(floorMapScreenRoute) {
+        popUpTo(id = graph.findStartDestination().id) {
+            saveState = true
+        }
         launchSingleTop = true
         restoreState = true
     }

diff --git a/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt b/...ure/sessions/src/main/java/io/github/droidkaigi/confsched2023/sessions/TimetableScreen.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavController
+import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
 import io.github.droidkaigi.confsched2023.designsystem.preview.MultiThemePreviews
@@ -74,6 +75,9 @@ fun NavGraphBuilder.nestedSessionScreens(
 
 fun NavController.navigateTimetableScreen() {
     navigate(timetableScreenRoute) {
+        popUpTo(id = graph.findStartDestination().id) {
+            saveState = true
+        }
         launchSingleTop = true
         restoreState = true
     }