A fully functional Android app built entirely with Kotlin and Jetpack Compose
Assisted inject approach
Alex Vanyo800e3d55c971
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 93ed303b8..c33b1611b 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@@ -18,6 +18,7 @@ package com.google.samples.apps.nowinandroid.ui.interests2paneimport androidx.activity.compose.BackHandlerimport androidx.annotation.Keep+import androidx.compose.animation.AnimatedContentimport androidx.compose.foundation.interaction.MutableInteractionSourceimport androidx.compose.foundation.layout.Boximport androidx.compose.material3.LocalMinimumInteractiveComponentSize@@ -50,6 +51,7 @@ import androidx.compose.ui.layout.layoutimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycle+import androidx.lifecycle.viewmodel.viewModelFactoryimport androidx.navigation.NavGraphBuilderimport androidx.navigation.compose.NavHostimport androidx.navigation.compose.composable@@ -57,6 +59,9 @@ import androidx.navigation.compose.rememberNavControllerimport com.google.samples.apps.nowinandroid.feature.interests.InterestsRouteimport 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.TopicScreen+import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel+import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel_Factoryimport 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.topicScreen@@ -126,28 +131,10 @@ internal fun InterestsListDetailScreen(val route = selectedTopicId?.let { TopicRoute(id = it) } ?: TopicPlaceholderRoutemutableStateOf(route)}- var nestedNavKey by rememberSaveable(- stateSaver = Saver({ it.toString() }, UUID::fromString),- ) {- mutableStateOf(UUID.randomUUID())- }- val nestedNavController = key(nestedNavKey) {- rememberNavController()- }fun onTopicClickShowDetailPane(topicId: String) {onTopicClick(topicId)- if (listDetailNavigator.isDetailPaneVisible()) {- // If the detail pane was visible, then use the nestedNavController navigate call- // directly- nestedNavController.navigateToTopic(topicId) {- popUpTo<DetailPaneNavHostRoute>()- }- } else {- // Otherwise, recreate the NavHost entirely, and start at the new destination- nestedNavHostStartRoute = TopicRoute(id = topicId)- nestedNavKey = UUID.randomUUID()- }+ nestedNavHostStartRoute = TopicRoute(id = topicId)coroutineScope.launch {listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)}@@ -207,22 +194,25 @@ internal fun InterestsListDetailScreen(}},) {- key(nestedNavKey) {- NavHost(- navController = nestedNavController,- startDestination = nestedNavHostStartRoute,- route = DetailPaneNavHostRoute::class,- ) {- topicScreen(- showBackButton = !listDetailNavigator.isListPaneVisible(),- onBackClick = {- coroutineScope.launch {- listDetailNavigator.navigateBack()+ AnimatedContent(nestedNavHostStartRoute) { route ->+ when (route) {+ is TopicRoute -> {+ TopicScreen(+ showBackButton = !listDetailNavigator.isListPaneVisible(),+ onBackClick = {+ coroutineScope.launch {+ listDetailNavigator.navigateBack()+ }+ },+ onTopicClick = ::onTopicClickShowDetailPane,+ viewModel = hiltViewModel<TopicViewModel, TopicViewModel.Factory>(+ key = route.id,+ ) { factory ->+ factory.create(route.id)}- },- onTopicClick = ::onTopicClickShowDetailPane,- )- composable<TopicPlaceholderRoute> {+ )+ }+ is TopicPlaceholderRoute -> {TopicDetailPlaceholder()}}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 ba8baad14..8865da463 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@@ -16,10 +16,8 @@package com.google.samples.apps.nowinandroid.feature.topic-import 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@@ -29,7 +27,9 @@ 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.TopicRoute+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@@ -38,18 +38,14 @@ import kotlinx.coroutines.flow.combineimport kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.stateInimport kotlinx.coroutines.launch-import javax.inject.Inject-@HiltViewModel-class TopicViewModel @Inject constructor(- savedStateHandle: SavedStateHandle,+@HiltViewModel(assistedFactory = TopicViewModel.Factory::class)+class TopicViewModel @AssistedInject constructor(private val userDataRepository: UserDataRepository,topicsRepository: TopicsRepository,userNewsResourceRepository: UserNewsResourceRepository,+ @Assisted val topicId: String,) : ViewModel() {-- val topicId = savedStateHandle.toRoute<TopicRoute>().id-val topicUiState: StateFlow<TopicUiState> = topicUiState(topicId = topicId,userDataRepository = userDataRepository,@@ -89,6 +85,13 @@ class TopicViewModel @Inject constructor(userDataRepository.setNewsResourceViewed(newsResourceId, viewed)}}++ @AssistedFactory+ interface Factory {+ fun create(+ topicId: String,+ ): TopicViewModel+ }}private fun topicUiState(