Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Remove different deeplink destination, add route for nested nav host

Don Turneraba2b2c1548f
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
index 2b2082df8..1eddde8e6 100644
--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt
@@ -134,7 +134,8 @@ internal fun InterestsListDetailScreen(
key(nestedNavKey) {
NavHost(
navController = nestedNavController,
- startDestination = nestedNavHostStartDestination
+ startDestination = nestedNavHostStartDestination,
+ route = DetailPaneNavHostDestination::class
) {
topicScreen(
showBackButton = !listDetailNavigator.isListPaneVisible(),
diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
index a5ca0b838..e0874bbf8 100644
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt
@@ -31,16 +31,13 @@ const val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"
private const val DEEP_LINK_BASE_PATH = "$DEEP_LINK_SCHEME_AND_HOST/$FOR_YOU_PATH"
@Serializable data class ForYouDestination(val linkedNewsResourceId: String? = null)
-// For deeplinks the news resource ID cannot be null so we use a different type with the same
-// argument name to enforce this requirement.
-@Serializable data class ForYouDeeplink(val linkedNewsResourceId: String)
fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouDestination(), navOptions)
fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {
composable<ForYouDestination>(
deepLinks = listOf(
- navDeepLink<ForYouDeeplink>(basePath = DEEP_LINK_BASE_PATH),
+ navDeepLink<ForYouDestination>(basePath = DEEP_LINK_BASE_PATH),
),
) {
ForYouRoute(onTopicClick)