A fully functional Android app built entirely with Kotlin and Jetpack Compose
Updgrade androidx-lifecycle from 2.6.0-alpha03 to 2.6.0-alpha05
Simon Marquisf9a3533df301
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex 14bc11992..0251c1d6b 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -50,7 +50,6 @@ import androidx.compose.ui.res.painterResourceimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.semantics.semanticsimport androidx.compose.ui.semantics.testTagsAsResourceId-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavDestinationimport androidx.navigation.NavDestination.Companion.hierarchy@@ -77,7 +76,6 @@ import com.google.samples.apps.nowinandroid.feature.settings.R as settingsRExperimentalMaterial3Api::class,ExperimentalLayoutApi::class,ExperimentalComposeUiApi::class,- ExperimentalLifecycleComposeApi::class,)@Composablefun NiaApp(diff --git a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktindex 1169f5777..a9d5a71af 100644--- a/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt+++ b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt@@ -50,7 +50,6 @@ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModel-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheelimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalTintTheme@@ -63,7 +62,6 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJankimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.newsFeed-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun BookmarksRoute(modifier: Modifier = Modifier,diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex 492660142..8fb44326b 100644--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt@@ -74,7 +74,6 @@ import androidx.compose.ui.unit.spimport androidx.compose.ui.util.traceimport androidx.core.view.doOnPreDrawimport androidx.hilt.navigation.compose.hiltViewModel-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.DynamicAsyncImageimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaButton@@ -89,7 +88,6 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJankimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.newsFeed-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun ForYouRoute(modifier: Modifier = Modifier,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 fd45c7608..abe1569e7 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@@ -25,7 +25,6 @@ import androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResourceimport androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.hilt.navigation.compose.hiltViewModel-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel@@ -34,7 +33,6 @@ import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopicimport com.google.samples.apps.nowinandroid.core.ui.DevicePreviewsimport com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun InterestsRoute(navigateToTopic: (String) -> Unit,diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.ktindex bed230d0d..4c4ba727b 100644--- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt+++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt@@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.window.DialogPropertiesimport androidx.core.content.ContextCompatimport androidx.hilt.navigation.compose.hiltViewModel-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaThemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.supportsDynamicTheming@@ -65,7 +64,6 @@ import com.google.samples.apps.nowinandroid.feature.settings.R.stringimport com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loadingimport com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success-@ExperimentalLifecycleComposeApi@Composablefun SettingsDialog(onDismiss: () -> Unit,diff --git a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktindex e7b218072..656c7d961 100644--- a/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt+++ b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt@@ -44,7 +44,6 @@ import androidx.compose.ui.tooling.preview.Previewimport androidx.compose.ui.tooling.preview.PreviewParameterimport androidx.compose.ui.unit.dpimport androidx.hilt.navigation.compose.hiltViewModel-import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport com.google.samples.apps.nowinandroid.core.designsystem.component.DynamicAsyncImageimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground@@ -61,7 +60,6 @@ import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItemsimport com.google.samples.apps.nowinandroid.feature.topic.R.stringimport com.google.samples.apps.nowinandroid.feature.topic.TopicUiState.Loading-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun TopicRoute(onBackClick: () -> Unit,diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 828e38f12..8af6b9484 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -13,7 +13,7 @@ androidxCoreSplashscreen = "1.0.0"androidxDataStore = "1.0.0"androidxEspresso = "3.5.0"androidxHiltNavigationCompose = "1.0.0"-androidxLifecycle = "2.6.0-alpha03"+androidxLifecycle = "2.6.0-alpha05"androidxMacroBenchmark = "1.1.1"androidxMetrics = "1.0.0-alpha03"androidxNavigation = "2.5.3"diff --git a/sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncStatusMonitor.kt b/sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncStatusMonitor.ktindex 9edb630eb..f4f9d02cb 100644--- a/sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncStatusMonitor.kt+++ b/sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status/WorkManagerSyncStatusMonitor.kt@@ -17,8 +17,8 @@package com.google.samples.apps.nowinandroid.sync.statusimport android.content.Context-import androidx.lifecycle.Transformationsimport androidx.lifecycle.asFlow+import androidx.lifecycle.mapimport androidx.work.WorkInfoimport androidx.work.WorkInfo.Stateimport androidx.work.WorkManager@@ -36,10 +36,8 @@ class WorkManagerSyncStatusMonitor @Inject constructor(@ApplicationContext context: Context,) : SyncStatusMonitor {override val isSyncing: Flow<Boolean> =- Transformations.map(- WorkManager.getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName),- MutableList<WorkInfo>::anyRunning,- )+ WorkManager.getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName)+ .map(MutableList<WorkInfo>::anyRunning).asFlow().conflate()}