A fully functional Android app built entirely with Kotlin and Jetpack Compose
Remove ClearRippleTheme CompositionLocal from NavigationBar
Simon Marquis7813757393dc
diff --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 3a3e25b66..539d5041d 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@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.paddingimport androidx.compose.foundation.layout.safeDrawingimport androidx.compose.foundation.layout.safeDrawingPaddingimport androidx.compose.foundation.layout.windowInsetsPadding-import androidx.compose.material.ripple.LocalRippleThemeimport androidx.compose.material3.ExperimentalMaterial3Apiimport androidx.compose.material3.Iconimport androidx.compose.material3.MaterialTheme@@ -41,7 +40,6 @@ import androidx.compose.material3.Textimport androidx.compose.material3.windowsizeclass.WindowSizeClassimport androidx.compose.material3.windowsizeclass.WindowWidthSizeClassimport androidx.compose.runtime.Composable-import androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.runtime.getValueimport androidx.compose.runtime.rememberimport androidx.compose.ui.Modifier@@ -52,7 +50,6 @@ import androidx.navigation.NavDestinationimport androidx.navigation.NavDestination.Companion.hierarchyimport androidx.navigation.compose.currentBackStackEntryAsStateimport androidx.navigation.compose.rememberNavController-import com.google.samples.apps.nowinandroid.core.ui.ClearRippleThemeimport com.google.samples.apps.nowinandroid.core.ui.component.NiaBackgroundimport com.google.samples.apps.nowinandroid.core.ui.theme.NiaThemeimport com.google.samples.apps.nowinandroid.navigation.NiaNavHost@@ -149,35 +146,33 @@ private fun NiABottomBar(// Wrap the navigation bar in a surface so the color behind the system// navigation is equal to the container color of the navigation bar.Surface(color = MaterialTheme.colorScheme.surface) {- CompositionLocalProvider(LocalRippleTheme provides ClearRippleTheme) {- NavigationBar(- modifier = Modifier.windowInsetsPadding(- WindowInsets.safeDrawing.only(- WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom- )- ),- tonalElevation = 0.dp- ) {+ NavigationBar(+ modifier = Modifier.windowInsetsPadding(+ WindowInsets.safeDrawing.only(+ WindowInsetsSides.Horizontal + WindowInsetsSides.Bottom+ )+ ),+ tonalElevation = 0.dp+ ) {- TOP_LEVEL_DESTINATIONS.forEach { destination ->- val selected =- currentDestination?.hierarchy?.any { it.route == destination.route } == true- NavigationBarItem(- selected = selected,- onClick = { onNavigateToTopLevelDestination(destination) },- icon = {- Icon(- if (selected) {- destination.selectedIcon- } else {- destination.unselectedIcon- },- contentDescription = null- )- },- label = { Text(stringResource(destination.iconTextId)) }- )- }+ TOP_LEVEL_DESTINATIONS.forEach { destination ->+ val selected =+ currentDestination?.hierarchy?.any { it.route == destination.route } == true+ NavigationBarItem(+ selected = selected,+ onClick = { onNavigateToTopLevelDestination(destination) },+ icon = {+ Icon(+ if (selected) {+ destination.selectedIcon+ } else {+ destination.unselectedIcon+ },+ contentDescription = null+ )+ },+ label = { Text(stringResource(destination.iconTextId)) }+ )}}}