File tree Expand file tree Collapse file tree 8 files changed +4
-18
lines changed
app/src/main/java/com/google/samples/apps/nowinandroid/ui
bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks
foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou
interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests
settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings
topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic
sync/work/src/main/java/com/google/samples/apps/nowinandroid/sync/status Expand file tree Collapse file tree 8 files changed +4
-18
lines changed Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ import androidx.compose.ui.res.painterResource
5050import androidx.compose.ui.res.stringResource
5151import androidx.compose.ui.semantics.semantics
5252import androidx.compose.ui.semantics.testTagsAsResourceId
53- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
5453import androidx.lifecycle.compose.collectAsStateWithLifecycle
5554import androidx.navigation.NavDestination
5655import androidx.navigation.NavDestination.Companion.hierarchy
@@ -77,7 +76,6 @@ import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
7776 ExperimentalMaterial3Api ::class ,
7877 ExperimentalLayoutApi ::class ,
7978 ExperimentalComposeUiApi ::class ,
80- ExperimentalLifecycleComposeApi ::class ,
8179)
8280@Composable
8381fun NiaApp (
Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ import androidx.compose.ui.tooling.preview.Preview
5050import androidx.compose.ui.tooling.preview.PreviewParameter
5151import androidx.compose.ui.unit.dp
5252import androidx.hilt.navigation.compose.hiltViewModel
53- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
5453import androidx.lifecycle.compose.collectAsStateWithLifecycle
5554import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
5655import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalTintTheme
@@ -63,7 +62,6 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
6362import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
6463import com.google.samples.apps.nowinandroid.core.ui.newsFeed
6564
66- @OptIn(ExperimentalLifecycleComposeApi ::class )
6765@Composable
6866internal fun BookmarksRoute (
6967 modifier : Modifier = Modifier ,
Original file line number Diff line number Diff line change @@ -74,7 +74,6 @@ import androidx.compose.ui.unit.sp
7474import androidx.compose.ui.util.trace
7575import androidx.core.view.doOnPreDraw
7676import androidx.hilt.navigation.compose.hiltViewModel
77- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
7877import androidx.lifecycle.compose.collectAsStateWithLifecycle
7978import com.google.samples.apps.nowinandroid.core.designsystem.component.DynamicAsyncImage
8079import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaButton
@@ -89,7 +88,6 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScrollJank
8988import com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider
9089import com.google.samples.apps.nowinandroid.core.ui.newsFeed
9190
92- @OptIn(ExperimentalLifecycleComposeApi ::class )
9391@Composable
9492internal fun ForYouRoute (
9593 modifier : Modifier = Modifier ,
Original file line number Diff line number Diff line change @@ -25,7 +25,6 @@ import androidx.compose.ui.Modifier
2525import androidx.compose.ui.res.stringResource
2626import androidx.compose.ui.tooling.preview.PreviewParameter
2727import androidx.hilt.navigation.compose.hiltViewModel
28- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
2928import androidx.lifecycle.compose.collectAsStateWithLifecycle
3029import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
3130import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaLoadingWheel
@@ -34,7 +33,6 @@ import com.google.samples.apps.nowinandroid.core.domain.model.FollowableTopic
3433import com.google.samples.apps.nowinandroid.core.ui.DevicePreviews
3534import com.google.samples.apps.nowinandroid.core.ui.FollowableTopicPreviewParameterProvider
3635
37- @OptIn(ExperimentalLifecycleComposeApi ::class )
3836@Composable
3937internal fun InterestsRoute (
4038 navigateToTopic : (String ) -> Unit ,
Original file line number Diff line number Diff line change @@ -50,7 +50,6 @@ import androidx.compose.ui.unit.dp
5050import androidx.compose.ui.window.DialogProperties
5151import androidx.core.content.ContextCompat
5252import androidx.hilt.navigation.compose.hiltViewModel
53- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
5453import androidx.lifecycle.compose.collectAsStateWithLifecycle
5554import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
5655import com.google.samples.apps.nowinandroid.core.designsystem.theme.supportsDynamicTheming
@@ -65,7 +64,6 @@ import com.google.samples.apps.nowinandroid.feature.settings.R.string
6564import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading
6665import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success
6766
68- @ExperimentalLifecycleComposeApi
6967@Composable
7068fun SettingsDialog (
7169 onDismiss : () -> Unit ,
Original file line number Diff line number Diff line change @@ -44,7 +44,6 @@ import androidx.compose.ui.tooling.preview.Preview
4444import androidx.compose.ui.tooling.preview.PreviewParameter
4545import androidx.compose.ui.unit.dp
4646import androidx.hilt.navigation.compose.hiltViewModel
47- import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
4847import androidx.lifecycle.compose.collectAsStateWithLifecycle
4948import com.google.samples.apps.nowinandroid.core.designsystem.component.DynamicAsyncImage
5049import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
@@ -61,7 +60,6 @@ import com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems
6160import com.google.samples.apps.nowinandroid.feature.topic.R.string
6261import com.google.samples.apps.nowinandroid.feature.topic.TopicUiState.Loading
6362
64- @OptIn(ExperimentalLifecycleComposeApi ::class )
6563@Composable
6664internal fun TopicRoute (
6765 onBackClick : () -> Unit ,
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ androidxCoreSplashscreen = "1.0.0"
1313androidxDataStore = " 1.0.0"
1414androidxEspresso = " 3.5.0"
1515androidxHiltNavigationCompose = " 1.0.0"
16- androidxLifecycle = " 2.6.0-alpha03 "
16+ androidxLifecycle = " 2.6.0-alpha05 "
1717androidxMacroBenchmark = " 1.1.1"
1818androidxMetrics = " 1.0.0-alpha03"
1919androidxNavigation = " 2.5.3"
Original file line number Diff line number Diff line change 1717package com.google.samples.apps.nowinandroid.sync.status
1818
1919import android.content.Context
20- import androidx.lifecycle.Transformations
2120import androidx.lifecycle.asFlow
21+ import androidx.lifecycle.map
2222import androidx.work.WorkInfo
2323import androidx.work.WorkInfo.State
2424import androidx.work.WorkManager
@@ -36,10 +36,8 @@ class WorkManagerSyncStatusMonitor @Inject constructor(
3636 @ApplicationContext context : Context ,
3737) : SyncStatusMonitor {
3838 override val isSyncing: Flow <Boolean > =
39- Transformations .map(
40- WorkManager .getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName ),
41- MutableList <WorkInfo >::anyRunning,
42- )
39+ WorkManager .getInstance(context).getWorkInfosForUniqueWorkLiveData(SyncWorkName )
40+ .map(MutableList <WorkInfo >::anyRunning)
4341 .asFlow()
4442 .conflate()
4543}
You can’t perform that action at this time.
0 commit comments