Merge pull request #578 from ooni/nav-type-safety

Migrate to navigation type safety

Author: sdsantos

composeApp/src/commonMain/kotlin/org/ooni/probe/App.kt

@@ -16,6 +16,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import co.touchlab.kermit.Logger
@@ -43,13 +44,15 @@ fun App(
     val snackbarHostState = remember { SnackbarHostState() }
 
     val currentNavEntry by navController.currentBackStackEntryAsState()
-    val currentRoute = currentNavEntry?.destination?.route
-    val isMainScreen = MAIN_NAVIGATION_SCREENS.map { it.route }.contains(currentRoute)
+    val isMainScreen = MAIN_NAVIGATION_SCREENS.any {
+        currentNavEntry?.destination?.hasRoute(it::class) == true
+    }
 
     CompositionLocalProvider(
-        values = dependencies.localeDirection?.invoke()?.let { LocalLayoutDirection provides it }?.let {
-            arrayOf(LocalSnackbarHostState provides snackbarHostState, it)
-        } ?: arrayOf(LocalSnackbarHostState provides snackbarHostState),
+        values = dependencies.localeDirection?.invoke()?.let { LocalLayoutDirection provides it }
+            ?.let {
+                arrayOf(LocalSnackbarHostState provides snackbarHostState, it)
+            } ?: arrayOf(LocalSnackbarHostState provides snackbarHostState),
     ) {
         AppTheme {
             Surface(
@@ -113,17 +116,22 @@ fun App(
     LaunchedEffect(deepLink) {
         when (deepLink) {
             is DeepLink.AddDescriptor -> {
-                navController.navigate("add-descriptor/${deepLink.id}")
+                navController.navigate(
+                    Screen.AddDescriptor(deepLink.id.toLongOrNull() ?: return@LaunchedEffect),
+                )
                 onDeeplinkHandled()
             }
+
             is DeepLink.RunUrls -> {
-                navController.navigate(Screen.ChooseWebsites(deepLink.url).route)
+                navController.navigate(Screen.ChooseWebsites(deepLink.url))
                 onDeeplinkHandled()
             }
+
             DeepLink.Error -> {
                 snackbarHostState.showSnackbar(getString(Res.string.AddDescriptor_Toasts_Unsupported_Url))
                 onDeeplinkHandled()
             }
+
             null -> Unit
         }
     }

composeApp/src/commonMain/kotlin/org/ooni/probe/shared/StringExt.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import androidx.navigation.NavDestination.Companion.hasRoute
 import androidx.navigation.compose.currentBackStackEntryAsState
 import ooniprobe.composeapp.generated.resources.Dashboard_Tab_Label
 import ooniprobe.composeapp.generated.resources.Res
@@ -30,7 +31,6 @@ import org.ooni.probe.ui.shared.isHeightCompact
 @Composable
 fun BottomNavigationBar(navController: NavController) {
     val entry by navController.currentBackStackEntryAsState()
-    val currentRoute = entry?.destination?.route ?: return
 
     val customMinHeightModifier =
         Modifier.run { if (isHeightCompact()) defaultMinSize(minHeight = 64.dp) else this }
@@ -52,13 +52,14 @@ fun BottomNavigationBar(navController: NavController) {
                         textAlign = TextAlign.Center,
                     )
                 },
-                selected = currentRoute == screen.route,
+                selected = entry?.destination?.hasRoute(screen::class) == true,
                 onClick = { navController.navigateToMainScreen(screen) },
                 colors = NavigationBarItemDefaults.colors(
                     indicatorColor = MaterialTheme.colorScheme.primaryContainer,
                     selectedIconColor = MaterialTheme.colorScheme.onPrimaryContainer,
                 ),
-                modifier = customMinHeightModifier.testTag(screen.route),
+                modifier = customMinHeightModifier
+                    .testTag(screen::class.simpleName.orEmpty().lowercase()),
             )
         }
     }