A fully functional Android app built entirely with Kotlin and Jetpack Compose
Refactor navigation routes to NavKeys
Don Turnerb9a80fc038e8
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.ktindex 4438eee5e..ecc23d80e 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt@@ -75,7 +75,6 @@ class MainActivity : ComponentActivity() {private val viewModel: MainActivityViewModel by viewModels()-override fun onCreate(savedInstanceState: Bundle?) {val splashScreen = installSplashScreen()super.onCreate(savedInstanceState)@@ -134,7 +133,6 @@ class MainActivity : ComponentActivity() {splashScreen.setKeepOnScreenCondition { viewModel.uiState.value.shouldKeepSplashScreen() }setContent {-val appState = rememberNiaAppState(networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.ktindex c3a90219d..7021e4fa0 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelNavItem.kt@@ -18,6 +18,14 @@ package com.google.samples.apps.nowinandroid.navigationimport androidx.annotation.StringResimport androidx.compose.ui.graphics.vector.ImageVector+import com.google.samples.apps.nowinandroid.R+import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksNavKey+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKey+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKey+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR+import com.google.samples.apps.nowinandroid.feature.foryou.api.R as forYouR+import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR/*** Type for the top level navigation items in the application. Contains UI information about the@@ -35,4 +43,31 @@ data class TopLevelNavItem(val unselectedIcon: ImageVector,@StringRes val iconTextId: Int,@StringRes val titleTextId: Int,-)\ No newline at end of file+)++val FOR_YOU = TopLevelNavItem(+ selectedIcon = NiaIcons.Upcoming,+ unselectedIcon = NiaIcons.UpcomingBorder,+ iconTextId = forYouR.string.feature_foryou_api_title,+ titleTextId = R.string.app_name,+)++val BOOKMARKS = TopLevelNavItem(+ selectedIcon = NiaIcons.Bookmarks,+ unselectedIcon = NiaIcons.BookmarksBorder,+ iconTextId = bookmarksR.string.feature_bookmarks_api_title,+ titleTextId = bookmarksR.string.feature_bookmarks_api_title,+)++val INTERESTS = TopLevelNavItem(+ selectedIcon = NiaIcons.Grid3x3,+ unselectedIcon = NiaIcons.Grid3x3,+ iconTextId = searchR.string.feature_search_api_interests,+ titleTextId = searchR.string.feature_search_api_interests,+)++val TOP_LEVEL_NAV_ITEMS = mapOf(+ ForYouNavKey to FOR_YOU,+ BookmarksNavKey to BOOKMARKS,+ InterestsNavKey(null) to INTERESTS,+)diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelRoutes.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelRoutes.ktdeleted file mode 100644index 8c796a5a7..000000000--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelRoutes.kt+++ /dev/null@@ -1,53 +0,0 @@-/*- * Copyright 2022 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.navigation--import com.google.samples.apps.nowinandroid.R-import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR-import com.google.samples.apps.nowinandroid.feature.foryou.api.R as forYouR-import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR--val FOR_YOU = TopLevelNavItem(- selectedIcon = NiaIcons.Upcoming,- unselectedIcon = NiaIcons.UpcomingBorder,- iconTextId = forYouR.string.feature_foryou_api_title,- titleTextId = R.string.app_name,-)--val BOOKMARKS = TopLevelNavItem(- selectedIcon = NiaIcons.Bookmarks,- unselectedIcon = NiaIcons.BookmarksBorder,- iconTextId = bookmarksR.string.feature_bookmarks_api_title,- titleTextId = bookmarksR.string.feature_bookmarks_api_title,-)--val INTERESTS = TopLevelNavItem(- selectedIcon = NiaIcons.Grid3x3,- unselectedIcon = NiaIcons.Grid3x3,- iconTextId = searchR.string.feature_search_api_interests,- titleTextId = searchR.string.feature_search_api_interests,-)--val TOP_LEVEL_NAV_ITEMS = mapOf(- ForYouRoute to FOR_YOU,- BookmarksRoute to BOOKMARKS,- InterestsRoute(null) to INTERESTS,-)diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex aaf57f452..16aefd455 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -76,13 +76,13 @@ import com.google.samples.apps.nowinandroid.core.navigation.Navigatorimport com.google.samples.apps.nowinandroid.core.navigation.toEntriesimport com.google.samples.apps.nowinandroid.feature.bookmarks.impl.navigation.LocalSnackbarHostStateimport com.google.samples.apps.nowinandroid.feature.bookmarks.impl.navigation.bookmarksEntry+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport com.google.samples.apps.nowinandroid.feature.foryou.impl.navigation.forYouEntryimport com.google.samples.apps.nowinandroid.feature.interests.impl.navigation.interestsEntry-import com.google.samples.apps.nowinandroid.feature.search.api.navigation.SearchRoute+import com.google.samples.apps.nowinandroid.feature.search.api.navigation.SearchNavKeyimport com.google.samples.apps.nowinandroid.feature.search.impl.navigation.searchEntryimport com.google.samples.apps.nowinandroid.feature.settings.api.SettingsDialogimport com.google.samples.apps.nowinandroid.feature.topic.impl.navigation.topicEntry-import com.google.samples.apps.nowinandroid.navigation.FOR_YOUimport com.google.samples.apps.nowinandroid.navigation.TOP_LEVEL_NAV_ITEMSimport com.google.samples.apps.nowinandroid.feature.settings.api.R as settingsR@@ -92,7 +92,7 @@ fun NiaApp(modifier: Modifier = Modifier,windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),) {- val shouldShowGradientBackground = appState.currentTopLevelNavItem == FOR_YOU+ val shouldShowGradientBackground = appState.navigationState.currentTopLevelKey == ForYouNavKeyvar showSettingsDialog by rememberSaveable { mutableStateOf(false) }NiaBackground(modifier = modifier) {@@ -135,7 +135,8 @@ fun NiaApp(@Composable@OptIn(ExperimentalMaterial3Api::class,- ExperimentalComposeUiApi::class, ExperimentalMaterial3AdaptiveApi::class,+ ExperimentalComposeUiApi::class,+ ExperimentalMaterial3AdaptiveApi::class,)internal fun NiaApp(appState: NiaAppState,@@ -145,7 +146,7 @@ internal fun NiaApp(modifier: Modifier = Modifier,windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),) {- val unreadRoutes by appState.topLevelRoutesWithUnreadResources+ val unreadNavKeys by appState.topLevelNavKeysWithUnreadResources.collectAsStateWithLifecycle()if (showSettingsDialog) {@@ -161,7 +162,7 @@ internal fun NiaApp(NiaNavigationSuiteScaffold(navigationSuiteItems = {TOP_LEVEL_NAV_ITEMS.forEach { (navKey, navItem) ->- val hasUnread = unreadRoutes.contains(navKey)+ val hasUnread = unreadNavKeys.contains(navKey)val selected = navKey == appState.navigationState.currentTopLevelKeyitem(selected = selected,@@ -239,7 +240,7 @@ internal fun NiaApp(containerColor = Color.Transparent,),onActionClick = { onTopAppBarActionClick() },- onNavigationClick = { navigator.navigate(SearchRoute) },+ onNavigationClick = { navigator.navigate(SearchNavKey) },)}@@ -253,7 +254,6 @@ internal fun NiaApp(},),) {-val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>()val entryProvider = entryProvider {diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex a8921e967..9b4814980 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -26,10 +26,10 @@ import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.navigation.NavigationStateimport com.google.samples.apps.nowinandroid.core.navigation.rememberNavigationState-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute+import com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksNavKey+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport com.google.samples.apps.nowinandroid.navigation.TOP_LEVEL_NAV_ITEMS-import com.google.samples.apps.nowinandroid.navigation.TopLevelNavItemimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlow@@ -45,8 +45,7 @@ fun rememberNiaAppState(timeZoneMonitor: TimeZoneMonitor,coroutineScope: CoroutineScope = rememberCoroutineScope(),): NiaAppState {-- val navigationState = rememberNavigationState(ForYouRoute, TOP_LEVEL_NAV_ITEMS.keys)+ val navigationState = rememberNavigationState(ForYouNavKey, TOP_LEVEL_NAV_ITEMS.keys)NavigationTrackingSideEffect(navigationState)@@ -75,10 +74,6 @@ class NiaAppState(userNewsResourceRepository: UserNewsResourceRepository,timeZoneMonitor: TimeZoneMonitor,) {- // TODO: I think this should return null if the current route is not a topLevelRoute- val currentTopLevelNavItem: TopLevelNavItem?- @Composable get() = TOP_LEVEL_NAV_ITEMS[navigationState.currentTopLevelKey]-val isOffline = networkMonitor.isOnline.map(Boolean::not).stateIn(@@ -88,14 +83,14 @@ class NiaAppState()/**- * The top level routes that have unread news resources.+ * The top level nav keys that have unread news resources.*/- val topLevelRoutesWithUnreadResources: StateFlow<Set<NavKey>> =+ val topLevelNavKeysWithUnreadResources: StateFlow<Set<NavKey>> =userNewsResourceRepository.observeAllForFollowedTopics().combine(userNewsResourceRepository.observeAllBookmarked()) { forYouNewsResources, bookmarkedNewsResources ->setOfNotNull(- ForYouRoute.takeIf { forYouNewsResources.any { !it.hasBeenViewed } },- BookmarksRoute.takeIf { bookmarkedNewsResources.any { !it.hasBeenViewed } },+ ForYouNavKey.takeIf { forYouNewsResources.any { !it.hasBeenViewed } },+ BookmarksNavKey.takeIf { bookmarkedNewsResources.any { !it.hasBeenViewed } },)}.stateIn(@@ -115,15 +110,10 @@ class NiaAppState(/*** Stores information about navigation events to be used with JankStats*/--// TODO: NavigationState needs to expose an observable representation of its state for this to work@Composableprivate fun NavigationTrackingSideEffect(navigationState: NavigationState) {-// TrackDisposableJank(niaNavigator) { metricsHolder ->-// snapshotFlow {-// val stack = niaNavigator.backStack.toList()-// metricsHolder.state?.putState("Navigation", stack.lastOrNull().toString())-// }-// onDispose { }-// }+ TrackDisposableJank(navigationState.currentKey) { metricsHolder ->+ metricsHolder.state?.putState("Navigation", navigationState.currentKey.toString())+ onDispose {}+ }}diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.ktindex 44070dfc4..9c9488fde 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt@@ -125,11 +125,9 @@ class NiaAppScreenSizesScreenshotTests {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),)NiaApp(fakeAppState,- entryProviderBuilders = MockEntryProvider,windowAdaptiveInfo = WindowAdaptiveInfo(windowSizeClass = WindowSizeClass.compute(width.value,diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.ktindex 5a4726dd3..ede41fc19 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt@@ -18,14 +18,17 @@ package com.google.samples.apps.nowinandroid.uiimport androidx.compose.runtime.rememberimport androidx.compose.ui.test.junit4.createComposeRule+import androidx.navigation3.runtime.NavBackStackimport com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository+import com.google.samples.apps.nowinandroid.core.navigation.NavigationState+import com.google.samples.apps.nowinandroid.core.navigation.Navigatorimport com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitorimport com.google.samples.apps.nowinandroid.core.testing.util.TestTimeZoneMonitor-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute-import com.google.samples.apps.nowinandroid.navigation.TOP_LEVEL_NAV_ITEMS+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksNavKey+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKey+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKeyimport dagger.hilt.android.testing.HiltAndroidTestimport dagger.hilt.android.testing.HiltTestApplicationimport kotlinx.coroutines.flow.collect@@ -39,7 +42,6 @@ import org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Configimport kotlin.test.assertEquals-import kotlin.test.assertTrue/*** Tests [NiaAppState].@@ -63,31 +65,42 @@ class NiaAppStateTest {// Subject under test.private lateinit var state: NiaAppState+ private fun testNavigationState() = NavigationState(+ startKey = ForYouNavKey,+ topLevelStack = NavBackStack(ForYouNavKey),+ subStacks = mapOf(+ ForYouNavKey to NavBackStack(ForYouNavKey),+ BookmarksNavKey to NavBackStack(BookmarksNavKey),+ ),+ )+@Testfun niaAppState_currentDestination() = runTest {- val niaBackStack = mockNiaBackStack()+ val navigationState = testNavigationState()+ val navigator = Navigator(navigationState)+composeTestRule.setContent {- state = remember(niaBackStack) {+ state = remember(navigationState) {NiaAppState(- niaNavigator = niaBackStack,coroutineScope = backgroundScope,networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,+ navigationState = navigationState,)}}- assertEquals(ForYouRoute, state.niaNavigator.currentActiveTopLevelKey)- assertEquals(ForYouRoute, state.niaNavigator.currentKey)+ assertEquals(ForYouNavKey, state.navigationState.currentTopLevelKey)+ assertEquals(ForYouNavKey, state.navigationState.currentKey)// Navigate to another destination once- niaBackStack.navigate(BookmarksRoute)+ navigator.navigate(BookmarksNavKey)composeTestRule.waitForIdle()- assertEquals(BookmarksRoute, state.niaNavigator.currentActiveTopLevelKey)- assertEquals(BookmarksRoute, state.niaNavigator.currentKey)+ assertEquals(BookmarksNavKey, state.navigationState.currentTopLevelKey)+ assertEquals(BookmarksNavKey, state.navigationState.currentKey)}@Test@@ -97,14 +110,16 @@ class NiaAppStateTest {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),)}- assertEquals(3, TOP_LEVEL_NAV_ITEMS.size)- assertTrue(TOP_LEVEL_NAV_ITEMS[0].name.contains("for_you", true))- assertTrue(TOP_LEVEL_NAV_ITEMS[1].name.contains("bookmarks", true))- assertTrue(TOP_LEVEL_NAV_ITEMS[2].name.contains("interests", true))+ val navigationState = state.navigationState++ assertEquals(3, navigationState.topLevelKeys.size)+ assertEquals(+ setOf(ForYouNavKey, BookmarksNavKey, InterestsNavKey),+ navigationState.topLevelKeys,+ )}@Test@@ -115,7 +130,7 @@ class NiaAppStateTest {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),+ navigationState = testNavigationState(),)}@@ -135,7 +150,7 @@ class NiaAppStateTest {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),+ navigationState = testNavigationState(),)}val changedTz = TimeZone.of("Europe/Prague")diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.ktindex 29a470315..3c7610193 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt@@ -250,11 +250,9 @@ class SnackbarInsetsScreenshotTests {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),)NiaApp(appState = appState,- entryProviderBuilders = MockEntryProvider,showSettingsDialog = false,onSettingsDismissed = {},onTopAppBarActionClick = {},diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.ktindex 7e89184f4..75dc6baa7 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt@@ -200,11 +200,9 @@ class SnackbarScreenshotTests {networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,- niaNavigator = mockNiaBackStack(),)NiaApp(appState = appState,- entryProviderBuilders = MockEntryProvider,showSettingsDialog = false,onSettingsDismissed = {},onTopAppBarActionClick = {},diff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.ktdeleted file mode 100644index 268cc8ee8..000000000--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/TestUtil.kt+++ /dev/null@@ -1,36 +0,0 @@-/*- * Copyright 2025 The Android Open Source Project- *- * Licensed under the Apache License, Version 2.0 (the "License");- * you may not use this file except in compliance with the License.- * You may obtain a copy of the License at- *- * https://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software- * distributed under the License is distributed on an "AS IS" BASIS,- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- * See the License for the specific language governing permissions and- * limitations under the License.- */--package com.google.samples.apps.nowinandroid.ui--import androidx.navigation3.runtime.EntryProviderScope-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute-import com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouScreen--val MockEntryProvider: Set<EntryProviderScope<NiaNavKey>.() -> Unit> =- setOf(- {- entry<ForYouRoute> {- ForYouScreen({})- }- },- )--private val startKey = ForYouRoute--fun mockNiaBackStack() = NiaNavigator(startKey)diff --git a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigationState.kt b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigationState.ktindex c870916db..2a508e6a9 100644--- a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigationState.kt+++ b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigationState.kt@@ -36,9 +36,8 @@ import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator@Composablefun rememberNavigationState(startKey: NavKey,- topLevelKeys: Set<NavKey>+ topLevelKeys: Set<NavKey>,): NavigationState {-val topLevelStack = rememberNavBackStack(startKey)val subStacks = topLevelKeys.associateWith { key -> rememberNavBackStack(key) }@@ -46,7 +45,7 @@ fun rememberNavigationState(NavigationState(startKey = startKey,topLevelStack = topLevelStack,- subStacks = subStacks+ subStacks = subStacks,)}}@@ -61,7 +60,7 @@ fun rememberNavigationState(class NavigationState(val startKey: NavKey,val topLevelStack: NavBackStack<NavKey>,- val subStacks: Map<NavKey, NavBackStack<NavKey>>+ val subStacks: Map<NavKey, NavBackStack<NavKey>>,) {val currentTopLevelKey: NavKey by derivedStateOf { topLevelStack.last() }@@ -69,13 +68,12 @@ class NavigationState(get() = subStacks.keys@get:VisibleForTesting- val currentSubStack : NavBackStack<NavKey>+ val currentSubStack: NavBackStack<NavKey>get() = subStacks[currentTopLevelKey]?: error("Sub stack for $currentTopLevelKey does not exist")@get:VisibleForTesting- val currentKey- get() = currentSubStack.last()+ val currentKey: NavKey by derivedStateOf { currentSubStack.last() }}/**@@ -83,9 +81,8 @@ class NavigationState(*/@Composablefun NavigationState.toEntries(- entryProvider: (NavKey) -> NavEntry<NavKey>+ entryProvider: (NavKey) -> NavEntry<NavKey>,): SnapshotStateList<NavEntry<NavKey>> {-val decoratedEntries = subStacks.mapValues { (_, stack) ->val decorators = listOf(rememberSaveableStateHolderNavEntryDecorator<NavKey>(),@@ -93,11 +90,11 @@ fun NavigationState.toEntries(rememberDecoratedNavEntries(backStack = stack,entryDecorators = decorators,- entryProvider = entryProvider+ entryProvider = entryProvider,)}return topLevelStack.flatMap { decoratedEntries[it] ?: emptyList() }.toMutableStateList()-}\ No newline at end of file+}diff --git a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/Navigator.kt b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/Navigator.ktindex 8851b0dca..e98e2c12b 100644--- a/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/Navigator.kt+++ b/core/navigation/src/main/kotlin/com/google/samples/apps/nowinandroid/core/navigation/Navigator.kt@@ -42,7 +42,7 @@ class Navigator(val state: NavigationState) {* Go back to the previous navigation key.*/fun goBack() {- when (state.currentKey){+ when (state.currentKey) {state.startKey -> error("You cannot go back from the start route")state.currentTopLevelKey -> {// We're at the base of the current sub stack, go back to the previous top level@@ -88,4 +88,4 @@ class Navigator(val state: NavigationState) {if (size > 1) subList(1, size).clear()}}-}\ No newline at end of file+}diff --git a/core/navigation/src/test/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigatorTest.kt b/core/navigation/src/test/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigatorTest.ktindex 05b6544d4..86c4acc25 100644--- a/core/navigation/src/test/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigatorTest.kt+++ b/core/navigation/src/test/kotlin/com/google/samples/apps/nowinandroid/core/navigation/NavigatorTest.kt@@ -36,20 +36,19 @@ class NavigatorTest {@Beforefun setup() {-val startKey = TestFirstTopLevelKeyval topLevelStack = NavBackStack<NavKey>(startKey)val topLevelKeys = listOf(startKey,TestSecondTopLevelKey,- TestThirdTopLevelKey+ TestThirdTopLevelKey,)val subStacks = topLevelKeys.associateWith { key -> NavBackStack(key) }navigationState = NavigationState(startKey = startKey,topLevelStack = topLevelStack,- subStacks = subStacks+ subStacks = subStacks,)navigator = Navigator(navigationState)}@@ -66,7 +65,6 @@ class NavigatorTest {assertThat(navigationState.currentTopLevelKey).isEqualTo(TestFirstTopLevelKey)assertThat(navigationState.subStacks[TestFirstTopLevelKey]?.last()).isEqualTo(TestKeyFirst)-}@Test@@ -148,7 +146,7 @@ class NavigatorTest {assertThat(navigationState.currentKey).isEqualTo(TestKeyFirst)assertThat(navigationState.currentTopLevelKey).isEqualTo(TestFirstTopLevelKey)}-+@Testfun testPopOneNonTopLevel() {navigator.navigate(TestKeyFirst)@@ -256,5 +254,3 @@ class NavigatorTest {}}}--diff --git a/docs/images/graphs/dep_graph_app.svg b/docs/images/graphs/dep_graph_app.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_app_nia_catalog.svg b/docs/images/graphs/dep_graph_app_nia_catalog.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_analytics.svg b/docs/images/graphs/dep_graph_core_analytics.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_common.svg b/docs/images/graphs/dep_graph_core_common.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_data.svg b/docs/images/graphs/dep_graph_core_data.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_data_test.svg b/docs/images/graphs/dep_graph_core_data_test.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_database.svg b/docs/images/graphs/dep_graph_core_database.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_datastore.svg b/docs/images/graphs/dep_graph_core_datastore.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_datastore_proto.svg b/docs/images/graphs/dep_graph_core_datastore_proto.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_datastore_test.svg b/docs/images/graphs/dep_graph_core_datastore_test.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_designsystem.svg b/docs/images/graphs/dep_graph_core_designsystem.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_domain.svg b/docs/images/graphs/dep_graph_core_domain.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_model.svg b/docs/images/graphs/dep_graph_core_model.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_navigation.svg b/docs/images/graphs/dep_graph_core_navigation.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_network.svg b/docs/images/graphs/dep_graph_core_network.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_notifications.svg b/docs/images/graphs/dep_graph_core_notifications.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_screenshot_testing.svg b/docs/images/graphs/dep_graph_core_screenshot_testing.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_testing.svg b/docs/images/graphs/dep_graph_core_testing.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_core_ui.svg b/docs/images/graphs/dep_graph_core_ui.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_bookmarks_api.svg b/docs/images/graphs/dep_graph_feature_bookmarks_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_bookmarks_impl.svg b/docs/images/graphs/dep_graph_feature_bookmarks_impl.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_foryou_api.svg b/docs/images/graphs/dep_graph_feature_foryou_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_foryou_impl.svg b/docs/images/graphs/dep_graph_feature_foryou_impl.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_interests_api.svg b/docs/images/graphs/dep_graph_feature_interests_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_interests_impl.svg b/docs/images/graphs/dep_graph_feature_interests_impl.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_search_api.svg b/docs/images/graphs/dep_graph_feature_search_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_search_impl.svg b/docs/images/graphs/dep_graph_feature_search_impl.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_settings_api.svg b/docs/images/graphs/dep_graph_feature_settings_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_topic_api.svg b/docs/images/graphs/dep_graph_feature_topic_api.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_feature_topic_impl.svg b/docs/images/graphs/dep_graph_feature_topic_impl.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_lint.svg b/docs/images/graphs/dep_graph_lint.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_sync_sync_test.svg b/docs/images/graphs/dep_graph_sync_sync_test.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_sync_work.svg b/docs/images/graphs/dep_graph_sync_work.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/docs/images/graphs/dep_graph_ui_test_hilt_manifest.svg b/docs/images/graphs/dep_graph_ui_test_hilt_manifest.svgdeleted file mode 100644index e69de29bb..000000000diff --git a/feature/bookmarks/api/README.md b/feature/bookmarks/api/README.mddeleted file mode 100644index 7ee6e7b86..000000000--- a/feature/bookmarks/api/README.md+++ /dev/null@@ -1,3 +0,0 @@-# :feature:bookmarks:api module-## Dependency graph-diff --git a/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoute.kt b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavKey.ktsimilarity index 96%rename from feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoute.ktrename to feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavKey.ktindex 994aeecf1..988266ffc 100644--- a/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksRoute.kt+++ b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavKey.kt@@ -20,4 +20,4 @@ import androidx.navigation3.runtime.NavKeyimport kotlinx.serialization.Serializable@Serializable-object BookmarksRoute : NavKey+object BookmarksNavKey : NavKeydiff --git a/feature/bookmarks/impl/README.md b/feature/bookmarks/impl/README.mddeleted file mode 100644index f7cc92060..000000000--- a/feature/bookmarks/impl/README.md+++ /dev/null@@ -1,3 +0,0 @@-# :feature:bookmarks:impl module-## Dependency graph-diff --git a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.ktindex 9e9d25bf1..467965651 100644--- a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/navigation/BookmarksEntryProvider.kt@@ -23,12 +23,12 @@ import androidx.compose.runtime.compositionLocalOfimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigator-import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksNavKeyimport com.google.samples.apps.nowinandroid.feature.bookmarks.impl.BookmarksScreenimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopicfun EntryProviderScope<NavKey>.bookmarksEntry(navigator: Navigator) {- entry<BookmarksRoute> {+ entry<BookmarksNavKey> {val snackbarHostState = LocalSnackbarHostState.currentBookmarksScreen(onTopicClick = navigator::navigateToTopic,@@ -43,6 +43,7 @@ fun EntryProviderScope<NavKey>.bookmarksEntry(navigator: Navigator) {}}+// TODO: Why is this here?val LocalSnackbarHostState = compositionLocalOf<SnackbarHostState> {error("SnackbarHostState state should be initialized at runtime")}diff --git a/feature/foryou/api/README.md b/feature/foryou/api/README.mddeleted file mode 100644index 2d3154ba2..000000000--- a/feature/foryou/api/README.md+++ /dev/null@@ -1,3 +0,0 @@-# :feature:foryou:api module-## Dependency graph-diff --git a/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouRoute.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.ktsimilarity index 96%rename from feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouRoute.ktrename to feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.ktindex 91adea3a1..d61ae5a20 100644--- a/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouRoute.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.kt@@ -20,4 +20,4 @@ import androidx.navigation3.runtime.NavKeyimport kotlinx.serialization.Serializable@Serializable-object ForYouRoute : NavKey+object ForYouNavKey : NavKeydiff --git a/feature/foryou/impl/README.md b/feature/foryou/impl/README.mddeleted file mode 100644index 32d4e0845..000000000--- a/feature/foryou/impl/README.md+++ /dev/null@@ -1,3 +0,0 @@-# :feature:foryou:impl module-## Dependency graph-diff --git a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreen.kt b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreen.ktindex 907f50d6a..0ae916db3 100644--- a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreen.kt+++ b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreen.kt@@ -20,7 +20,6 @@ import android.net.Uriimport android.os.Build.VERSIONimport android.os.Build.VERSION_CODESimport androidx.activity.compose.ReportDrawnWhen-import androidx.annotation.VisibleForTestingimport androidx.compose.animation.AnimatedVisibilityimport androidx.compose.animation.fadeInimport androidx.compose.animation.fadeOut@@ -107,8 +106,7 @@ import com.google.samples.apps.nowinandroid.core.ui.newsFeedimport com.google.samples.apps.nowinandroid.feature.foryou.api.R@Composable-@VisibleForTesting-public fun ForYouScreen(+fun ForYouScreen(onTopicClick: (String) -> Unit,modifier: Modifier = Modifier,viewModel: ForYouViewModel = hiltViewModel(),diff --git a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.ktindex d2aefa0f8..4bdc7368c 100644--- a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt+++ b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/navigation/ForYouEntryProvider.kt@@ -19,17 +19,14 @@ package com.google.samples.apps.nowinandroid.feature.foryou.impl.navigationimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigator-import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouScreenimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopicfun EntryProviderScope<NavKey>.forYouEntry(navigator: Navigator) {- entry<ForYouRoute> {+ entry<ForYouNavKey> {ForYouScreen(onTopicClick = navigator::navigateToTopic,)}}---diff --git a/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenScreenshotTests.kt b/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenScreenshotTests.ktindex ac4287625..d0d73860e 100644--- a/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenScreenshotTests.kt+++ b/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenScreenshotTests.kt@@ -50,7 +50,7 @@ import java.util.TimeZone*/@RunWith(RobolectricTestRunner::class)@GraphicsMode(GraphicsMode.Mode.NATIVE)-@Config(application = HiltTestApplication::class, sdk = [35])+@Config(application = HiltTestApplication::class)@LooperMode(LooperMode.Mode.PAUSED)class ForYouScreenScreenshotTests {diff --git a/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsRoute.kt b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavKey.ktsimilarity index 97%rename from feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsRoute.ktrename to feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavKey.ktindex ca7968778..cd6c631a2 100644--- a/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsRoute.kt+++ b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavKey.kt@@ -20,7 +20,7 @@ import androidx.navigation3.runtime.NavKeyimport kotlinx.serialization.Serializable@Serializable-data class InterestsRoute(+data class InterestsNavKey(// The ID of the topic which will be initially selected at this destinationval initialTopicId: String? = null,) : NavKeydiff --git a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/InterestsViewModel.kt b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/InterestsViewModel.ktindex 8f203d6fb..f79d79d09 100644--- a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/InterestsViewModel.kt+++ b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/InterestsViewModel.kt@@ -23,7 +23,7 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepositimport com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCaseimport com.google.samples.apps.nowinandroid.core.domain.TopicSortFieldimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKeyimport dagger.assisted.Assistedimport dagger.assisted.AssistedFactoryimport dagger.assisted.AssistedInject@@ -40,7 +40,7 @@ class InterestsViewModel @AssistedInject constructor(val userDataRepository: UserDataRepository,getFollowableTopics: GetFollowableTopicsUseCase,// TODO: see comment below- @Assisted val key: InterestsRoute,+ @Assisted val key: InterestsNavKey,) : ViewModel() {// TODO: this should no longer be necessary, the currently selected topic should be@@ -77,7 +77,7 @@ class InterestsViewModel @AssistedInject constructor(@AssistedFactoryinterface Factory {- fun create(key: InterestsRoute): InterestsViewModel+ fun create(key: InterestsNavKey): InterestsViewModel}}diff --git a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.ktindex 4aa12ef86..b92f462eb 100644--- a/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt+++ b/feature/interests/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/impl/navigation/InterestsEntryProvider.kt@@ -22,34 +22,15 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigator-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKeyimport com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsScreenimport com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsViewModel-import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicRouteimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic-//import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic-import dagger.Module-import dagger.Provides-import dagger.hilt.InstallIn-import dagger.hilt.android.components.ActivityComponent-import dagger.multibindings.IntoSet--@Module-@InstallIn(ActivityComponent::class)-object InterestsEntryProvider {-- @OptIn(ExperimentalMaterial3AdaptiveApi::class)- @Provides- @IntoSet- fun provideInterestsEntryProviderBuilder(- navigator: Navigator,- ): EntryProviderScope<NavKey>.() -> Unit = { interestsEntry(navigator) }-}@OptIn(ExperimentalMaterial3AdaptiveApi::class)fun EntryProviderScope<NavKey>.interestsEntry(navigator: Navigator) {- entry<InterestsRoute>(+ entry<InterestsNavKey>(metadata = ListDetailSceneStrategy.listPane {InterestsDetailPlaceholder()},diff --git a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.ktindex da3abaa68..0975216d1 100644--- a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt+++ b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsListDetailScreenTest.kt@@ -18,10 +18,10 @@package com.google.samples.apps.nowinandroid.interests.impl-import androidx.activity.viewModelsimport androidx.annotation.StringResimport androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApiimport androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy+import androidx.compose.runtime.Composableimport androidx.compose.ui.test.assertIsDisplayedimport androidx.compose.ui.test.assertIsNotDisplayedimport androidx.compose.ui.test.junit4.AndroidComposeTestRule@@ -29,35 +29,26 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRuleimport androidx.compose.ui.test.onNodeWithTagimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performClick-import androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.entryProviderimport androidx.navigation3.ui.NavDisplayimport androidx.test.espresso.Espressoimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.model.data.Topic-import com.google.samples.apps.nowinandroid.core.navigation.NiaBackStackViewModel-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigator+import com.google.samples.apps.nowinandroid.core.navigation.Navigator+import com.google.samples.apps.nowinandroid.core.navigation.rememberNavigationState+import com.google.samples.apps.nowinandroid.core.navigation.toEntriesimport com.google.samples.apps.nowinandroid.feature.interests.api.R-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKeyimport com.google.samples.apps.nowinandroid.feature.interests.impl.LIST_PANE_TEST_TAG+import com.google.samples.apps.nowinandroid.feature.interests.impl.navigation.interestsEntry+import com.google.samples.apps.nowinandroid.feature.topic.impl.navigation.topicEntryimport com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity-import dagger.Module-import dagger.Provides-import dagger.hilt.EntryPoint-import dagger.hilt.EntryPoints-import dagger.hilt.InstallIn-import dagger.hilt.android.components.ActivityComponentimport dagger.hilt.android.testing.HiltAndroidRuleimport dagger.hilt.android.testing.HiltAndroidTestimport dagger.hilt.android.testing.HiltTestApplication-import dagger.hilt.components.SingletonComponentimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.runBlocking-import kotlinx.serialization.modules.PolymorphicModuleBuilder-import kotlinx.serialization.modules.SerializersModule-import kotlinx.serialization.modules.polymorphicimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Test@@ -65,7 +56,6 @@ import org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Configimport javax.inject.Inject-import javax.inject.Singletonimport kotlin.getValueimport kotlin.properties.ReadOnlyProperty@@ -83,13 +73,6 @@ class InterestsListDetailScreenTest {@get:Rule(order = 1)val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()- // entry point to get the features' hilt-injected EntryProviders that are installed in ActivityComponent- @EntryPoint- @InstallIn(ActivityComponent::class)- interface EntryProvidersEntryPoint {- fun getEntryProviders(): Set<@JvmSuppressWildcards EntryProviderScope<NiaNavKey>.() -> Unit>- }-@Injectlateinit var topicsRepository: TopicsRepository@@ -104,15 +87,9 @@ class InterestsListDetailScreenTest {private val Topic.testTagget() = "topic:${this.id}"- private lateinit var entryProviderBuilders: Set<EntryProviderScope<NiaNavKey>.() -> Unit>-@Beforefun setup() {hiltRule.inject()- composeTestRule.apply {- entryProviderBuilders = EntryPoints.get(activity, EntryProvidersEntryPoint::class.java)- .getEntryProviders()- }}@Test@@ -121,13 +98,7 @@ class InterestsListDetailScreenTest {composeTestRule.apply {setContent {NiaTheme {- NavDisplay(- backStack = listOf<NiaNavKey>(InterestsRoute()),- sceneStrategy = rememberListDetailSceneStrategy(),- entryProvider = entryProvider {- entryProviderBuilders.forEach { it() }- },- )+ TestNavDisplay()}}onNodeWithTag(LIST_PANE_TEST_TAG).assertIsDisplayed()@@ -135,19 +106,36 @@ class InterestsListDetailScreenTest {}}+ @Composable+ private fun TestNavDisplay() {+ val startKey = InterestsNavKey(null)++ val navigationState = rememberNavigationState(+ startKey = startKey,+ topLevelKeys = setOf(startKey),+ )++ val navigator = Navigator(navigationState)++ val entryProvider = entryProvider {+ interestsEntry(navigator)+ topicEntry(navigator)+ }++ NavDisplay(+ entries = navigationState.toEntries(entryProvider),+ onBack = { navigator.goBack() },+ sceneStrategy = rememberListDetailSceneStrategy(),+ )+ }+@Test@Config(qualifiers = COMPACT_WIDTH)fun compactWidth_initialState_showsListPane() {composeTestRule.apply {setContent {NiaTheme {- NavDisplay(- backStack = listOf<NiaNavKey>(InterestsRoute()),- sceneStrategy = rememberListDetailSceneStrategy(),- entryProvider = entryProvider {- entryProviderBuilders.forEach { it() }- },- )+ TestNavDisplay()}}@@ -161,17 +149,8 @@ class InterestsListDetailScreenTest {fun expandedWidth_topicSelected_updatesDetailPane() {composeTestRule.apply {setContent {- val backStackViewModel by composeTestRule.activity.viewModels<NiaBackStackViewModel>()- // TODO: This is broken- val backStack = backStackViewModel.niaNavigator.backStackNiaTheme {- NavDisplay(- backStack = backStack,- sceneStrategy = rememberListDetailSceneStrategy(),- entryProvider = entryProvider {- entryProviderBuilders.forEach { it() }- },- )+ TestNavDisplay()}}val firstTopic = getTopics().first()@@ -189,16 +168,8 @@ class InterestsListDetailScreenTest {fun compactWidth_topicSelected_showsTopicDetailPane() {composeTestRule.apply {setContent {- val backStackViewModel by composeTestRule.activity.viewModels<NiaBackStackViewModel>()- val backStack = backStackViewModel.niaNavigator.backStackNiaTheme {- NavDisplay(- backStack = backStack,- sceneStrategy = rememberListDetailSceneStrategy(),- entryProvider = entryProvider {- entryProviderBuilders.forEach { it() }- },- )+ TestNavDisplay()}}@@ -216,16 +187,8 @@ class InterestsListDetailScreenTest {fun compactWidth_backPressFromTopicDetail_showsListPane() {composeTestRule.apply {setContent {- val backStackViewModel by composeTestRule.activity.viewModels<NiaBackStackViewModel>()- val backStack = backStackViewModel.niaNavigator.backStackNiaTheme {- NavDisplay(- backStack = backStack,- sceneStrategy = rememberListDetailSceneStrategy(),- entryProvider = entryProvider {- entryProviderBuilders.forEach { it() }- },- )+ TestNavDisplay()}}@@ -246,22 +209,3 @@ private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int,): ReadOnlyProperty<Any, String> =ReadOnlyProperty { _, _ -> activity.getString(resId) }--@Module-@InstallIn(SingletonComponent::class)-object BackStackProvider {- @Provides- @Singleton- fun provideNiaBackStack(): NiaNavigator =- NiaNavigator(startKey = InterestsRoute())-- @Provides- @Singleton- fun provideSerializersModule(- polymorphicModuleBuilders: Set<@JvmSuppressWildcards PolymorphicModuleBuilder<NiaNavKey>.() -> Unit>,- ): SerializersModule = SerializersModule {- polymorphic(NiaNavKey::class) {- polymorphicModuleBuilders.forEach { it() }- }- }-}diff --git a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsViewModelTest.kt b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsViewModelTest.ktindex 4998e86ca..4e964b52b 100644--- a/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsViewModelTest.kt+++ b/feature/interests/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/impl/InterestsViewModelTest.kt@@ -24,7 +24,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.testing.repository.TestTopicsRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKeyimport com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsUiStateimport com.google.samples.apps.nowinandroid.feature.interests.impl.InterestsViewModelimport kotlinx.coroutines.flow.collect@@ -68,11 +68,11 @@ class InterestsViewModelTest {fun setup() {viewModel = InterestsViewModel(savedStateHandle = SavedStateHandle(- route = InterestsRoute(initialTopicId = testInputTopics[0].topic.id),+ route = InterestsNavKey(initialTopicId = testInputTopics[0].topic.id),),userDataRepository = userDataRepository,getFollowableTopics = getFollowableTopicsUseCase,- InterestsRoute(initialTopicId = testInputTopics[0].topic.id),+ InterestsNavKey(initialTopicId = testInputTopics[0].topic.id),)}diff --git a/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavKey.ktsimilarity index 96%rename from feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavKey.ktindex 5007dbd9d..9588a8404 100644--- a/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchRoute.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavKey.kt@@ -20,4 +20,4 @@ import androidx.navigation3.runtime.NavKeyimport kotlinx.serialization.Serializable@Serializable-object SearchRoute : NavKey+object SearchNavKey : NavKeydiff --git a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/SearchUiStatePreviewParameterProvider.kt b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/SearchUiStatePreviewParameterProvider.ktindex d2963fc7f..1bda620c6 100644--- a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/SearchUiStatePreviewParameterProvider.kt+++ b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/SearchUiStatePreviewParameterProvider.kt@@ -1,5 +1,5 @@/*- * Copyright 2022 The Android Open Source Project+ * Copyright 2023 The Android Open Source Project** Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.diff --git a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.ktindex f4df9f34a..4e3baf343 100644--- a/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt+++ b/feature/search/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/impl/navigation/SearchEntryProvider.kt@@ -19,16 +19,16 @@ package com.google.samples.apps.nowinandroid.feature.search.impl.navigationimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigator-import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.search.api.navigation.SearchRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsNavKey+import com.google.samples.apps.nowinandroid.feature.search.api.navigation.SearchNavKeyimport com.google.samples.apps.nowinandroid.feature.search.impl.SearchScreenimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopicfun EntryProviderScope<NavKey>.searchEntry(navigator: Navigator) {- entry<SearchRoute> {+ entry<SearchNavKey> {SearchScreen(onBackClick = { navigator.goBack() },- onInterestsClick = { navigator.navigate(InterestsRoute()) },+ onInterestsClick = { navigator.navigate(InterestsNavKey()) },onTopicClick = navigator::navigateToTopic,)}diff --git a/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavKey.ktsimilarity index 91%rename from feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.ktrename to feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavKey.ktindex ebc6636e9..eb10b0cdd 100644--- a/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicRoute.kt+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavKey.kt@@ -21,10 +21,10 @@ import com.google.samples.apps.nowinandroid.core.navigation.Navigatorimport kotlinx.serialization.Serializable@Serializable-data class TopicRoute(val id: String) : NavKey+data class TopicNavKey(val id: String) : NavKeyfun Navigator.navigateToTopic(topicId: String,) {- navigate(TopicRoute(topicId))+ navigate(TopicNavKey(topicId))}diff --git a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.ktindex c49fdddfc..b091ca701 100644--- a/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt+++ b/feature/topic/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/impl/navigation/TopicEntryProvider.kt@@ -22,7 +22,7 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigator-import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicRoute+import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicNavKeyimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopicimport com.google.samples.apps.nowinandroid.feature.topic.impl.TopicScreenimport com.google.samples.apps.nowinandroid.feature.topic.impl.TopicViewModel@@ -30,7 +30,7 @@ import com.google.samples.apps.nowinandroid.feature.topic.impl.TopicViewModel.Fa@OptIn(ExperimentalMaterial3AdaptiveApi::class)fun EntryProviderScope<NavKey>.topicEntry(navigator: Navigator) {- entry<TopicRoute>(+ entry<TopicNavKey>(metadata = ListDetailSceneStrategy.detailPane(),) { key ->val id = key.iddiff --git a/settings.gradle.kts b/settings.gradle.ktsindex fafb2b696..03adf46ee 100644--- a/settings.gradle.kts+++ b/settings.gradle.kts@@ -40,9 +40,6 @@ dependencyResolutionManagement {}}mavenCentral()- maven {- url = uri("https://androidx.dev/snapshots/builds/14161874/artifacts/repository")- }}}rootProject.name = "nowinandroid"