Skip to content

CHANGE expose vm's ui state as stateflow #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Frank1234 merged 2 commits into from
Feb 27, 2024
Merged

CHANGE expose vm's ui state as stateflow #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3d9a23
CHANGE expose vm's ui state as stateflow, to not have to set a defaul…
Frank1234 Feb 21, 2024
bf14ff4
CHANGE explicitely making stateFlows read only
Frank1234 Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/navigation/src/main/kotlin/nl/q42/template/navigation/viewmodel/InitNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
@Composable
fun InitNavigator(destinationsNavigator: DestinationsNavigator, routeNavigator: RouteNavigator) {

val viewState by routeNavigator.navigationState.collectAsStateWithLifecycle(initialValue = NavigationState.Idle)
val viewState by routeNavigator.navigationState.collectAsStateWithLifecycle()
LaunchedEffect(viewState) {
updateNavigationState(destinationsNavigator, viewState, routeNavigator::onNavigated)
}
Expand Down Expand Up @@ -47,4 +47,4 @@ private fun updateNavigationState(
is NavigationState.Idle -> {
}
}
}
}
5 changes: 3 additions & 2 deletions feature/home/src/main/kotlin/nl/q42/template/presentation/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package nl.q42.template.presentation.home
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import nl.q42.template.actionresult.data.handleAction
Expand All @@ -21,7 +22,7 @@ class HomeViewModel @Inject constructor(
) : ViewModel(), RouteNavigator by navigator {

private val _uiState = MutableStateFlow<HomeViewState>(HomeViewState.Empty)
val uiState: Flow<HomeViewState> = _uiState
val uiState: StateFlow<HomeViewState> = _uiState.asStateFlow()

init {
loadUser()
Expand Down
4 changes: 3 additions & 1 deletion feature/home/src/main/kotlin/nl/q42/template/presentation/home/second/HomeSecondViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import nl.q42.template.navigation.viewmodel.RouteNavigator
import javax.inject.Inject

Expand All @@ -17,7 +19,7 @@ class HomeSecondViewModel @Inject constructor(
private val titleParam = savedStateHandle.get<String>("title") ?: throw IllegalArgumentException("title required")

private val _uiState = MutableStateFlow<HomeSecondViewState>(HomeSecondViewState(titleParam))
val uiState: Flow<HomeSecondViewState> = _uiState
val uiState: StateFlow<HomeSecondViewState> = _uiState.asStateFlow()

fun onBackClicked() {
navigateUp()
Expand Down
2 changes: 1 addition & 1 deletion feature/home/src/main/kotlin/nl/q42/template/ui/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ fun HomeScreen(

OnLifecycleResume(viewModel::onScreenResumed)

val viewState by viewModel.uiState.collectAsStateWithLifecycle(initialValue = HomeViewState.Empty)
val viewState by viewModel.uiState.collectAsStateWithLifecycle()
HomeContent(viewState, viewModel::onLoadClicked, viewModel::onOpenSecondScreenClicked, viewModel::onOpenOnboardingClicked)
}
3 changes: 1 addition & 2 deletions feature/home/src/main/kotlin/nl/q42/template/ui/home/second/HomeSecondScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.navigation.DestinationsNavigator
import nl.q42.template.navigation.viewmodel.InitNavigator
import nl.q42.template.presentation.home.second.HomeSecondViewModel
import nl.q42.template.presentation.home.second.HomeSecondViewState

@Destination
@Composable
Expand All @@ -33,7 +32,7 @@ fun HomeSecondScreen(

InitNavigator(navigator, viewModel) // enables viewModel to navigate to other screens

val viewState by viewModel.uiState.collectAsStateWithLifecycle(initialValue = HomeSecondViewState(""))
val viewState by viewModel.uiState.collectAsStateWithLifecycle()

Column(
modifier = Modifier.fillMaxSize(),
Expand Down
5 changes: 3 additions & 2 deletions ...src/main/kotlin/nl/q42/template/presentation/onboarding/start/OnboardingStartViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package nl.q42.template.presentation.onboarding.start
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import nl.q42.template.navigation.viewmodel.RouteNavigator
import javax.inject.Inject

Expand All @@ -15,7 +16,7 @@ class OnboardingStartViewModel @Inject constructor(
) : ViewModel(), RouteNavigator by navigator {

private val _uiState = MutableStateFlow(OnboardingStartViewState("start"))
val uiState: Flow<OnboardingStartViewState> = _uiState
val uiState: StateFlow<OnboardingStartViewState> = _uiState.asStateFlow()

fun onBackClicked() {
navigateUp()
Expand Down
2 changes: 1 addition & 1 deletion ...e/onboarding/src/main/kotlin/nl/q42/template/ui/onboarding/start/OnboardingStartScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ fun OnboardingStartScreen(

InitNavigator(navigator, viewModel) // enables viewModel to navigate to other screens

val viewState by viewModel.uiState.collectAsStateWithLifecycle(initialValue = OnboardingStartViewState(""))
val viewState by viewModel.uiState.collectAsStateWithLifecycle()

Column(
modifier = Modifier.fillMaxSize(),
Expand Down