Skip to content

Commit dbff140

Browse files
committed
Fix minor issues
1 parent e5183e2 commit dbff140

File tree

5 files changed

+8
-6
lines changed

5 files changed

+8
-6
lines changed

app/src/main/java/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
package com.google.samples.apps.nowinandroid.navigation
1818

19+
import com.google.samples.apps.nowinandroid.R
1920
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon
2021
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
2122
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
2223
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
2324
import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR
2425
import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR
2526
import com.google.samples.apps.nowinandroid.feature.interests.R as interestsR
26-
import com.google.samples.apps.nowinandroid.R
2727

2828
/**
2929
* Type for the top level destinations in the application. Each of these destinations

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaApp.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
5252
import androidx.lifecycle.compose.collectAsStateWithLifecycle
5353
import androidx.navigation.NavDestination
5454
import androidx.navigation.NavDestination.Companion.hierarchy
55+
import com.google.samples.apps.nowinandroid.R
5556
import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
5657
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
5758
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground
@@ -64,10 +65,9 @@ import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.Drawable
6465
import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
6566
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
6667
import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
68+
import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
6769
import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
6870
import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
69-
import com.google.samples.apps.nowinandroid.R
70-
import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog
7171

7272
@OptIn(
7373
ExperimentalMaterial3Api::class,
@@ -86,7 +86,10 @@ fun NiaApp(
8686
) {
8787
val background: @Composable (@Composable () -> Unit) -> Unit =
8888
when (appState.currentDestination?.route) {
89-
TopLevelDestination.FOR_YOU.name -> { content -> NiaGradientBackground(content = content) }
89+
TopLevelDestination.FOR_YOU.name -> {
90+
content ->
91+
NiaGradientBackground(content = content)
92+
}
9093
else -> { content -> NiaBackground(content = content) }
9194
}
9295

app/src/main/java/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class NiaAppState(
7676
.currentBackStackEntryAsState().value?.destination
7777

7878
val currentTopLevelDestination: TopLevelDestination?
79-
@Composable get() = when(currentDestination?.route){
79+
@Composable get() = when (currentDestination?.route) {
8080
forYouNavigationRoute -> FOR_YOU
8181
bookmarksRoute -> BOOKMARKS
8282
interestsRoute -> INTERESTS

core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.kt

Whitespace-only changes.

feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import androidx.lifecycle.viewModelScope
2525
import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
2626
import androidx.lifecycle.viewmodel.compose.saveable
2727
import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
28-
import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
2928
import com.google.samples.apps.nowinandroid.core.data.util.SyncStatusMonitor
3029
import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsStreamUseCase
3130
import com.google.samples.apps.nowinandroid.core.domain.GetSaveableNewsResourcesStreamUseCase

0 commit comments

Comments
 (0)