A fully functional Android app built entirely with Kotlin and Jetpack Compose
Rename followedInterestsState to followedInterestsUiState
madroid63fd5a523b36
diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsState.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.ktsimilarity index 86%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsState.ktrename to feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.ktindex 61088d7c6..744cebbaa 100644--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsState.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt@@ -19,17 +19,17 @@ package com.google.samples.apps.nowinandroid.feature.foryou/*** A sealed hierarchy for the user's current followed interests state.*/-sealed interface FollowedInterestsState {+sealed interface FollowedInterestsUiState {/*** The current state is unknown (hasn't loaded yet)*/- object Unknown : FollowedInterestsState+ object Unknown : FollowedInterestsUiState/*** The user hasn't followed any interests yet.*/- object None : FollowedInterestsState+ object None : FollowedInterestsUiState/*** The user has followed the given (non-empty) set of [topicIds] or [authorIds].@@ -37,5 +37,5 @@ sealed interface FollowedInterestsState {data class FollowedInterests(val topicIds: Set<String>,val authorIds: Set<String>- ) : FollowedInterestsState+ ) : FollowedInterestsUiState}diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktindex 6c8dc3470..a64e6b1c4 100644--- a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt@@ -33,9 +33,9 @@ import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.model.data.NewsResourceimport com.google.samples.apps.nowinandroid.core.model.data.SaveableNewsResourceimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState-import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsState.FollowedInterests-import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsState.None-import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsState.Unknown+import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsUiState.FollowedInterests+import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsUiState.None+import com.google.samples.apps.nowinandroid.feature.foryou.FollowedInterestsUiState.Unknownimport dagger.hilt.android.lifecycle.HiltViewModelimport javax.inject.Injectimport kotlinx.coroutines.flow.Flow@@ -60,7 +60,7 @@ class ForYouViewModel @Inject constructor(savedStateHandle: SavedStateHandle) : ViewModel() {- private val followedInterestsState: StateFlow<FollowedInterestsState> =+ private val followedInterestsUiState: StateFlow<FollowedInterestsUiState> =userDataRepository.userDataStream.map { userData ->if (userData.followedAuthors.isEmpty() && userData.followedTopics.isEmpty()) {@@ -107,7 +107,7 @@ class ForYouViewModel @Inject constructor(val feedState: StateFlow<NewsFeedUiState> =combine(- followedInterestsState,+ followedInterestsUiState,snapshotFlow { inProgressTopicSelection },snapshotFlow { inProgressAuthorSelection }) { followedInterestsUserState, inProgressTopicSelection, inProgressAuthorSelection ->@@ -148,7 +148,7 @@ class ForYouViewModel @Inject constructor(val interestsSelectionState: StateFlow<ForYouInterestsSelectionUiState> =combine(- followedInterestsState,+ followedInterestsUiState,topicsRepository.getTopicsStream(),authorsRepository.getAuthorsStream(),snapshotFlow { inProgressTopicSelection },