A fully functional Android app built entirely with Kotlin and Jetpack Compose
Merge remote-tracking branch 'origin/main' into update/androidx-lifecycle
Simon Marquis4d4f7d4a1569
diff --cc feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktindex a9d5a71af,5f43fd235..a2f0f43e1--- 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@@@ -62,8 -63,10 +62,9 @@@ import com.google.samples.apps.nowinandimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.newsFeed-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun BookmarksRoute(+ onTopicClick: (String) -> Unit,modifier: Modifier = Modifier,viewModel: BookmarksViewModel = hiltViewModel(),) {diff --cc feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktindex 8fb44326b,cb0b0ecd6..955907158--- 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@@@ -88,8 -89,10 +88,9 @@@ import com.google.samples.apps.nowinandimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.newsFeed-@OptIn(ExperimentalLifecycleComposeApi::class)@Composableinternal fun ForYouRoute(+ onTopicClick: (String) -> Unit,modifier: Modifier = Modifier,viewModel: ForYouViewModel = hiltViewModel(),) {diff --cc feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktindex abe1569e7,ec0179139..5ed6eea06--- 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@@@ -33,9 -34,10 +33,9 @@@ import com.google.samples.apps.nowinandimport 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,+ onTopicClick: (String) -> Unit,modifier: Modifier = Modifier,viewModel: InterestsViewModel = hiltViewModel(),) {