A fully functional Android app built entirely with Kotlin and Jetpack Compose
Integrate Navigation 3 deep linking.
oaraz9398ea77d9ee
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex eee2e7a54..041fe8c83 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -84,6 +84,7 @@ dependencies {implementation(projects.core.data)implementation(projects.core.model)implementation(projects.core.analytics)+ implementation(projects.core.notifications)implementation(projects.sync.work)implementation(libs.androidx.activity.compose)diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex 15bb60f0f..f79b895ad 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -13,14 +13,14 @@ androidx.browser:browser:1.8.0androidx.collection:collection-jvm:1.5.0androidx.collection:collection-ktx:1.5.0androidx.collection:collection:1.5.0-androidx.compose.animation:animation-android:1.10.0-beta02-androidx.compose.animation:animation-core-android:1.10.0-beta02-androidx.compose.animation:animation-core:1.10.0-beta02-androidx.compose.animation:animation:1.10.0-beta02-androidx.compose.foundation:foundation-android:1.10.0-beta02-androidx.compose.foundation:foundation-layout-android:1.10.0-beta02-androidx.compose.foundation:foundation-layout:1.10.0-beta02-androidx.compose.foundation:foundation:1.10.0-beta02+androidx.compose.animation:animation-android:1.10.0+androidx.compose.animation:animation-core-android:1.10.0+androidx.compose.animation:animation-core:1.10.0+androidx.compose.animation:animation:1.10.0+androidx.compose.foundation:foundation-android:1.10.0+androidx.compose.foundation:foundation-layout-android:1.10.0+androidx.compose.foundation:foundation-layout:1.10.0+androidx.compose.foundation:foundation:1.10.0androidx.compose.material3.adaptive:adaptive-android:1.3.0-alpha04androidx.compose.material3.adaptive:adaptive-layout-android:1.3.0-alpha04androidx.compose.material3.adaptive:adaptive-layout:1.3.0-alpha04@@ -41,29 +41,29 @@ androidx.compose.material:material-icons-extended-android:1.7.8androidx.compose.material:material-icons-extended:1.7.8androidx.compose.material:material-ripple-android:1.10.0-alpha04androidx.compose.material:material-ripple:1.10.0-alpha04-androidx.compose.runtime:runtime-android:1.10.0-beta02-androidx.compose.runtime:runtime-annotation-android:1.10.0-beta02-androidx.compose.runtime:runtime-annotation:1.10.0-beta02-androidx.compose.runtime:runtime-retain-android:1.10.0-beta02-androidx.compose.runtime:runtime-retain:1.10.0-beta02-androidx.compose.runtime:runtime-saveable-android:1.10.0-beta02-androidx.compose.runtime:runtime-saveable:1.10.0-beta02-androidx.compose.runtime:runtime-tracing:1.10.0-beta02-androidx.compose.runtime:runtime:1.10.0-beta02-androidx.compose.ui:ui-android:1.10.0-beta02-androidx.compose.ui:ui-geometry-android:1.10.0-beta02-androidx.compose.ui:ui-geometry:1.10.0-beta02-androidx.compose.ui:ui-graphics-android:1.10.0-beta02-androidx.compose.ui:ui-graphics:1.10.0-beta02-androidx.compose.ui:ui-text-android:1.10.0-beta02-androidx.compose.ui:ui-text:1.10.0-beta02-androidx.compose.ui:ui-tooling-preview-android:1.10.0-beta02-androidx.compose.ui:ui-tooling-preview:1.10.0-beta02-androidx.compose.ui:ui-unit-android:1.10.0-beta02-androidx.compose.ui:ui-unit:1.10.0-beta02-androidx.compose.ui:ui-util-android:1.10.0-beta02-androidx.compose.ui:ui-util:1.10.0-beta02-androidx.compose.ui:ui:1.10.0-beta02+androidx.compose.runtime:runtime-android:1.11.0-rc01+androidx.compose.runtime:runtime-annotation-android:1.11.0-rc01+androidx.compose.runtime:runtime-annotation:1.11.0-rc01+androidx.compose.runtime:runtime-retain-android:1.11.0-rc01+androidx.compose.runtime:runtime-retain:1.11.0-rc01+androidx.compose.runtime:runtime-saveable-android:1.11.0-rc01+androidx.compose.runtime:runtime-saveable:1.11.0-rc01+androidx.compose.runtime:runtime-tracing:1.11.0-rc01+androidx.compose.runtime:runtime:1.11.0-rc01+androidx.compose.ui:ui-android:1.11.0-rc01+androidx.compose.ui:ui-geometry-android:1.11.0-rc01+androidx.compose.ui:ui-geometry:1.11.0-rc01+androidx.compose.ui:ui-graphics-android:1.11.0-rc01+androidx.compose.ui:ui-graphics:1.11.0-rc01+androidx.compose.ui:ui-text-android:1.11.0-rc01+androidx.compose.ui:ui-text:1.11.0-rc01+androidx.compose.ui:ui-tooling-preview-android:1.11.0-rc01+androidx.compose.ui:ui-tooling-preview:1.11.0-rc01+androidx.compose.ui:ui-unit-android:1.11.0-rc01+androidx.compose.ui:ui-unit:1.11.0-rc01+androidx.compose.ui:ui-util-android:1.11.0-rc01+androidx.compose.ui:ui-util:1.11.0-rc01+androidx.compose.ui:ui:1.11.0-rc01androidx.compose:compose-bom-alpha:2025.09.01androidx.concurrent:concurrent-futures-ktx:1.1.0androidx.concurrent:concurrent-futures:1.1.0@@ -128,14 +128,14 @@ androidx.lifecycle:lifecycle-viewmodel:2.10.0androidx.loader:loader:1.0.0androidx.localbroadcastmanager:localbroadcastmanager:1.0.0androidx.metrics:metrics-performance:1.0.0-beta01-androidx.navigation3:navigation3-runtime-android:1.0.0-androidx.navigation3:navigation3-runtime:1.0.0-androidx.navigation3:navigation3-ui-android:1.0.0-androidx.navigation3:navigation3-ui:1.0.0-androidx.navigationevent:navigationevent-android:1.0.0-androidx.navigationevent:navigationevent-compose-android:1.0.0-androidx.navigationevent:navigationevent-compose:1.0.0-androidx.navigationevent:navigationevent:1.0.0+androidx.navigation3:navigation3-runtime-android:1.2.0+androidx.navigation3:navigation3-runtime:1.2.0+androidx.navigation3:navigation3-ui-android:1.2.0+androidx.navigation3:navigation3-ui:1.2.0+androidx.navigationevent:navigationevent-android:1.1.1+androidx.navigationevent:navigationevent-compose-android:1.1.1+androidx.navigationevent:navigationevent-compose:1.1.1+androidx.navigationevent:navigationevent:1.1.1androidx.print:print:1.0.0androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05@@ -157,7 +157,7 @@ androidx.sqlite:sqlite-framework:2.6.1androidx.sqlite:sqlite:2.6.1androidx.startup:startup-runtime:1.1.1androidx.tracing:tracing-ktx:1.3.0-alpha02-androidx.tracing:tracing-perfetto:1.0.0+androidx.tracing:tracing-perfetto:1.0.1androidx.tracing:tracing:1.3.0-alpha02androidx.transition:transition:1.6.0androidx.vectordrawable:vectordrawable-animated:1.1.0diff --git a/app/prodRelease-badging.txt b/app/prodRelease-badging.txtindex 8bd154572..41e56327d 100644--- a/app/prodRelease-badging.txt+++ b/app/prodRelease-badging.txt@@ -1,5 +1,5 @@-package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='16' platformBuildVersionCode='36' compileSdkVersion='36' compileSdkVersionCodename='16'-minSdkVersion:'23'+package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='17' platformBuildVersionCode='37' compileSdkVersion='37' compileSdkVersionCodename='17'+minSdkVersion:'24'targetSdkVersion:'36'uses-permission: name='android.permission.INTERNET'uses-permission: name='android.permission.ACCESS_NETWORK_STATE'@@ -96,7 +96,6 @@ application-label-zh-CN:'Now in Android'application-label-zh-HK:'Now in Android'application-label-zh-TW:'Now in Android'application-label-zu:'Now in Android'-application-icon-120:'res/mipmap-anydpi-v26/ic_launcher.xml'application-icon-160:'res/mipmap-anydpi-v26/ic_launcher.xml'application-icon-240:'res/mipmap-anydpi-v26/ic_launcher.xml'application-icon-320:'res/mipmap-anydpi-v26/ic_launcher.xml'@@ -118,5 +117,5 @@ other-servicessupports-screens: 'small' 'normal' 'large' 'xlarge'supports-any-density: 'true'locales: '--_--' 'af' 'am' 'ar' 'as' 'az' 'be' 'bg' 'bn' 'bs' 'ca' 'cs' 'da' 'de' 'el' 'en-AU' 'en-CA' 'en-GB' 'en-IN' 'en-XC' 'es' 'es-US' 'et' 'eu' 'fa' 'fi' 'fr' 'fr-CA' 'gl' 'gu' 'hi' 'hr' 'hu' 'hy' 'in' 'is' 'it' 'iw' 'ja' 'ka' 'kk' 'km' 'kn' 'ko' 'ky' 'lo' 'lt' 'lv' 'mk' 'ml' 'mn' 'mr' 'ms' 'my' 'nb' 'ne' 'nl' 'or' 'pa' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'si' 'sk' 'sl' 'sq' 'sr' 'sr-Latn' 'sv' 'sw' 'ta' 'te' 'th' 'tl' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh-CN' 'zh-HK' 'zh-TW' 'zu'-densities: '120' '160' '240' '320' '480' '640' '65534'+densities: '160' '240' '320' '480' '640' '65534'native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64'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 ecc23d80e..6e8d4b9a9 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@@ -32,6 +32,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.lifecycle.lifecycleScopeimport androidx.lifecycle.repeatOnLifecycleimport androidx.metrics.performance.JankStats+import androidx.navigation3.runtime.deeplink.DeepLinkRequest+import androidx.navigation3.runtime.deeplink.DeepLinkUri+import androidx.navigation3.runtime.deeplink.UriDeepLinkMatcherimport androidx.tracing.traceimport com.google.samples.apps.nowinandroid.MainActivityUiState.Loadingimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper@@ -40,7 +43,9 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourcimport com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme+import com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_URI_PATTERNimport com.google.samples.apps.nowinandroid.core.ui.LocalTimeZone+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport com.google.samples.apps.nowinandroid.ui.NiaAppimport com.google.samples.apps.nowinandroid.ui.rememberNiaAppStateimport com.google.samples.apps.nowinandroid.util.isSystemInDarkTheme@@ -52,6 +57,11 @@ import kotlinx.coroutines.flow.onEachimport kotlinx.coroutines.launchimport javax.inject.Inject+private val forYouDeepLinkMatcher = UriDeepLinkMatcher(+ uriPattern = DeepLinkUri(DEEP_LINK_URI_PATTERN),+ serializer = ForYouNavKey.serializer(),+)+@AndroidEntryPointclass MainActivity : ComponentActivity() {@@ -132,11 +142,20 @@ class MainActivity : ComponentActivity() {// the UI.splashScreen.setKeepOnScreenCondition { viewModel.uiState.value.shouldKeepSplashScreen() }+ val deepLinkKey = if (savedInstanceState == null) {+ intent.data?.let { uri ->+ forYouDeepLinkMatcher.match(DeepLinkRequest(uri.toString()))?.key+ }+ } else {+ null+ }+setContent {val appState = rememberNiaAppState(networkMonitor = networkMonitor,userNewsResourceRepository = userNewsResourceRepository,timeZoneMonitor = timeZoneMonitor,+ deepLinkKey = deepLinkKey,)val currentTimeZone by appState.currentTimeZone.collectAsStateWithLifecycle()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 7021e4fa0..cc1c495d1 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@@ -67,7 +67,7 @@ val INTERESTS = TopLevelNavItem()val TOP_LEVEL_NAV_ITEMS = mapOf(- ForYouNavKey to FOR_YOU,+ ForYouNavKey() to FOR_YOU,BookmarksNavKey to BOOKMARKS,InterestsNavKey(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 bfaa27fa6..a0e36e723 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@@ -92,7 +92,8 @@ fun NiaApp(modifier: Modifier = Modifier,windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),) {- val shouldShowGradientBackground = appState.navigationState.currentTopLevelKey == ForYouNavKey+ val shouldShowGradientBackground =+ appState.navigationState.currentTopLevelKey == ForYouNavKey()var showSettingsDialog by rememberSaveable { mutableStateOf(false) }NiaBackground(modifier = modifier) {@@ -220,7 +221,7 @@ internal fun NiaApp(// Only show the top app bar on top level destinations.var shouldShowTopAppBar = false- if (appState.navigationState.currentKey in appState.navigationState.topLevelKeys) {+ if (appState.navigationState.isAtTopLevel) {shouldShowTopAppBar = trueval destination = TOP_LEVEL_NAV_ITEMS[appState.navigationState.currentTopLevelKey]@@ -266,7 +267,7 @@ internal fun NiaApp(NavDisplay(entries = appState.navigationState.toEntries(entryProvider),- sceneStrategy = listDetailStrategy,+ sceneStrategies = listOf(listDetailStrategy),onBack = { navigator.goBack() },)}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 9b4814980..9591338f0 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@@ -43,9 +43,14 @@ fun rememberNiaAppState(networkMonitor: NetworkMonitor,userNewsResourceRepository: UserNewsResourceRepository,timeZoneMonitor: TimeZoneMonitor,+ deepLinkKey: NavKey? = null,coroutineScope: CoroutineScope = rememberCoroutineScope(),): NiaAppState {- val navigationState = rememberNavigationState(ForYouNavKey, TOP_LEVEL_NAV_ITEMS.keys)+ val navigationState = rememberNavigationState(+ startKey = ForYouNavKey(),+ topLevelKeys = TOP_LEVEL_NAV_ITEMS.keys,+ deepLinkKey = deepLinkKey,+ )NavigationTrackingSideEffect(navigationState)@@ -89,7 +94,7 @@ class NiaAppState(userNewsResourceRepository.observeAllForFollowedTopics().combine(userNewsResourceRepository.observeAllBookmarked()) { forYouNewsResources, bookmarkedNewsResources ->setOfNotNull(- ForYouNavKey.takeIf { forYouNewsResources.any { !it.hasBeenViewed } },+ ForYouNavKey().takeIf { forYouNewsResources.any { !it.hasBeenViewed } },BookmarksNavKey.takeIf { bookmarkedNewsResources.any { !it.hasBeenViewed } },)}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 810b77cf0..5bd7c9ff1 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@@ -42,6 +42,7 @@ import org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Configimport kotlin.test.assertEquals+import kotlin.test.assertTrue/*** Tests [NiaAppState].@@ -66,10 +67,10 @@ class NiaAppStateTest {private lateinit var state: NiaAppStateprivate fun testNavigationState() = NavigationState(- startKey = ForYouNavKey,- topLevelStack = NavBackStack(ForYouNavKey),+ startKey = ForYouNavKey(),+ topLevelStack = NavBackStack(ForYouNavKey()),subStacks = mapOf(- ForYouNavKey to NavBackStack(ForYouNavKey),+ ForYouNavKey() to NavBackStack(ForYouNavKey()),BookmarksNavKey to NavBackStack(BookmarksNavKey),),)@@ -91,8 +92,8 @@ class NiaAppStateTest {}}- assertEquals(ForYouNavKey, state.navigationState.currentTopLevelKey)- assertEquals(ForYouNavKey, state.navigationState.currentKey)+ assertEquals(ForYouNavKey(), state.navigationState.currentTopLevelKey)+ assertEquals(ForYouNavKey(), state.navigationState.currentKey)// Navigate to another destination oncenavigator.navigate(BookmarksNavKey)@@ -117,11 +118,31 @@ class NiaAppStateTest {assertEquals(3, navigationState.topLevelKeys.size)assertEquals(- setOf(ForYouNavKey, BookmarksNavKey, InterestsNavKey(null)),+ setOf(ForYouNavKey(), BookmarksNavKey, InterestsNavKey(null)),navigationState.topLevelKeys,)}+ @Test+ fun niaAppState_withDeepLinkKey_setsInitialDestinationAtTopLevel() = runTest {+ val deepLinkKey = ForYouNavKey(linkedNewsResourceId = "123")++ composeTestRule.setContent {+ state = rememberNiaAppState(+ networkMonitor = networkMonitor,+ userNewsResourceRepository = userNewsResourceRepository,+ timeZoneMonitor = timeZoneMonitor,+ deepLinkKey = deepLinkKey,+ )+ }++ val navigationState = state.navigationState++ assertEquals(ForYouNavKey(), navigationState.currentTopLevelKey)+ assertEquals(deepLinkKey, navigationState.currentKey)+ assertTrue(navigationState.isAtTopLevel)+ }+@Testfun niaAppState_whenNetworkMonitorIsOffline_StateIsOffline() = runTest(UnconfinedTestDispatcher()) {composeTestRule.setContent {diff --git a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.ktindex 7ee7b0e90..b66b62847 100644--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt@@ -35,10 +35,10 @@ internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension,) {commonExtension.apply {- compileSdk = 36+ compileSdk = 37defaultConfig.apply {- minSdk = 23+ minSdk = 24}compileOptions.apply {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 864fec794..819f628d8 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@@ -33,14 +33,23 @@ import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator/*** Create a navigation state that persists config changes and process death.+ *+ * @param startKey - the starting top level key.+ * @param topLevelKeys - the top level keys, each of which gets its own sub stack.+ * @param deepLinkKey - optional deep link key to use as the initial destination of the [startKey]+ * sub stack.*/@Composablefun rememberNavigationState(startKey: NavKey,topLevelKeys: Set<NavKey>,+ deepLinkKey: NavKey? = null,): NavigationState {val topLevelStack = rememberNavBackStack(startKey)- val subStacks = topLevelKeys.associateWith { key -> rememberNavBackStack(key) }+ val subStacks = topLevelKeys.associateWith { key ->+ val firstKey = if (key == startKey && deepLinkKey != null) deepLinkKey else key+ rememberNavBackStack(firstKey)+ }return remember(startKey, topLevelKeys) {NavigationState(@@ -75,6 +84,8 @@ class NavigationState(@get:VisibleForTestingval currentKey: NavKey by derivedStateOf { currentSubStack.last() }++ val isAtTopLevel: Boolean by derivedStateOf { currentSubStack.size == 1 }}/**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 c1c456476..fede8156b 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,14 +42,13 @@ class Navigator(val state: NavigationState) {* Go back to the previous navigation key.*/fun goBack() {- 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- // stack.- state.topLevelStack.removeLastOrNull()- }- else -> state.currentSubStack.removeLastOrNull()+ when {+ !state.isAtTopLevel -> state.currentSubStack.removeLastOrNull()+ state.currentTopLevelKey == state.startKey ->+ error("You cannot go back from the start route")+ // We're at the base of the current sub stack, go back to the previous top level+ // stack.+ else -> state.topLevelStack.removeLastOrNull()}}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 86c4acc25..ae9ae5043 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@@ -253,4 +253,24 @@ class NavigatorTest {navigator.goBack()}}++ @Test+ fun throwOnBackFromStartTopLevelWithDeepLinkKey() {+ navigationState.subStacks.getValue(TestFirstTopLevelKey)[0] = TestKeyFirst++ assertThat(navigationState.isAtTopLevel).isTrue()+ assertFailsWith<IllegalStateException> {+ navigator.goBack()+ }+ }++ @Test+ fun popTopLevelWhenRootKeyDiffersFromTopLevelKey() {+ navigator.navigate(TestSecondTopLevelKey)+ navigationState.subStacks.getValue(TestSecondTopLevelKey)[0] = TestKeySecond++ navigator.goBack()++ assertThat(navigationState.currentTopLevelKey).isEqualTo(TestFirstTopLevelKey)+ }}diff --git a/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.ktindex d61ae5a20..e9a5fbfb9 100644--- a/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavKey.kt@@ -20,4 +20,6 @@ import androidx.navigation3.runtime.NavKeyimport kotlinx.serialization.Serializable@Serializable-object ForYouNavKey : NavKey+data class ForYouNavKey(+ val linkedNewsResourceId: String? = null,+) : NavKeydiff --git a/feature/foryou/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenTest.kt b/feature/foryou/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenTest.ktindex fc4fc0241..94a05e770 100644--- a/feature/foryou/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenTest.kt+++ b/feature/foryou/impl/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouScreenTest.kt@@ -58,13 +58,11 @@ class ForYouScreenTest {isSyncing = false,onboardingUiState = OnboardingUiState.Loading,feedState = NewsFeedUiState.Loading,- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -84,13 +82,11 @@ class ForYouScreenTest {isSyncing = true,onboardingUiState = OnboardingUiState.NotShown,feedState = NewsFeedUiState.Success(emptyList()),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -116,13 +112,11 @@ class ForYouScreenTest {feedState = NewsFeedUiState.Success(feed = emptyList(),),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -163,13 +157,11 @@ class ForYouScreenTest {feedState = NewsFeedUiState.Success(feed = emptyList(),),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -205,13 +197,11 @@ class ForYouScreenTest {topics = followableTopicTestData,),feedState = NewsFeedUiState.Loading,- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -231,13 +221,11 @@ class ForYouScreenTest {isSyncing = false,onboardingUiState = OnboardingUiState.NotShown,feedState = NewsFeedUiState.Loading,- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}}@@ -258,13 +246,11 @@ class ForYouScreenTest {feedState = NewsFeedUiState.Success(feed = userNewsResourcesTestData,),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },onTopicClick = {},saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},- onDeepLinkOpened = {},)}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 0ae916db3..10007a90a 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@@ -80,7 +80,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.maximport androidx.compose.ui.unit.sp-import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.accompanist.permissions.ExperimentalPermissionsApiimport com.google.accompanist.permissions.PermissionStatus.Denied@@ -109,20 +108,23 @@ import com.google.samples.apps.nowinandroid.feature.foryou.api.Rfun ForYouScreen(onTopicClick: (String) -> Unit,modifier: Modifier = Modifier,- viewModel: ForYouViewModel = hiltViewModel(),+ viewModel: ForYouViewModel,) {val onboardingUiState by viewModel.onboardingUiState.collectAsStateWithLifecycle()val feedState by viewModel.feedState.collectAsStateWithLifecycle()val isSyncing by viewModel.isSyncing.collectAsStateWithLifecycle()val deepLinkedUserNewsResource by viewModel.deepLinkedNewsResource.collectAsStateWithLifecycle()+ DeepLinkEffect(+ deepLinkedUserNewsResource,+ viewModel::onDeepLinkOpened,+ )+ForYouScreen(isSyncing = isSyncing,onboardingUiState = onboardingUiState,feedState = feedState,- deepLinkedUserNewsResource = deepLinkedUserNewsResource,onTopicCheckedChanged = viewModel::updateTopicSelection,- onDeepLinkOpened = viewModel::onDeepLinkOpened,onTopicClick = onTopicClick,saveFollowedTopics = viewModel::dismissOnboarding,onNewsResourcesCheckedChanged = viewModel::updateNewsResourceSaved,@@ -136,10 +138,8 @@ internal fun ForYouScreen(isSyncing: Boolean,onboardingUiState: OnboardingUiState,feedState: NewsFeedUiState,- deepLinkedUserNewsResource: UserNewsResource?,onTopicCheckedChanged: (String, Boolean) -> Unit,onTopicClick: (String) -> Unit,- onDeepLinkOpened: (String) -> Unit,saveFollowedTopics: () -> Unit,onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,onNewsResourceViewed: (String) -> Unit,@@ -244,10 +244,6 @@ internal fun ForYouScreen(}TrackScreenViewEvent(screenName = "ForYou")NotificationPermissionEffect()- DeepLinkEffect(- deepLinkedUserNewsResource,- onDeepLinkOpened,- )}/**@@ -472,7 +468,7 @@ private fun DeepLinkEffect(LaunchedEffect(userNewsResource) {if (userNewsResource == null) return@LaunchedEffect- if (!userNewsResource.hasBeenViewed) onDeepLinkOpened(userNewsResource.id)+ onDeepLinkOpened(userNewsResource.id)launchCustomChromeTab(context = context,@@ -514,13 +510,11 @@ fun ForYouScreenPopulatedFeed(feedState = NewsFeedUiState.Success(feed = userNewsResources,),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- onDeepLinkOpened = {},)}}@@ -538,13 +532,11 @@ fun ForYouScreenOfflinePopulatedFeed(feedState = NewsFeedUiState.Success(feed = userNewsResources,),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- onDeepLinkOpened = {},)}}@@ -565,13 +557,11 @@ fun ForYouScreenTopicSelection(feedState = NewsFeedUiState.Success(feed = userNewsResources,),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- onDeepLinkOpened = {},)}}@@ -584,13 +574,11 @@ fun ForYouScreenLoading() {isSyncing = false,onboardingUiState = OnboardingUiState.Loading,feedState = NewsFeedUiState.Loading,- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- onDeepLinkOpened = {},)}}@@ -608,13 +596,11 @@ fun ForYouScreenPopulatedAndLoading(feedState = NewsFeedUiState.Success(feed = userNewsResources,),- deepLinkedUserNewsResource = null,onTopicCheckedChanged = { _, _ -> },saveFollowedTopics = {},onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- onDeepLinkOpened = {},)}}diff --git a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModel.kt b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModel.ktindex c54551c0b..b6bd122c3 100644--- a/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModel.kt+++ b/feature/foryou/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModel.kt@@ -29,6 +29,10 @@ import com.google.samples.apps.nowinandroid.core.data.util.SyncManagerimport com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCaseimport com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_NEWS_RESOURCE_ID_KEYimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKey+import dagger.assisted.Assisted+import dagger.assisted.AssistedFactory+import dagger.assisted.AssistedInjectimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.SharingStarted@@ -39,24 +43,24 @@ import kotlinx.coroutines.flow.flowOfimport kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.stateInimport kotlinx.coroutines.launch-import javax.inject.Inject-@HiltViewModel-class ForYouViewModel @Inject constructor(+@HiltViewModel(assistedFactory = ForYouViewModel.Factory::class)+class ForYouViewModel @AssistedInject constructor(private val savedStateHandle: SavedStateHandle,syncManager: SyncManager,private val analyticsHelper: AnalyticsHelper,private val userDataRepository: UserDataRepository,userNewsResourceRepository: UserNewsResourceRepository,getFollowableTopics: GetFollowableTopicsUseCase,+ @Assisted private val key: ForYouNavKey,) : ViewModel() {private val shouldShowOnboarding: Flow<Boolean> =userDataRepository.userData.map { !it.shouldHideOnboarding }- val deepLinkedNewsResource = savedStateHandle.getStateFlow<String?>(+ val deepLinkedNewsResource = savedStateHandle.getStateFlow(key = DEEP_LINK_NEWS_RESOURCE_ID_KEY,- null,+ initialValue = key.linkedNewsResourceId,).flatMapLatest { newsResourceId ->if (newsResourceId == null) {@@ -145,6 +149,13 @@ class ForYouViewModel @Inject constructor(userDataRepository.setShouldHideOnboarding(true)}}++ @AssistedFactory+ interface Factory {+ fun create(+ key: ForYouNavKey,+ ): ForYouViewModel+ }}private fun AnalyticsHelper.logNewsDeepLinkOpen(newsResourceId: String) =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 4bdc7368c..110352bc0 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@@ -16,17 +16,20 @@package com.google.samples.apps.nowinandroid.feature.foryou.impl.navigation+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport androidx.navigation3.runtime.EntryProviderScopeimport androidx.navigation3.runtime.NavKeyimport com.google.samples.apps.nowinandroid.core.navigation.Navigatorimport com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouScreen+import com.google.samples.apps.nowinandroid.feature.foryou.impl.ForYouViewModelimport com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopicfun EntryProviderScope<NavKey>.forYouEntry(navigator: Navigator) {- entry<ForYouNavKey> {+ entry<ForYouNavKey> { key ->ForYouScreen(onTopicClick = navigator::navigateToTopic,+ viewModel = hiltViewModel<ForYouViewModel, ForYouViewModel.Factory> { it.create(key) },)}}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 d0d73860e..090418578 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@@ -83,8 +83,6 @@ class ForYouScreenScreenshotTests {onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- deepLinkedUserNewsResource = null,- onDeepLinkOpened = {},)}}@@ -103,8 +101,6 @@ class ForYouScreenScreenshotTests {onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- deepLinkedUserNewsResource = null,- onDeepLinkOpened = {},)}}@@ -179,8 +175,6 @@ class ForYouScreenScreenshotTests {onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- deepLinkedUserNewsResource = null,- onDeepLinkOpened = {},)}}@@ -202,8 +196,6 @@ class ForYouScreenScreenshotTests {onNewsResourcesCheckedChanged = { _, _ -> },onNewsResourceViewed = {},onTopicClick = {},- deepLinkedUserNewsResource = null,- onDeepLinkOpened = {},)}}diff --git a/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModelTest.kt b/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModelTest.ktindex 5008b484c..1c524d345 100644--- a/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModelTest.kt+++ b/feature/foryou/impl/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/impl/ForYouViewModelTest.kt@@ -35,6 +35,7 @@ import com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRuleimport com.google.samples.apps.nowinandroid.core.testing.util.TestAnalyticsHelperimport com.google.samples.apps.nowinandroid.core.testing.util.TestSyncManagerimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouNavKeyimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.launch@@ -84,6 +85,7 @@ class ForYouViewModelTest {userDataRepository = userDataRepository,userNewsResourceRepository = userNewsResourceRepository,getFollowableTopics = getFollowableTopicsUseCase,+ key = ForYouNavKey(),)}@@ -432,11 +434,21 @@ class ForYouViewModelTest {@Testfun deepLinkedNewsResourceIsFetchedAndResetAfterViewing() = runTest {+ val linkedNewsResourceId = sampleNewsResources.first().id+ viewModel = ForYouViewModel(+ syncManager = syncManager,+ savedStateHandle = SavedStateHandle(),+ analyticsHelper = analyticsHelper,+ userDataRepository = userDataRepository,+ userNewsResourceRepository = userNewsResourceRepository,+ getFollowableTopics = getFollowableTopicsUseCase,+ key = ForYouNavKey(linkedNewsResourceId = linkedNewsResourceId),+ )+backgroundScope.launch(UnconfinedTestDispatcher()) { viewModel.deepLinkedNewsResource.collect() }newsRepository.sendNewsResources(sampleNewsResources)userDataRepository.setUserData(emptyUserData)- savedStateHandle[DEEP_LINK_NEWS_RESOURCE_ID_KEY] = sampleNewsResources.first().idassertEquals(expected = UserNewsResource(@@ -447,7 +459,7 @@ class ForYouViewModelTest {)viewModel.onDeepLinkOpened(- newsResourceId = sampleNewsResources.first().id,+ newsResourceId = linkedNewsResourceId,)assertNull(@@ -461,7 +473,7 @@ class ForYouViewModelTest {extras = listOf(Param(key = DEEP_LINK_NEWS_RESOURCE_ID_KEY,- value = sampleNewsResources.first().id,+ value = linkedNewsResourceId,),),),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 0975216d1..1d593f6fc 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@@ -56,7 +56,6 @@ import org.junit.runner.RunWithimport org.robolectric.RobolectricTestRunnerimport org.robolectric.annotation.Configimport javax.inject.Inject-import kotlin.getValueimport kotlin.properties.ReadOnlyPropertyprivate const val EXPANDED_WIDTH = "w1200dp-h840dp"@@ -125,7 +124,7 @@ class InterestsListDetailScreenTest {NavDisplay(entries = navigationState.toEntries(entryProvider),onBack = { navigator.goBack() },- sceneStrategy = rememberListDetailSceneStrategy(),+ sceneStrategies = listOf(rememberListDetailSceneStrategy()),)}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 21f0de8d4..f68a85311 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -23,7 +23,7 @@ androidxLifecycleViewModelNavigation3 = "2.10.0"androidxMacroBenchmark = "1.5.0-alpha01"androidxMetrics = "1.0.0-beta01"androidxNavigation = "2.8.5"-androidxNavigation3 = "1.0.0"+androidxNavigation3 = "1.2.0"androidxProfileinstaller = "1.4.1"androidxSavedStateCompose = "1.3.1"androidxTestCore = "1.7.0-rc01"