A fully functional Android app built entirely with Kotlin and Jetpack Compose
More NavigationState refactoring. Fix compilation errors.
Don Turneraf504d2331ac
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 32f836c55..4438eee5e 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,8 +32,6 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.lifecycle.lifecycleScopeimport androidx.lifecycle.repeatOnLifecycleimport androidx.metrics.performance.JankStats-import androidx.navigation3.runtime.EntryProviderScope-import androidx.navigation3.runtime.NavKeyimport androidx.tracing.traceimport com.google.samples.apps.nowinandroid.MainActivityUiState.Loadingimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper@@ -42,9 +40,6 @@ 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.navigation.NiaBackStackViewModel-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigatorimport com.google.samples.apps.nowinandroid.core.ui.LocalTimeZoneimport com.google.samples.apps.nowinandroid.ui.NiaAppimport com.google.samples.apps.nowinandroid.ui.rememberNiaAppStatediff --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 a3dbd62de..c870916db 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@@ -55,7 +55,7 @@ fun rememberNavigationState(* State holder for navigation state.** @param startKey - the starting navigation key. The user will exit the app through this key.- * @param currentTopLevelKey - the current top level key+ * @param topLevelStack - the top level back stack. It holds only top level keys.* @param subStacks - the back stacks for each top level key*/class NavigationState(@@ -75,16 +75,7 @@ class NavigationState(@get:VisibleForTestingval currentKey- get() = currentSubStack?.last()-- // TODO: Fix this- /*val stacksInUse: List<NavKey>- get() = topLevel- listOf(startRoute)- } else {- listOf(startRoute, topLevelRoute)- }-*/+ get() = currentSubStack.last()}/**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/BookmarksRoute.ktindex c96b49392..994aeecf1 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/BookmarksRoute.kt@@ -17,14 +17,7 @@package com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigationimport androidx.navigation3.runtime.NavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKeyimport kotlinx.serialization.Serializable-/*@Serializable-object BookmarksRoute : NiaNavKey {- override val isTopLevel: Boolean- get() = true-}*/-@Serializableobject BookmarksRoute : NavKeydiff --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/ForYouRoute.ktindex 396a8dfc0..91adea3a1 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/ForYouRoute.kt@@ -17,16 +17,7 @@package com.google.samples.apps.nowinandroid.feature.foryou.api.navigationimport androidx.navigation3.runtime.NavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKeyimport kotlinx.serialization.Serializable-/*-@Serializable-object ForYouRoute : NiaNavKey { // route to ForYou screen- override val isTopLevel: Boolean- get() = true-}-*/-@Serializableobject ForYouRoute : NavKeydiff --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/InterestsRoute.ktindex 36bffbc08..ca7968778 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/InterestsRoute.kt@@ -17,21 +17,8 @@package com.google.samples.apps.nowinandroid.feature.interests.api.navigationimport androidx.navigation3.runtime.NavKey-import com.google.samples.apps.nowinandroid.core.navigation.NiaNavKeyimport kotlinx.serialization.Serializable-/*-@Serializable-data class InterestsRoute(- // The ID of the topic which will be initially selected at this destination- val initialTopicId: String? = null,-) : NiaNavKey {- override val isTopLevel: Boolean- get() = true-}-*/--@Serializabledata class InterestsRoute(// The ID of the topic which will be initially selected at this destination