Fix navigation refresh issue: Prevent page refresh when switching between bottom nav and sidebar items

Author: code3-dev

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

@@ -18,8 +18,8 @@ android {
         // Android 7.x and below are not supported due to Jetpack Compose limitations
         minSdk = 26
         targetSdk = 36
-        versionCode = 8
-        versionName = "1.0.7"
+        versionCode = 9
+        versionName = "1.0.8"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/build.gradle.kts

@@ -35,7 +35,10 @@ fun AppNavigation(
             SplashScreen(
                 onTimeout = {
                     navController.popBackStack()
-                    navController.navigate(AppScreens.Movies.route)
+                    navController.navigate(AppScreens.Movies.route) {
+                        // Prevent re-adding splash to back stack
+                        launchSingleTop = true
+                    }
                 },
                 backgroundColor = if (themeSettings.themeMode == com.pira.ccloud.ui.theme.ThemeMode.DARK) {
                     androidx.compose.ui.graphics.Color(0xFF121212)

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

@@ -102,18 +102,15 @@ fun BottomNavigationBar(navController: NavController) {
                 label = null, // We're using custom label in icon
                 selected = isSelected,
                 onClick = {
-                    navController.navigate(screen.route) {
-                        // 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(navController.graph.startDestinationId) {
-                            saveState = true
+                    // Only navigate if we're not already on the selected screen
+                    if (currentRoute != screen.route) {
+                        navController.navigate(screen.route) {
+                            // Avoid multiple copies of the same destination when
+                            // reselecting the same item
+                            launchSingleTop = true
+                            // Restore state when reselecting a previously selected item
+                            restoreState = 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
                     }
                 },
                 colors = NavigationBarItemDefaults.colors(

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

@@ -121,18 +121,15 @@ fun SidebarNavigation(navController: NavController) {
                         label = null, // We're using custom label in icon
                         selected = isSelected,
                         onClick = {
-                            navController.navigate(screen.route) {
-                                // 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(navController.graph.startDestinationId) {
-                                    saveState = true
+                            // Only navigate if we're not already on the selected screen
+                            if (currentRoute != screen.route) {
+                                navController.navigate(screen.route) {
+                                    // Avoid multiple copies of the same destination when
+                                    // reselecting the same item
+                                    launchSingleTop = true
+                                    // Restore state when reselecting a previously selected item
+                                    restoreState = 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
                             }
                         },
                         colors = NavigationRailItemDefaults.colors(

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

@@ -241,11 +241,11 @@ fun getArchitecture(): String {
         val supportedAbis = android.os.Build.SUPPORTED_ABIS
         if (supportedAbis.isNotEmpty()) {
             when (supportedAbis[0]) {
-                "arm64-v8a" -> "ARM64"
-                "armeabi-v7a" -> "ARM32"
+                "arm64-v8a" -> "ARM64 (arm64-v8a)"
+                "armeabi-v7a" -> "ARM32 (armeabi-v7a)"
                 "x86_64" -> "x86_64"
                 "x86" -> "x86"
-                else -> supportedAbis[0]
+                else -> "${supportedAbis[0]} (Unknown)"
             }
         } else {
             "Unknown"