A fully functional Android app built entirely with Kotlin and Jetpack Compose
Tidy up top level destination handling
Don Turnere19c31570bc1
diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.ktindex ac04f683a..815061273 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt@@ -16,6 +16,7 @@package com.google.samples.apps.nowinandroid.navigation+import androidx.annotation.StringResimport androidx.compose.ui.graphics.vector.ImageVectorimport com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons@@ -35,8 +36,8 @@ import com.google.samples.apps.nowinandroid.feature.search.R as searchRenum class TopLevelDestination(val selectedIcon: ImageVector,val unselectedIcon: ImageVector,- val iconTextId: Int,- val titleTextId: Int,+ @StringRes val iconTextId: Int,+ @StringRes val titleTextId: Int,val route: KClass<*>,) {FOR_YOU(diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex 694062c08..6cdc32bb0 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -73,6 +73,7 @@ import com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradienimport com.google.samples.apps.nowinandroid.feature.settings.SettingsDialogimport com.google.samples.apps.nowinandroid.navigation.NiaNavHostimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination+import kotlin.reflect.KClassimport com.google.samples.apps.nowinandroid.feature.settings.R as settingsR@OptIn(ExperimentalMaterial3AdaptiveApi::class)@@ -151,7 +152,7 @@ internal fun NiaApp(appState.topLevelDestinations.forEach { destination ->val hasUnread = unreadDestinations.contains(destination)val selected = currentDestination- .isTopLevelDestinationInHierarchy(destination)+ .isRouteInHierarchy(destination.route)item(selected = selected,onClick = { appState.navigateToTopLevelDestination(destination) },@@ -199,8 +200,10 @@ internal fun NiaApp() {// Show the top app bar on top level destinations.val destination = appState.currentTopLevelDestination- val shouldShowTopAppBar = destination != null+ var shouldShowTopAppBar = false+if (destination != null) {+ shouldShowTopAppBar = trueNiaTopAppBar(titleRes = destination.titleTextId,navigationIcon = NiaIcons.Search,@@ -267,7 +270,7 @@ private fun Modifier.notificationDot(): Modifier =}}-private fun NavDestination?.isTopLevelDestinationInHierarchy(destination: TopLevelDestination) =+private fun NavDestination?.isRouteInHierarchy(route: KClass<*>) =this?.hierarchy?.any {- it.hasRoute(destination.route)+ it.hasRoute(route)} ?: falsediff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex 2394087dd..1409eab3e 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -92,12 +92,9 @@ class NiaAppState(val currentTopLevelDestination: TopLevelDestination?@Composable get() {- with(currentDestination) {- if (this?.hasRoute<ForYouRoute>() == true) return FOR_YOU- if (this?.hasRoute<BookmarksRoute>() == true) return BOOKMARKS- if (this?.hasRoute<InterestsRoute>() == true) return INTERESTS+ return TopLevelDestination.entries.firstOrNull { topLevelDestination ->+ currentDestination?.hasRoute(route = topLevelDestination.route) ?: false}- return null}val isOffline = networkMonitor.isOnlinediff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.ktindex 22e3c343b..3d37f3417 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt@@ -20,7 +20,6 @@ import androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModelimport androidx.navigation.toRouteimport com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_KEYimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.StateFlowimport javax.inject.Inject