From cd0b0925b83c8336f264b206b8ec4c62ab4fcca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Moczkowski?= <mmoczkowski@google.com>
Date: Fri, 26 May 2023 14:15:31 +0200
Subject: [PATCH] Improvements

Change-Id: Ie4a782e2c26576098aff87ca164968886821cdcc
---
 .../feature/interests/InterestsRoute.kt        |  2 +-
 .../feature/interests/InterestsViewModel.kt    |  2 +-
 .../interests/InterestsViewModelTest.kt        | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsRoute.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsRoute.kt
index 06f3a3a69..a48d1c2f7 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsRoute.kt
+++ b/feature/interests/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/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt
index d0421b3b0..ed3a4a726 100644
--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt
+++ b/feature/interests/src/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/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
index 56851655a..bf122aa88 100644
--- a/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
+++ b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt
@@ -78,22 +78,22 @@ 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 })
@@ -101,7 +101,7 @@ class InterestsViewModelTest {
 
         assertEquals(
             false,
-            (viewModel.interestUiState.value as InterestsUiState.Interests)
+            (viewModel.interestsUiState.value as InterestsUiState.Interests)
                 .topics.first { it.topic.id == toggleTopicId }.isFollowed,
         )
 
@@ -112,7 +112,7 @@ class InterestsViewModelTest {
 
         assertEquals(
             InterestsUiState.Interests(topics = testOutputTopics, selectedTopicId = selectedTopidId),
-            viewModel.interestUiState.value,
+            viewModel.interestsUiState.value,
         )
 
         collectJob.cancel()
@@ -120,7 +120,7 @@ class InterestsViewModelTest {
 
     @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()