A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update to alpha08, use toRoute to obtain destination inside VM
Don Turner490997281a1c
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 2d5197299..f899164f8 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@@ -36,6 +36,7 @@ import androidx.navigation.compose.rememberNavControllerimport androidx.navigation.navArgumentimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteimport 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.TOPIC_ID_ARGimport com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic@@ -47,16 +48,7 @@ import kotlinx.serialization.Serializable@Serializable object DetailPaneNavHostDestinationfun NavGraphBuilder.interestsListDetailScreen() {- composable(- route = INTERESTS_ROUTE,- arguments = listOf(- navArgument(TOPIC_ID_ARG) {- type = NavType.StringType- defaultValue = null- nullable = true- },- ),- ) {+ composable<InterestsDestination>{InterestsListDetailScreen()}}diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex 468550878..4678c28b2 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt@@ -46,10 +46,7 @@ fun InterestsRoute(InterestsScreen(uiState = uiState,followTopic = viewModel::followTopic,- onTopicClick = {- viewModel.onTopicClick(it)- onTopicClick(it)- },+ onTopicClick = onTopicClick,highlightSelectedTopic = highlightSelectedTopic,modifier = modifier,)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 b369ac5ab..cd1625c17 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@@ -19,47 +19,44 @@ package com.google.samples.apps.nowinandroid.feature.interestsimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope+import androidx.navigation.toRouteimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepositoryimport 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.InterestsDestinationimport com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARGimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlow-import kotlinx.coroutines.flow.combine+import kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.stateInimport kotlinx.coroutines.launchimport javax.inject.Inject@HiltViewModelclass InterestsViewModel @Inject constructor(- private val savedStateHandle: SavedStateHandle,+ savedStateHandle: SavedStateHandle,val userDataRepository: UserDataRepository,getFollowableTopics: GetFollowableTopicsUseCase,) : ViewModel() {- val selectedTopicId: StateFlow<String?> = savedStateHandle.getStateFlow(TOPIC_ID_ARG, null)+ private val interestsDestination : InterestsDestination = savedStateHandle.toRoute()- val uiState: StateFlow<InterestsUiState> = combine(- selectedTopicId,- getFollowableTopics(sortBy = TopicSortField.NAME),- InterestsUiState::Interests,- ).stateIn(- scope = viewModelScope,- started = SharingStarted.WhileSubscribed(5_000),- initialValue = InterestsUiState.Loading,- )+ val uiState: StateFlow<InterestsUiState> =+ getFollowableTopics(sortBy = TopicSortField.NAME).map { topics ->+ InterestsUiState.Interests(interestsDestination.topicId, topics)+ }.stateIn(+ scope = viewModelScope,+ started = SharingStarted.WhileSubscribed(5_000),+ initialValue = InterestsUiState.Loading,+ )fun followTopic(followedTopicId: String, followed: Boolean) {viewModelScope.launch {userDataRepository.setTopicIdFollowed(followedTopicId, followed)}}-- fun onTopicClick(topicId: String?) {- savedStateHandle[TOPIC_ID_ARG] = topicId- }}sealed interface InterestsUiState {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 8a0f2d130..e25c662c0 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@@ -23,12 +23,15 @@ import androidx.navigation.NavTypeimport androidx.navigation.compose.composableimport androidx.navigation.navArgumentimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute+import kotlinx.serialization.Serializableconst 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}"-fun NavController.navigateToInterests(topicId: String? = null, navOptions: NavOptions? = null) {+@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 {@@ -37,7 +40,12 @@ fun NavController.navigateToInterests(topicId: String? = null, navOptions: NavOpnavigate(route, navOptions)}-fun NavGraphBuilder.interestsScreen(+fun NavController.navigateToInterests(topicId: String? = null, navOptions: NavOptions? = null) {+ navigate(route = InterestsDestination(topicId), navOptions)+}+++/*fun NavGraphBuilder.interestsScreenOld(onTopicClick: (String) -> Unit,) {composable(@@ -52,4 +60,6 @@ fun NavGraphBuilder.interestsScreen() {InterestsRoute(onTopicClick = onTopicClick)}-}+}*/++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 9dc30f9bb..5de77ccd1 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@@ -19,6 +19,7 @@ package com.google.samples.apps.nowinandroid.feature.topicimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScope+import androidx.navigation.toRouteimport com.google.samples.apps.nowinandroid.core.data.repository.NewsResourceQueryimport com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepositoryimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository@@ -47,9 +48,7 @@ class TopicViewModel @Inject constructor(userNewsResourceRepository: UserNewsResourceRepository,) : ViewModel() {- // TODO: Remove when alpha08 is released- private val topicDestination = TopicDestination(savedStateHandle["id"]!!)- //private val topicDestination : TopicDestination = savedStateHandle.toRoute()+ private val topicDestination : TopicDestination = savedStateHandle.toRoute()val topicId = topicDestination.iddiff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 46ae30127..ecb56a963 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -21,7 +21,7 @@ androidxLifecycle = "2.7.0"androidxMacroBenchmark = "1.2.2"androidxMetrics = "1.0.0-alpha04"#androidxNavigation = "2.8.0-SNAPSHOT"-androidxNavigation = "2.8.0-alpha07"+androidxNavigation = "2.8.0-alpha08"androidxProfileinstaller = "1.3.1"androidxTestCore = "1.5.0"androidxTestExt = "1.1.5"