A fully functional Android app built entirely with Kotlin and Jetpack Compose
Migrate remainder of app to type-safe navigation
Don Turner89163b5ea11d
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.ktindex 39bc03de7..83bf544fd 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt@@ -20,7 +20,7 @@ import androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.navigation.compose.NavHostimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestinationimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreenimport com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsimport com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen@@ -40,12 +40,11 @@ fun NiaNavHost(appState: NiaAppState,onShowSnackbar: suspend (String, String?) -> Boolean,modifier: Modifier = Modifier,- startDestination: String = FOR_YOU_ROUTE,) {val navController = appState.navControllerNavHost(navController = navController,- startDestination = startDestination,+ startDestination = ForYouDestination::class,modifier = modifier,) {forYouScreen(onTopicClick = navController::navigateToInterests)diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.ktindex aca7d54ab..c8af595b8 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt@@ -19,6 +19,10 @@ package com.google.samples.apps.nowinandroid.navigationimport androidx.compose.ui.graphics.vector.ImageVectorimport com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksDestination+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination+import kotlin.reflect.KClassimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as forYouRimport com.google.samples.apps.nowinandroid.feature.search.R as searchR@@ -33,23 +37,27 @@ enum class TopLevelDestination(val unselectedIcon: ImageVector,val iconTextId: Int,val titleTextId: Int,+ val route: KClass<*>,) {FOR_YOU(selectedIcon = NiaIcons.Upcoming,unselectedIcon = NiaIcons.UpcomingBorder,iconTextId = forYouR.string.feature_foryou_title,titleTextId = R.string.app_name,+ route = ForYouDestination::class,),BOOKMARKS(selectedIcon = NiaIcons.Bookmarks,unselectedIcon = NiaIcons.BookmarksBorder,iconTextId = bookmarksR.string.feature_bookmarks_title,titleTextId = bookmarksR.string.feature_bookmarks_title,+ route = BookmarksDestination::class,),INTERESTS(selectedIcon = NiaIcons.Grid3x3,unselectedIcon = NiaIcons.Grid3x3,iconTextId = searchR.string.feature_search_interests,titleTextId = searchR.string.feature_search_interests,+ route = InterestsDestination::class,),}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 8cbabc247..603a4b3c5 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@@ -58,6 +58,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceIdimport androidx.compose.ui.unit.dpimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavDestination+import androidx.navigation.NavDestination.Companion.hasRouteimport androidx.navigation.NavDestination.Companion.hierarchyimport com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground@@ -315,5 +316,5 @@ private fun Modifier.notificationDot(): Modifier =private fun NavDestination?.isTopLevelDestinationInHierarchy(destination: TopLevelDestination) =this?.hierarchy?.any {- it.route?.contains(destination.name, true) ?: false+ it.hasRoute(destination.route)} ?: falsediff --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 b653d8910..40011b6d4 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@@ -24,6 +24,7 @@ import androidx.compose.runtime.rememberimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.navigation.NavControllerimport androidx.navigation.NavDestination+import androidx.navigation.NavDestination.Companion.hasRouteimport androidx.navigation.NavGraph.Companion.findStartDestinationimport androidx.navigation.NavHostControllerimport androidx.navigation.compose.currentBackStackEntryAsState@@ -34,11 +35,11 @@ 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.ui.TrackDisposableJank-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BOOKMARKS_ROUTE+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksDestinationimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestinationimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou-import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTE+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestinationimport com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsimport com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearchimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination@@ -96,11 +97,13 @@ class NiaAppState(.currentBackStackEntryAsState().value?.destinationval currentTopLevelDestination: TopLevelDestination?- @Composable get() = when (currentDestination?.route) {- FOR_YOU_ROUTE -> FOR_YOU- BOOKMARKS_ROUTE -> BOOKMARKS- INTERESTS_ROUTE -> INTERESTS- else -> null+ @Composable get(){+ with(currentDestination) {+ if (this?.hasRoute<ForYouDestination>() == true) return FOR_YOU+ if (this?.hasRoute<BookmarksDestination>() == true) return BOOKMARKS+ if (this?.hasRoute<InterestsDestination>() == true) return INTERESTS+ }+ return null}val shouldShowBottomBar: Booleandiff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.ktindex f899164f8..397c947ef 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt@@ -29,15 +29,11 @@ import androidx.compose.runtime.getValueimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavGraphBuilder-import androidx.navigation.NavTypeimport androidx.navigation.compose.NavHostimport androidx.navigation.compose.composableimport androidx.navigation.compose.rememberNavController-import androidx.navigation.navArgumentimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTEimport com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARGimport com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopicimport com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreendiff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktindex 13d0baef0..f717a76f1 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt@@ -21,16 +21,19 @@ import androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsimport androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute+import kotlinx.serialization.Serializable-const val BOOKMARKS_ROUTE = "bookmarks_route"+@Serializable object BookmarksDestination-fun NavController.navigateToBookmarks(navOptions: NavOptions) = navigate(BOOKMARKS_ROUTE, navOptions)+fun NavController.navigateToBookmarks(navOptions: NavOptions) =+ navigate(route = BookmarksDestination, navOptions)fun NavGraphBuilder.bookmarksScreen(onTopicClick: (String) -> Unit,onShowSnackbar: suspend (String, String?) -> Boolean,) {- composable(route = BOOKMARKS_ROUTE) {+ composable<BookmarksDestination> {BookmarksRoute(onTopicClick, onShowSnackbar)}}+diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktindex 8e94a491a..202921c33 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt@@ -19,28 +19,23 @@ package com.google.samples.apps.nowinandroid.feature.foryou.navigationimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptions-import androidx.navigation.NavTypeimport androidx.navigation.compose.composable-import androidx.navigation.navArgumentimport androidx.navigation.navDeepLinkimport com.google.samples.apps.nowinandroid.feature.foryou.ForYouRoute+import kotlinx.serialization.Serializableconst val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"-const val FOR_YOU_ROUTE = "for_you_route/{$LINKED_NEWS_RESOURCE_ID}"private const val DEEP_LINK_URI_PATTERN ="https://www.nowinandroid.apps.samples.google.com/foryou/{$LINKED_NEWS_RESOURCE_ID}"+@Serializable data class ForYouDestination(val linkedNewsResourceId: String? = null)-fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(FOR_YOU_ROUTE, navOptions)+fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouDestination(), navOptions)fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {- composable(- route = FOR_YOU_ROUTE,+ composable<ForYouDestination>(deepLinks = listOf(navDeepLink { uriPattern = DEEP_LINK_URI_PATTERN },- ),- arguments = listOf(- navArgument(LINKED_NEWS_RESOURCE_ID) { type = NavType.StringType },- ),+ )) {ForYouRoute(onTopicClick)}diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktindex e25c662c0..a1c267461 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt@@ -17,49 +17,14 @@package com.google.samples.apps.nowinandroid.feature.interests.navigationimport androidx.navigation.NavController-import androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptions-import androidx.navigation.NavType-import androidx.navigation.compose.composable-import androidx.navigation.navArgument-import com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteimport kotlinx.serialization.Serializable+const val TOPIC_ID_ARG = "topicId"-const val INTERESTS_ROUTE_BASE = "interests_route"-const val INTERESTS_ROUTE = "$INTERESTS_ROUTE_BASE?$TOPIC_ID_ARG={$TOPIC_ID_ARG}"@Serializable data class InterestsDestination(val topicId: String?)-fun NavController.navigateToInterestsOld(topicId: String? = null, navOptions: NavOptions? = null) {- val route = if (topicId != null) {- "${INTERESTS_ROUTE_BASE}?${TOPIC_ID_ARG}=$topicId"- } else {- INTERESTS_ROUTE_BASE- }- navigate(route, navOptions)-}-fun NavController.navigateToInterests(topicId: String? = null, navOptions: NavOptions? = null) {navigate(route = InterestsDestination(topicId), navOptions)-}---/*fun NavGraphBuilder.interestsScreenOld(- onTopicClick: (String) -> Unit,-) {- composable(- route = INTERESTS_ROUTE,- arguments = listOf(- navArgument(TOPIC_ID_ARG) {- defaultValue = null- nullable = true- type = NavType.StringType- },- ),- ) {- InterestsRoute(onTopicClick = onTopicClick)- }-}*/--+}\ No newline at end of filediff --git a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.ktindex 63d3c49b7..901c9b796 100644--- a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt+++ b/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt@@ -55,7 +55,8 @@ class InterestsViewModelTest {@Beforefun setup() {viewModel = InterestsViewModel(- savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),+ //TODO: Figure out how to supply the correct dependency: InterestsDestination(topicId = testInputTopics[0].topic.id)+ savedStateHandle = SavedStateHandle(mapOf("topicId" to testInputTopics[0].topic.id)),userDataRepository = userDataRepository,getFollowableTopics = getFollowableTopicsUseCase,)diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktindex e1b2581f0..0cdfcb502 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt@@ -16,7 +16,6 @@package com.google.samples.apps.nowinandroid.feature.topic.navigation-import androidx.annotation.VisibleForTestingimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsBuilder@@ -24,11 +23,6 @@ import androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.topic.TopicScreenimport kotlinx.serialization.Serializable-// TODO: Remove-@VisibleForTesting-internal const val TOPIC_ID_ARG = "topicId"-const val TOPIC_ROUTE = "topic_route"-@Serializable data class TopicDestination(val id: String)fun NavController.navigateToTopic(topicId: String, navOptions: NavOptionsBuilder.() -> Unit = {}) {diff --git a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktindex 565732f59..4ebb6990d 100644--- a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt+++ b/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt@@ -25,7 +25,6 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepoimport 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.topic.navigation.TOPIC_ID_ARGimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.flow.combineimport kotlinx.coroutines.flow.first@@ -60,7 +59,8 @@ class TopicViewModelTest {@Beforefun setup() {viewModel = TopicViewModel(- savedStateHandle = SavedStateHandle(mapOf(TOPIC_ID_ARG to testInputTopics[0].topic.id)),+ //TODO: Figure out how to supply the correct dependency TopicDestination(id = testInputTopics[0].topic.id)+ savedStateHandle = SavedStateHandle(mapOf("id" to testInputTopics[0].topic.id)),userDataRepository = userDataRepository,topicsRepository = topicsRepository,userNewsResourceRepository = userNewsResourceRepository,