Replace produceState with collectAsStateWithLifecycle in the multimod…

…ule branch
android · May 31, 2023 · a202dd7 · a202dd7
1 parent bf3beac
commit a202dd7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -93,6 +93,7 @@ dependencies {
     kapt(libs.hilt.compiler)
 
     // Arch Components
+    implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)

diff --git a/feature-mymodel/build.gradle.kts b/feature-mymodel/build.gradle.kts
@@ -63,6 +63,7 @@ dependencies {
     implementation(libs.androidx.activity.compose)
 
     // Arch Components
+    implementation(libs.androidx.lifecycle.runtime.compose)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation(libs.androidx.hilt.navigation.compose)

diff --git a/feature-mymodel/src/main/java/android/template/feature/mymodel/ui/MyModelScreen.kt b/feature-mymodel/src/main/java/android/template/feature/mymodel/ui/MyModelScreen.kt
@@ -16,44 +16,31 @@
 
 package android.template.feature.mymodel.ui
 
+import android.template.core.ui.MyApplicationTheme
+import android.template.feature.mymodel.ui.MyModelUiState.Success
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.Lifecycle.State.STARTED
-import androidx.lifecycle.repeatOnLifecycle
-import android.template.feature.mymodel.ui.MyModelUiState.Success
-import android.template.core.ui.MyApplicationTheme
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 
 @Composable
 fun MyModelScreen(modifier: Modifier = Modifier, viewModel: MyModelViewModel = hiltViewModel()) {
-    val lifecycle = LocalLifecycleOwner.current.lifecycle
-    val items by produceState<MyModelUiState>(
-        initialValue = MyModelUiState.Loading,
-        key1 = lifecycle,
-        key2 = viewModel
-    ) {
-        lifecycle.repeatOnLifecycle(state = STARTED) {
-            viewModel.uiState.collect { value = it }
-        }
-    }
+    val items by viewModel.uiState.collectAsStateWithLifecycle()
     if (items is Success) {
         MyModelScreen(
             items = (items as Success).data,
@@ -63,7 +50,6 @@ fun MyModelScreen(modifier: Modifier = Modifier, viewModel: MyModelViewModel = h
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun MyModelScreen(
     items: List<String>,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,6 +29,7 @@ androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview"}
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "androidxCore" }
 androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidxHilt" }
+androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }