A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix tests, fix spotless
Don Turnerbe752e779d5e
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 1eddde8e6..3ad2c6162 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@@ -26,7 +26,6 @@ import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItimport androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigatorimport androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigatorimport androidx.compose.runtime.Composable-import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.runtime.keyimport androidx.compose.runtime.mutableStateOf@@ -34,7 +33,6 @@ import androidx.compose.runtime.rememberimport androidx.compose.runtime.saveable.Saverimport androidx.compose.runtime.saveable.rememberSaveableimport androidx.compose.runtime.setValue-import androidx.compose.runtime.setValueimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavGraphBuilder@@ -47,8 +45,8 @@ import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholderimport com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicDestinationimport com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopicimport com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen-import java.util.UUIDimport kotlinx.serialization.Serializable+import java.util.UUID@Serializable object TopicPlaceholderDestination@@ -135,7 +133,7 @@ internal fun InterestsListDetailScreen(NavHost(navController = nestedNavController,startDestination = nestedNavHostStartDestination,- route = DetailPaneNavHostDestination::class+ route = DetailPaneNavHostDestination::class,) {topicScreen(showBackButton = !listDetailNavigator.isListPaneVisible(),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 ca7228f27..91e710b32 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@@ -25,6 +25,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.TOPIC_ID_KEYimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.launchimport kotlinx.coroutines.test.UnconfinedTestDispatcher@@ -54,8 +55,9 @@ class InterestsViewModelTest {@Beforefun setup() {viewModel = InterestsViewModel(- // TODO: Figure out how to supply the correct dependency: InterestsDestination(topicId = testInputTopics[0].topic.id)- savedStateHandle = SavedStateHandle(mapOf("topicId" to testInputTopics[0].topic.id)),+ // TODO: Construct from destination when aosp/3073537 lands (due 14th May 2024)+ // savedStateHandle = SavedStateHandle(InterestsDestination(initialTopicId = testInputTopics[0].topic.id)),+ savedStateHandle = SavedStateHandle(mapOf("initialTopicId" to testInputTopics[0].topic.id)),userDataRepository = userDataRepository,getFollowableTopics = getFollowableTopicsUseCase,)