Improvements

Change-Id: Ie4a782e2c26576098aff87ca164968886821cdcc
android · May 31, 2023 · 96c80f2 · 96c80f2
1 parent 5205f13
commit 96c80f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...ts/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsRoute.kt b/...ts/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsRoute.kt
@@ -42,7 +42,7 @@ internal fun InterestsRoute(
     modifier: Modifier = Modifier,
     viewModel: InterestsViewModel = hiltViewModel(),
 ) {
-    val interestUiState by viewModel.interestUiState.collectAsStateWithLifecycle()
+    val interestUiState by viewModel.interestsUiState.collectAsStateWithLifecycle()
     val topicUiState by viewModel.topicUiState.collectAsStateWithLifecycle()
 
     Row(modifier = modifier.fillMaxSize()) {

diff --git a/...rc/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/...rc/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt
@@ -55,7 +55,7 @@ class InterestsViewModel @Inject constructor(
     private val topicId: StateFlow<String?> =
         savedStateHandle.getStateFlow(topicIdArg, null)
 
-    val interestUiState: StateFlow<InterestsUiState> = combine(
+    val interestsUiState: StateFlow<InterestsUiState> = combine(
         getFollowableTopics(sortBy = TopicSortField.NAME),
         topicId,
     ) { topics, selectedTopicId ->

diff --git a/...ts/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/...ts/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
@@ -78,30 +78,30 @@ class InterestsViewModelTest {
 
     @Test
     fun uiState_whenInitialized_thenShowLoading() = runTest {
-        assertEquals(InterestsUiState.Loading, viewModel.interestUiState.value)
+        assertEquals(InterestsUiState.Loading, viewModel.interestsUiState.value)
     }
 
     @Test
     fun uiState_whenFollowedTopicsAreLoading_thenShowLoading() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestUiState.collect() }
+        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestsUiState.collect() }
 
         userDataRepository.setFollowedTopicIds(emptySet())
-        assertEquals(InterestsUiState.Loading, viewModel.interestUiState.value)
+        assertEquals(InterestsUiState.Loading, viewModel.interestsUiState.value)
 
         collectJob.cancel()
     }
 
     @Test
     fun uiState_whenFollowingNewTopic_thenShowUpdatedTopics() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestUiState.collect() }
+        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestsUiState.collect() }
 
         val toggleTopicId = testOutputTopics[1].topic.id
         topicsRepository.sendTopics(testInputTopics.map { it.topic })
         userDataRepository.setFollowedTopicIds(setOf(testInputTopics[0].topic.id))
 
         assertEquals(
             false,
-            (viewModel.interestUiState.value as InterestsUiState.Interests)
+            (viewModel.interestsUiState.value as InterestsUiState.Interests)
                 .topics.first { it.topic.id == toggleTopicId }.isFollowed,
         )
 
@@ -112,15 +112,15 @@ class InterestsViewModelTest {
 
         assertEquals(
             InterestsUiState.Interests(topics = testOutputTopics, selectedTopicId = selectedTopidId),
-            viewModel.interestUiState.value,
+            viewModel.interestsUiState.value,
         )
 
         collectJob.cancel()
     }
 
     @Test
     fun uiState_whenUnfollowingTopics_thenShowUpdatedTopics() = runTest {
-        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestUiState.collect() }
+        val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.interestsUiState.collect() }
 
         val toggleTopicId = testOutputTopics[1].topic.id
 
@@ -131,7 +131,7 @@ class InterestsViewModelTest {
 
         assertEquals(
             true,
-            (viewModel.interestUiState.value as InterestsUiState.Interests)
+            (viewModel.interestsUiState.value as InterestsUiState.Interests)
                 .topics.first { it.topic.id == toggleTopicId }.isFollowed,
         )
 
@@ -142,7 +142,7 @@ class InterestsViewModelTest {
 
         assertEquals(
             InterestsUiState.Interests(topics = testInputTopics, selectedTopicId = selectedTopidId),
-            viewModel.interestUiState.value,
+            viewModel.interestsUiState.value,
         )
 
         collectJob.cancel()