A fully functional Android app built entirely with Kotlin and Jetpack Compose
Update Lifecycle to 2.7.0. Use new LifecycleEventEffect.
Don Turner254b46425923
diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.ktindex 7a334beb3..6def4e630 100644--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt@@ -44,6 +44,8 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())++ add("androidTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())}}}diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.ktindex 3d684f9d1..197a447fe 100644--- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt+++ b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt@@ -17,6 +17,8 @@package com.google.samples.apps.nowinandroid.feature.bookmarksimport androidx.activity.ComponentActivity+import androidx.compose.runtime.CompositionLocalProvider+import androidx.compose.ui.platform.LocalLifecycleOwnerimport androidx.compose.ui.test.assertCountEqualsimport androidx.compose.ui.test.assertHasClickActionimport androidx.compose.ui.test.filter@@ -30,8 +32,11 @@ import androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport androidx.compose.ui.test.performClickimport androidx.compose.ui.test.performScrollToNode+import androidx.lifecycle.Lifecycle+import androidx.lifecycle.testing.TestLifecycleOwnerimport com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestDataimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState+import kotlinx.coroutines.test.runTestimport org.junit.Ruleimport org.junit.Testimport kotlin.test.assertEquals@@ -166,4 +171,30 @@ class BookmarksScreenTest {).assertExists()}++ @Test+ fun feed_whenLifecycleStops_undoBookmarkedStateIsCleared() = runTest {++ var undoStateCleared = false+ val testLifecycleOwner = TestLifecycleOwner(initialState = Lifecycle.State.STARTED)++ composeTestRule.setContent {+ CompositionLocalProvider(LocalLifecycleOwner provides testLifecycleOwner){+ BookmarksScreen(+ feedState = NewsFeedUiState.Success(emptyList()),+ onShowSnackbar = { _, _ -> false },+ removeFromBookmarks = {},+ onTopicClick = {},+ onNewsResourceViewed = {},+ clearUndoState = {+ undoStateCleared = true+ }+ )+ }+ }++ assertEquals(false, undoStateCleared)+ testLifecycleOwner.handleLifecycleEvent(event = Lifecycle.Event.ON_STOP)+ assertEquals(true, undoStateCleared)+ }}diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktindex 5b54db7cd..7c229c5ea 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt@@ -42,14 +42,12 @@ import androidx.compose.foundation.lazy.staggeredgrid.rememberLazyStaggeredGridSimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.Textimport androidx.compose.runtime.Composable-import androidx.compose.runtime.DisposableEffectimport androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.getValueimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.graphics.ColorFilter-import androidx.compose.ui.platform.LocalLifecycleOwnerimport androidx.compose.ui.platform.testTagimport androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResource@@ -60,7 +58,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.Lifecycle-import androidx.lifecycle.LifecycleEventObserver+import androidx.lifecycle.compose.LifecycleEventEffectimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheelimport com.google.samples.apps.nowinandroid.core.designsystem.component.scrollbar.DraggableScrollbar@@ -128,15 +126,8 @@ internal fun BookmarksScreen(}}- val lifecycleOwner = LocalLifecycleOwner.current- DisposableEffect(lifecycleOwner) {- val observer = LifecycleEventObserver { _, event ->- if (event == Lifecycle.Event.ON_STOP) {- clearUndoState()- }- }- lifecycleOwner.lifecycle.addObserver(observer)- onDispose { lifecycleOwner.lifecycle.removeObserver(observer) }+ LifecycleEventEffect(Lifecycle.Event.ON_STOP) {+ clearUndoState()}when (feedState) {diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 795510bce..f0b5aa642 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -15,7 +15,7 @@ androidxCoreSplashscreen = "1.0.1"androidxDataStore = "1.0.0"androidxEspresso = "3.5.1"androidxHiltNavigationCompose = "1.0.0"-androidxLifecycle = "2.6.2"+androidxLifecycle = "2.7.0"androidxMacroBenchmark = "1.2.2"androidxMetrics = "1.0.0-alpha04"androidxNavigation = "2.7.4"@@ -82,6 +82,7 @@ androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreeandroidx-dataStore-core = { group = "androidx.datastore", name = "datastore", version.ref = "androidxDataStore" }androidx-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "androidxHiltNavigationCompose" }androidx-lifecycle-runtimeCompose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidxLifecycle" }+androidx-lifecycle-runtimeTesting = { group = "androidx.lifecycle", name = "lifecycle-runtime-testing", version.ref = "androidxLifecycle" }androidx-lifecycle-viewModelCompose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidxLifecycle" }androidx-metrics = { group = "androidx.metrics", name = "metrics-performance", version.ref = "androidxMetrics" }androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "androidxNavigation" }