Remove different deeplink destination, add route for nested nav host

Change-Id: Idb9586752d815449243d6d529e9b655c45e395ad
android · May 14, 2024 · aba2b2c · aba2b2c
1 parent 68152e5
commit aba2b2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/...otlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/...otlin/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/...kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/...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)