A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix minor issues
Don Turnerdbff140b64da
diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.ktindex 247b2934b..956037f29 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt@@ -16,6 +16,7 @@package com.google.samples.apps.nowinandroid.navigation+import com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.icon.Iconimport com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIconimport com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon@@ -23,7 +24,6 @@ import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksRimport com.google.samples.apps.nowinandroid.feature.foryou.R as forYouRimport com.google.samples.apps.nowinandroid.feature.interests.R as interestsR-import com.google.samples.apps.nowinandroid.R/*** Type for the top level destinations in the application. Each of these destinationsdiff --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 be9713f61..7556213d5 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@@ -52,6 +52,7 @@ import androidx.lifecycle.compose.ExperimentalLifecycleComposeApiimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavDestinationimport androidx.navigation.NavDestination.Companion.hierarchy+import com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground@@ -64,10 +65,9 @@ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.Drawableimport com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIconimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.feature.settings.R as settingsR+import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialogimport com.google.samples.apps.nowinandroid.navigation.NiaNavHostimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination-import com.google.samples.apps.nowinandroid.R-import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog@OptIn(ExperimentalMaterial3Api::class,@@ -86,7 +86,10 @@ fun NiaApp() {val background: @Composable (@Composable () -> Unit) -> Unit =when (appState.currentDestination?.route) {- TopLevelDestination.FOR_YOU.name -> { content -> NiaGradientBackground(content = content) }+ TopLevelDestination.FOR_YOU.name -> {+ content ->+ NiaGradientBackground(content = content)+ }else -> { content -> NiaBackground(content = content) }}diff --git a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex a1638e416..bc5724c02 100644--- a/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -76,7 +76,7 @@ class NiaAppState(.currentBackStackEntryAsState().value?.destinationval currentTopLevelDestination: TopLevelDestination?- @Composable get() = when(currentDestination?.route){+ @Composable get() = when (currentDestination?.route) {forYouNavigationRoute -> FOR_YOUbookmarksRoute -> BOOKMARKSinterestsRoute -> INTERESTSdiff --git a/core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.kt b/core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.ktdeleted file mode 100644index e69de29bb..000000000diff --git a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktindex f88cd9d39..548e786fe 100644--- a/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt@@ -25,7 +25,6 @@ import androidx.lifecycle.viewModelScopeimport androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApiimport androidx.lifecycle.viewmodel.compose.saveableimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository-import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.data.util.SyncStatusMonitorimport com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsStreamUseCaseimport com.google.samples.apps.nowinandroid.core.domain.GetSaveableNewsResourcesStreamUseCase