Merge pull request #41 from CodandoTV/feature/33_state_to_state_flow

gabrielbmoro · web-flow · commit b3910b8f6644 · 2023-05-16T21:04:08.000-03:00
[ISSUE-33] - State to StateFlow
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -155,6 +155,7 @@ object Dependencies {
         const val composeMaterial3 = "androidx.compose.material3:material3:${Versions.composeMaterial3Version}"
         const val composeNavigation = "androidx.navigation:navigation-compose:${Versions.composeNavigationVersion}"
         const val composeIcons = "androidx.compose.material:material-icons-extended:${Versions.composeIcons}"
+        const val lifecycleComposeRuntime = "androidx.lifecycle:lifecycle-runtime-compose:${Versions.lifecycleComposeRuntime}"
 
         override val list: List<String>
             get() = listOf(
@@ -164,7 +165,8 @@ object Dependencies {
                 Compose.composeUITooling,
                 Compose.composeMaterial3,
                 Compose.composeNavigation,
-                Compose.composeIcons
+                Compose.composeIcons,
+                Compose.lifecycleComposeRuntime
             )
     }
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -34,6 +34,7 @@ object Versions {
     const val composeActivity = "1.5.0"
     const val composeIcons = "1.4.3"
     const val composeNavigationVersion = "2.5.3"
+    const val lifecycleComposeRuntime = "2.6.1"
 
     const val coilVersion = "2.3.0"
 
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt
@@ -1,24 +1,30 @@
 package com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.screens
 
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
 import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.DetailStreamUseCase
 import com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.screens.DetailStreamsUIState.*
-import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class DetailStreamViewModel(
     private val useCase: DetailStreamUseCase,
 ) : ViewModel(), DefaultLifecycleObserver {
 
-    private val _uiState = mutableStateOf<DetailStreamsUIState>(LoadingStreamUIState)
-    val uiState: State<DetailStreamsUIState> = _uiState
+    private val _uiState = MutableStateFlow<DetailStreamsUIState>(LoadingStreamUIState)
+    val uiState : StateFlow<DetailStreamsUIState> = _uiState.stateIn(
+        viewModelScope,
+        SharingStarted.Eagerly,
+        initialValue = _uiState.value
+    )
 
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
@@ -29,15 +35,17 @@ class DetailStreamViewModel(
                 .catchFailure {
                     println(">>>> ${it.errorMessage}")
                 }
-                .collect {
-                    _uiState.value = DetailStreamsLoadedUIState(
-                        detailStream = it
-                    )
+                .collect { detailStream ->
+                    _uiState.update {
+                        DetailStreamsLoadedUIState(
+                            detailStream = detailStream
+                        )
+                    }
                 }
         }
     }
 
     private fun onLoading() {
-        _uiState.value = LoadingStreamUIState
+        _uiState.update { LoadingStreamUIState }
     }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsScreen.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsScreen.kt
@@ -7,7 +7,7 @@ import androidx.compose.material.icons.filled.*
 import androidx.compose.material3.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.codandotv.streamplayerapp.core_shared_ui.resources.Colors.DarkDeepGray
 import com.codandotv.streamplayerapp.feature_list_streams.R
@@ -31,17 +32,15 @@ fun DetailStreamScreen(
     navController: NavController,
     disposable: () -> Unit = {}
 ) {
-    val uiStateRemember = remember {
-        viewModel.uiState
-    }
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     val lifecycleOwner = LocalLifecycleOwner.current
     Lifecycle(lifecycleOwner, viewModel, disposable)
 
     Box(modifier = Modifier.fillMaxSize()) {
-        when (val uiState = uiStateRemember.value) {
+        when (uiState) {
             is DetailStreamsLoadedUIState -> {
-                SetupDetailScreen(uiState, navController)
+                SetupDetailScreen(uiState as DetailStreamsLoadedUIState, navController)
             }
             else -> {
                 CircularProgressIndicator(
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamViewModel.kt
@@ -1,29 +1,36 @@
 package com.codandotv.streamplayerapp.feature_list_streams.list.presentation.screens
 
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
 import com.codandotv.streamplayerapp.feature_list_streams.list.domain.ListStreamUseCase
 import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.ListStreamUimodel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 class ListStreamViewModel(
     private val uiModel: ListStreamUimodel,
     private val useCase: ListStreamUseCase,
 ) : ViewModel(), DefaultLifecycleObserver {
 
-    val uiState = mutableStateOf(
+    private val _uiState = MutableStateFlow(
         ListStreamsUIState(
             carousels = emptyList(),
             isLoading = false
         )
     )
+    val uiState = _uiState.stateIn(
+        viewModelScope,
+        SharingStarted.Eagerly,
+        initialValue = _uiState.value
+    )
 
     override fun onCreate(owner: LifecycleOwner) {
         super.onCreate(owner)
@@ -35,22 +42,24 @@ class ListStreamViewModel(
                         println(">>>> ${it.errorMessage}")
                     }
                     .onCompletion { loaded() }
-                    .collect {
-                        this@ListStreamViewModel.uiState.value = uiModel.convertToCardContent(it)
+                    .collect { listStream ->
+                        _uiState.update {
+                            uiModel.convertToCardContent(listStream)
+                        }
                     }
             }
         }
     }
 
     private fun loaded() {
-        this.uiState.value = this.uiState.value.copy(
-            isLoading = false
-        )
+        this._uiState.update {
+            it.copy(isLoading = false)
+        }
     }
 
     private fun onLoading() {
-        this.uiState.value = this.uiState.value.copy(
-            isLoading = true
-        )
+        this._uiState.update {
+            it.copy(isLoading = true)
+        }
     }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsScreen.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/list/presentation/screens/ListStreamsScreen.kt
@@ -10,11 +10,11 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.*
-import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
@@ -31,9 +31,7 @@ fun ListStreamsScreen(
     onNavigateDetailList: (String) -> Unit = {},
     disposable: () -> Unit = {}
 ) {
-    val uiState = rememberSaveable() {
-        viewModel.uiState
-    }
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val lifecycleOwner = LocalLifecycleOwner.current
 
     DisposableEffect(lifecycleOwner) {
@@ -43,7 +41,6 @@ fun ListStreamsScreen(
 
         onDispose {
             lifecycle.removeObserver(viewModel)
-            uiState.value = viewModel.uiState.value
             disposable.invoke()
         }
     }
@@ -58,7 +55,7 @@ fun ListStreamsScreen(
                 .fillMaxSize()
                 .background(MaterialTheme.colorScheme.background)
         ) {
-            if (uiState.value.isLoading) {
+            if (uiState.isLoading) {
                 CircularProgressIndicator(
                     modifier = Modifier.align(
                         Alignment.Center
@@ -71,7 +68,7 @@ fun ListStreamsScreen(
                         .align(Alignment.TopCenter)
                         .verticalScroll(ScrollState(0))
                 ) {
-                    uiState.value.carousels.forEach {
+                    uiState.carousels.forEach {
                         StreamsCarousel(
                             title = it.categoryName,
                             contentList = it.cards,

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ object Dependencies {`
`155`	`155`	`const val composeMaterial3 = "androidx.compose.material3:material3:${Versions.composeMaterial3Version}"`
`156`	`156`	`const val composeNavigation = "androidx.navigation:navigation-compose:${Versions.composeNavigationVersion}"`
`157`	`157`	`const val composeIcons = "androidx.compose.material:material-icons-extended:${Versions.composeIcons}"`
	`158`	`+ const val lifecycleComposeRuntime = "androidx.lifecycle:lifecycle-runtime-compose:${Versions.lifecycleComposeRuntime}"`
`158`	`159`
`159`	`160`	`override val list: List<String>`
`160`	`161`	`get() = listOf(`
`@@ -164,7 +165,8 @@ object Dependencies {`
`164`	`165`	`Compose.composeUITooling,`
`165`	`166`	`Compose.composeMaterial3,`
`166`	`167`	`Compose.composeNavigation,`
`167`		`- Compose.composeIcons`
	`168`	`+ Compose.composeIcons,`
	`169`	`+ Compose.lifecycleComposeRuntime`
`168`	`170`	`)`
`169`	`171`	`}`
`170`	`172`	`}`