A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove tab state from InterestsViewModel
Alex Vanyo154f05e23f5d
diff --git a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex 198cab4a8..d062b5fe9 100644--- a/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt@@ -17,7 +17,6 @@package com.google.samples.apps.nowinandroid.feature.interestsimport androidx.compose.foundation.layout.Column-import androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Textimport androidx.compose.runtime.Composableimport androidx.compose.runtime.getValue@@ -51,7 +50,6 @@ internal fun InterestsRoute()}-@OptIn(ExperimentalMaterial3Api::class)@Composableinternal fun InterestsScreen(uiState: InterestsUiState,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.ktindex 02d0c7bab..8466a33f0 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@@ -24,10 +24,8 @@ import com.google.samples.apps.nowinandroid.core.domain.TopicSortFieldimport com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopicimport dagger.hilt.android.lifecycle.HiltViewModelimport javax.inject.Inject-import kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlow-import kotlinx.coroutines.flow.asStateFlowimport kotlinx.coroutines.flow.mapimport kotlinx.coroutines.flow.stateInimport kotlinx.coroutines.launch@@ -38,14 +36,6 @@ class InterestsViewModel @Inject constructor(getFollowableTopics: GetFollowableTopicsUseCase,) : ViewModel() {- private val _tabState = MutableStateFlow(- InterestsTabState(- titles = listOf(R.string.interests_topics, R.string.interests_people),- currentIndex = 0- )- )- val tabState: StateFlow<InterestsTabState> = _tabState.asStateFlow()-val uiState: StateFlow<InterestsUiState> =getFollowableTopics(sortBy = TopicSortField.NAME).map(InterestsUiState::Interests@@ -62,11 +52,6 @@ class InterestsViewModel @Inject constructor(}}-data class InterestsTabState(- val titles: List<Int>,- val currentIndex: Int-)-sealed interface InterestsUiState {object Loading : InterestsUiStatediff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xmlindex d1c46a28d..f4496265d 100644--- a/feature/interests/src/main/res/values/strings.xml+++ b/feature/interests/src/main/res/values/strings.xml@@ -17,8 +17,6 @@<resources><!-- TODO: Remove the redundant "interests" prefix --><string name="interests">Interests</string>- <string name="interests_topics">Topics</string>- <string name="interests_people">People</string><string name="interests_loading">Loading data</string><string name="interests_empty_header">"No available data"</string><string name="interests_card_follow_button_content_desc">Follow interest button</string>