0.3.0 - Filtering and Better Scales

app/src/main/java/com/atridad/openclimb/ui/OpenClimbApp.kt

@@ -28,7 +28,6 @@ fun OpenClimbApp() {
     val navController = rememberNavController()
     val context = LocalContext.current
     val currentBackStackEntry by navController.currentBackStackEntryAsState()
-    val currentDestination = currentBackStackEntry?.destination?.route
     
     val database = remember { OpenClimbDatabase.getDatabase(context) }
     val repository = remember { ClimbRepository(database, context) }
@@ -247,17 +246,15 @@ fun OpenClimbBottomNavigation(navController: NavHostController) {
                 selected = isSelected,
                 onClick = {
                     navController.navigate(item.screen) {
-                        // Pop up to the start destination of the graph to
-                        // avoid building up a large stack of destinations
-                        // on the back stack as users select items
-                        popUpTo(Screen.Sessions) {
-                            saveState = true
+                        // Clear the entire back stack and go to the selected tab's root screen
+                        popUpTo(0) {
+                            inclusive = true
                         }
                         // Avoid multiple copies of the same destination when
                         // reselecting the same item
                         launchSingleTop = true
-                        // Restore state when reselecting a previously selected item
-                        restoreState = true
+                        // Don't restore state - always start fresh when switching tabs
+                        restoreState = false
                     }
                 }
             )