A fully functional Android app built entirely with Kotlin and Jetpack Compose
Rename Destinations to Routes
Don Turnerda8f32a2ea1a
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 23ff1edc7..141c86916 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.ForYouDestination+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRouteimport 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@@ -44,7 +44,7 @@ fun NiaNavHost(val navController = appState.navControllerNavHost(navController = navController,- startDestination = ForYouDestination(),+ startDestination = ForYouRoute(),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 c8af595b8..ac04f683a 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,9 +19,9 @@ 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 com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport kotlin.reflect.KClassimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR@@ -44,20 +44,20 @@ enum class TopLevelDestination(unselectedIcon = NiaIcons.UpcomingBorder,iconTextId = forYouR.string.feature_foryou_title,titleTextId = R.string.app_name,- route = ForYouDestination::class,+ route = ForYouRoute::class,),BOOKMARKS(selectedIcon = NiaIcons.Bookmarks,unselectedIcon = NiaIcons.BookmarksBorder,iconTextId = bookmarksR.string.feature_bookmarks_title,titleTextId = bookmarksR.string.feature_bookmarks_title,- route = BookmarksDestination::class,+ route = BookmarksRoute::class,),INTERESTS(selectedIcon = NiaIcons.Grid3x3,unselectedIcon = NiaIcons.Grid3x3,iconTextId = searchR.string.feature_search_interests,titleTextId = searchR.string.feature_search_interests,- route = InterestsDestination::class,+ route = InterestsRoute::class,),}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 3fd213fe7..300d67cfd 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@@ -35,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.BookmarksDestination+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRouteimport com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestination+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRouteimport com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport 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@@ -99,9 +99,9 @@ class NiaAppState(val currentTopLevelDestination: TopLevelDestination?@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+ if (this?.hasRoute<ForYouRoute>() == true) return FOR_YOU+ if (this?.hasRoute<BookmarksRoute>() == true) return BOOKMARKS+ if (this?.hasRoute<InterestsRoute>() == true) return INTERESTS}return null}diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.ktindex 5bb22f057..22e3c343b 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt@@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid.ui.interests2paneimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModelimport androidx.navigation.toRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_KEYimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.StateFlow@@ -32,10 +32,10 @@ class Interests2PaneViewModel @Inject constructor(private val savedStateHandle: SavedStateHandle,) : ViewModel() {- val destination = savedStateHandle.toRoute<InterestsDestination>()+ val route = savedStateHandle.toRoute<InterestsRoute>()val selectedTopicId: StateFlow<String?> = savedStateHandle.getStateFlow(key = TOPIC_ID_KEY,- initialValue = destination.initialTopicId,+ initialValue = route.initialTopicId,)fun onTopicClick(topicId: String?) {diff --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 3ad2c6162..1b5913b15 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@@ -40,20 +40,20 @@ import androidx.navigation.compose.NavHostimport androidx.navigation.compose.composableimport androidx.navigation.compose.rememberNavControllerimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicDestination+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRouteimport com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopicimport com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreenimport kotlinx.serialization.Serializableimport java.util.UUID-@Serializable object TopicPlaceholderDestination+@Serializable internal object TopicPlaceholderRoute-@Serializable object DetailPaneNavHostDestination+@Serializable internal object DetailPaneNavHostRoutefun NavGraphBuilder.interestsListDetailScreen() {- composable<InterestsDestination> {+ composable<InterestsRoute> {InterestsListDetailScreen()}}@@ -87,9 +87,9 @@ internal fun InterestsListDetailScreen(listDetailNavigator.navigateBack()}- var nestedNavHostStartDestination by remember {- val destination = selectedTopicId?.let { TopicDestination(id = it) } ?: TopicPlaceholderDestination- mutableStateOf(destination)+ var nestedNavHostStartRoute by remember {+ val route = selectedTopicId?.let { TopicRoute(id = it) } ?: TopicPlaceholderRoute+ mutableStateOf(route)}var nestedNavKey by rememberSaveable(stateSaver = Saver({ it.toString() }, UUID::fromString),@@ -106,11 +106,11 @@ internal fun InterestsListDetailScreen(// If the detail pane was visible, then use the nestedNavController navigate call// directlynestedNavController.navigateToTopic(topicId) {- popUpTo<DetailPaneNavHostDestination>()+ popUpTo<DetailPaneNavHostRoute>()}} else {// Otherwise, recreate the NavHost entirely, and start at the new destination- nestedNavHostStartDestination = TopicDestination(id = topicId)+ nestedNavHostStartRoute = TopicRoute(id = topicId)nestedNavKey = UUID.randomUUID()}listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)@@ -132,15 +132,15 @@ internal fun InterestsListDetailScreen(key(nestedNavKey) {NavHost(navController = nestedNavController,- startDestination = nestedNavHostStartDestination,- route = DetailPaneNavHostDestination::class,+ startDestination = nestedNavHostStartRoute,+ route = DetailPaneNavHostRoute::class,) {topicScreen(showBackButton = !listDetailNavigator.isListPaneVisible(),onBackClick = listDetailNavigator::navigateBack,onTopicClick = ::onTopicClickShowDetailPane,)- composable<TopicPlaceholderDestination> {+ composable<TopicPlaceholderRoute> {TopicDetailPlaceholder()}}diff --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 1e044ec74..ea8d525ab 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@@ -23,16 +23,16 @@ import androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRouteimport kotlinx.serialization.Serializable-@Serializable object BookmarksDestination+@Serializable object BookmarksRoutefun NavController.navigateToBookmarks(navOptions: NavOptions) =- navigate(route = BookmarksDestination, navOptions)+ navigate(route = BookmarksRoute, navOptions)fun NavGraphBuilder.bookmarksScreen(onTopicClick: (String) -> Unit,onShowSnackbar: suspend (String, String?) -> Boolean,) {- composable<BookmarksDestination> {+ composable<BookmarksRoute> {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 e0874bbf8..11bc8a251 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@@ -30,14 +30,14 @@ const val LINKED_NEWS_RESOURCE_ID = "linkedNewsResourceId"private const val DEEP_LINK_BASE_PATH = "$DEEP_LINK_SCHEME_AND_HOST/$FOR_YOU_PATH"-@Serializable data class ForYouDestination(val linkedNewsResourceId: String? = null)+@Serializable data class ForYouRoute(val linkedNewsResourceId: String? = null)-fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouDestination(), navOptions)+fun NavController.navigateToForYou(navOptions: NavOptions) = navigate(route = ForYouRoute(), navOptions)fun NavGraphBuilder.forYouScreen(onTopicClick: (String) -> Unit) {- composable<ForYouDestination>(+ composable<ForYouRoute>(deepLinks = listOf(- navDeepLink<ForYouDestination>(basePath = DEEP_LINK_BASE_PATH),+ navDeepLink<ForYouRoute>(basePath = DEEP_LINK_BASE_PATH),),) {ForYouRoute(onTopicClick)diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.ktindex 2cc81b649..0ffa3a473 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt@@ -24,7 +24,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.navigation.InterestsDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_KEYimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.SharingStarted@@ -41,10 +41,10 @@ class InterestsViewModel @Inject constructor(getFollowableTopics: GetFollowableTopicsUseCase,) : ViewModel() {- private val interestsDestination: InterestsDestination = savedStateHandle.toRoute()+ private val interestsRoute: InterestsRoute = savedStateHandle.toRoute()private val selectedTopicId = savedStateHandle.getStateFlow(key = TOPIC_ID_KEY,- initialValue = interestsDestination.initialTopicId,+ initialValue = interestsRoute.initialTopicId,)val uiState: StateFlow<InterestsUiState> = combine(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 89950f09a..b0a85a5be 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@@ -22,7 +22,7 @@ import kotlinx.serialization.Serializableconst val TOPIC_ID_KEY = "topicId"-@Serializable data class InterestsDestination(+@Serializable data class InterestsRoute(// The ID of the topic which will be initially selected at this destinationval initialTopicId: String?,)@@ -31,5 +31,5 @@ fun NavController.navigateToInterests(initialTopicId: String? = null,navOptions: NavOptions? = null,) {- navigate(route = InterestsDestination(initialTopicId), navOptions)+ navigate(route = InterestsRoute(initialTopicId), navOptions)}diff --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 6ecbc2dda..eddc9ff7c 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@@ -26,7 +26,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRuleimport com.google.samples.apps.nowinandroid.feature.interests.InterestsUiStateimport com.google.samples.apps.nowinandroid.feature.interests.InterestsViewModel-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsDestination+import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRouteimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.launchimport kotlinx.coroutines.test.UnconfinedTestDispatcher@@ -59,7 +59,7 @@ class InterestsViewModelTest {// TODO: This line causes tests to fail since it introduces an Android dependency// see b/340966212 for more informationsavedStateHandle = SavedStateHandle(- route = InterestsDestination(initialTopicId = testInputTopics[0].topic.id),+ route = InterestsRoute(initialTopicId = testInputTopics[0].topic.id),),userDataRepository = userDataRepository,getFollowableTopics = getFollowableTopicsUseCase,diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.ktindex 3a487be79..ba8baad14 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt@@ -29,7 +29,7 @@ import com.google.samples.apps.nowinandroid.core.model.data.Topicimport com.google.samples.apps.nowinandroid.core.model.data.UserNewsResourceimport com.google.samples.apps.nowinandroid.core.result.Resultimport com.google.samples.apps.nowinandroid.core.result.asResult-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicDestination+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRouteimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.Flowimport kotlinx.coroutines.flow.SharingStarted@@ -48,7 +48,7 @@ class TopicViewModel @Inject constructor(userNewsResourceRepository: UserNewsResourceRepository,) : ViewModel() {- val topicId = savedStateHandle.toRoute<TopicDestination>().id+ val topicId = savedStateHandle.toRoute<TopicRoute>().idval topicUiState: StateFlow<TopicUiState> = topicUiState(topicId = topicId,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 c116c6432..fabb82b10 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@@ -23,10 +23,10 @@ import androidx.navigation.compose.composableimport com.google.samples.apps.nowinandroid.feature.topic.TopicScreenimport kotlinx.serialization.Serializable-@Serializable data class TopicDestination(val id: String)+@Serializable data class TopicRoute(val id: String)fun NavController.navigateToTopic(topicId: String, navOptions: NavOptionsBuilder.() -> Unit = {}) {- navigate(route = TopicDestination(topicId)) {+ navigate(route = TopicRoute(topicId)) {navOptions()}}@@ -36,7 +36,7 @@ fun NavGraphBuilder.topicScreen(onBackClick: () -> Unit,onTopicClick: (String) -> Unit,) {- composable<TopicDestination> {+ composable<TopicRoute> {TopicScreen(showBackButton = showBackButton,onBackClick = onBackClick,