Refine backgrounds and navigation colors

Change-Id: I9fd863cc608f21078ab78c39c2c3d227aedbac7c

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

@@ -44,6 +44,7 @@ import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRail
@@ -51,6 +52,8 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavig
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.DrawableResourceIcon
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.Icon.ImageVectorIcon
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
+import com.google.samples.apps.nowinandroid.core.navigation.NiaNavigationDestination
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouDestination
 import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
 
@@ -65,7 +68,13 @@ fun NiaApp(
     appState: NiaAppState = rememberNiaAppState(windowSizeClass)
 ) {
     NiaTheme {
-        NiaBackground {
+        val background: @Composable (@Composable () -> Unit) -> Unit =
+            when (appState.currentDestination?.route) {
+                ForYouDestination.route -> { content -> NiaGradientBackground(content = content) }
+                else -> { content -> NiaBackground(content = content) }
+            }
+
+        background {
             Scaffold(
                 modifier = Modifier.semantics {
                     testTagsAsResourceId = true

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt

@@ -16,6 +16,7 @@
 
 package com.google.samples.apps.nowinandroid.core.designsystem.component
 
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilterChip
 import androidx.compose.material3.FilterChipDefaults
@@ -63,6 +64,7 @@ fun NiaFilterChip(
                 contentDescription = null
             )
         },
+        shape = CircleShape,
         border = FilterChipDefaults.filterChipBorder(
             borderColor = MaterialTheme.colorScheme.onBackground,
             selectedBorderColor = MaterialTheme.colorScheme.onBackground,

core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt

@@ -88,7 +88,6 @@ fun NiaNavigationBar(
 ) {
     NavigationBar(
         modifier = modifier,
-        containerColor = NiaNavigationDefaults.NavigationContainerColor,
         contentColor = NiaNavigationDefaults.navigationContentColor(),
         tonalElevation = 0.dp,
         content = content
@@ -155,7 +154,7 @@ fun NiaNavigationRail(
 ) {
     NavigationRail(
         modifier = modifier,
-        containerColor = NiaNavigationDefaults.NavigationContainerColor,
+        containerColor = Color.Transparent,
         contentColor = NiaNavigationDefaults.navigationContentColor(),
         header = header,
         content = content
@@ -166,7 +165,6 @@ fun NiaNavigationRail(
  * Now in Android navigation default values.
  */
 object NiaNavigationDefaults {
-    val NavigationContainerColor = Color.Transparent
     @Composable
     fun navigationContentColor() = MaterialTheme.colorScheme.onSurfaceVariant
     @Composable

feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt

@@ -69,7 +69,6 @@ fun BookmarksScreen(
     removeFromBookmarks: (String) -> Unit,
     modifier: Modifier = Modifier
 ) {
-    NiaGradientBackground {
     Scaffold(
         topBar = {
             NiaTopAppBar(
@@ -109,5 +108,4 @@ fun BookmarksScreen(
             }
         }
     }
-    }
 }

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

@@ -124,7 +124,6 @@ fun ForYouScreen(
     onNewsResourcesCheckedChanged: (String, Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    NiaGradientBackground {
     Scaffold(
         topBar = {
             NiaTopAppBar(
@@ -216,7 +215,6 @@ fun ForYouScreen(
             }
         }
     }
-    }
 }
 
 /**