Fix navigation refresh issues: Preserve screen state and ViewModel data across navigation

Author: code3-dev

.kotlin/sessions/kotlin-compiler-11380051393043603248.salive

@@ -1,6 +1,8 @@
 package com.pira.ccloud.navigation
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -14,6 +16,9 @@ import com.pira.ccloud.screens.SingleMovieScreen
 import com.pira.ccloud.screens.SingleSeriesScreen
 import com.pira.ccloud.screens.SplashScreen
 import com.pira.ccloud.screens.FavoritesScreen
+import com.pira.ccloud.ui.movies.MoviesViewModel
+import com.pira.ccloud.ui.search.SearchViewModel
+import com.pira.ccloud.ui.series.SeriesViewModel
 import com.pira.ccloud.ui.theme.ThemeSettings
 import com.pira.ccloud.ui.theme.ThemeManager
 import androidx.compose.ui.platform.LocalContext
@@ -27,6 +32,11 @@ fun AppNavigation(
     val themeManager = ThemeManager(context)
     val themeSettings = themeManager.loadThemeSettings()
 
+    // Create ViewModels here to preserve their state across navigation
+    val moviesViewModel = viewModel<MoviesViewModel>()
+    val seriesViewModel = viewModel<SeriesViewModel>()
+    val searchViewModel = viewModel<SearchViewModel>()
+    
     NavHost(
         navController = navController,
         startDestination = AppScreens.Splash.route
@@ -49,13 +59,13 @@ fun AppNavigation(
         }
 
         composable(route = AppScreens.Movies.route) {
-            MoviesScreen(navController = navController)
+            MoviesScreen(viewModel = moviesViewModel, navController = navController)
         }
         composable(route = AppScreens.Series.route) {
-            SeriesScreen(navController = navController)
+            SeriesScreen(viewModel = seriesViewModel, navController = navController)
         }
         composable(route = AppScreens.Search.route) {
-            SearchScreen(navController = navController)
+            SearchScreen(viewModel = searchViewModel, navController = navController)
         }
         composable(route = AppScreens.Settings.route) {
             SettingsScreen(onThemeSettingsChanged, navController)

app/src/main/java/com/pira/ccloud/navigation/AppNavigation.kt

@@ -29,6 +29,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.NavGraph.Companion.findStartDestination
 
 @Composable
 fun BottomNavigationBar(navController: NavController) {
@@ -110,6 +111,10 @@ fun BottomNavigationBar(navController: NavController) {
                             launchSingleTop = true
                             // Restore state when reselecting a previously selected item
                             restoreState = true
+                            // Pop up to the current destination to avoid building up a large stack
+                            popUpTo(navController.graph.findStartDestination().id) {
+                                saveState = true
+                            }
                         }
                     }
                 },

app/src/main/java/com/pira/ccloud/navigation/BottomNavigation.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.NavGraph.Companion.findStartDestination
 
 @Composable
 fun SidebarNavigation(navController: NavController) {
@@ -129,6 +130,10 @@ fun SidebarNavigation(navController: NavController) {
                                     launchSingleTop = true
                                     // Restore state when reselecting a previously selected item
                                     restoreState = true
+                                    // Pop up to the current destination to avoid building up a large stack
+                                    popUpTo(navController.graph.findStartDestination().id) {
+                                        saveState = true
+                                    }
                                 }
                             }
                         },