A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix issues with NiaTheme gradients and backgrounds
Nick Routc742aa3eca23
diff --git a/core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt b/core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.ktindex e97762318..bd73cd7c2 100644--- a/core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt+++ b/core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt@@ -21,6 +21,7 @@ import androidx.compose.material3.ColorSchemeimport androidx.compose.material3.MaterialThemeimport androidx.compose.material3.dynamicDarkColorSchemeimport androidx.compose.material3.dynamicLightColorScheme+import androidx.compose.material3.surfaceColorAtElevationimport androidx.compose.runtime.Composableimport androidx.compose.ui.platform.LocalContextimport androidx.compose.ui.test.junit4.createComposeRule@@ -28,10 +29,12 @@ import androidx.compose.ui.unit.dpimport com.google.samples.apps.nowinandroid.core.designsystem.theme.BackgroundThemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.DarkAndroidBackgroundThemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.DarkAndroidColorScheme+import com.google.samples.apps.nowinandroid.core.designsystem.theme.DarkAndroidGradientColorsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.DarkDefaultColorSchemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColorsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LightAndroidBackgroundThemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LightAndroidColorScheme+import com.google.samples.apps.nowinandroid.core.designsystem.theme.LightAndroidGradientColorsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LightDefaultColorSchemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalBackgroundThemeimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors@@ -42,7 +45,7 @@ import org.junit.Test/*** Tests [NiaTheme] using different combinations of the theme mode parameters:- * darkTheme, dynamicColor, and androidTheme.+ * darkTheme, disableDynamicTheming, and androidTheme.** It verifies that the various composition locals — [MaterialTheme], [LocalGradientColors] and* [LocalBackgroundTheme] — have the expected values for a given theme mode, as specified by the@@ -133,7 +136,7 @@ class ThemeTest {) {val colorScheme = LightAndroidColorSchemeassertColorSchemesEqual(colorScheme, MaterialTheme.colorScheme)- val gradientColors = emptyGradientColors+ val gradientColors = LightAndroidGradientColorsassertEquals(gradientColors, LocalGradientColors.current)val backgroundTheme = LightAndroidBackgroundThemeassertEquals(backgroundTheme, LocalBackgroundTheme.current)@@ -151,7 +154,7 @@ class ThemeTest {) {val colorScheme = DarkAndroidColorSchemeassertColorSchemesEqual(colorScheme, MaterialTheme.colorScheme)- val gradientColors = emptyGradientColors+ val gradientColors = DarkAndroidGradientColorsassertEquals(gradientColors, LocalGradientColors.current)val backgroundTheme = DarkAndroidBackgroundThemeassertEquals(backgroundTheme, LocalBackgroundTheme.current)@@ -166,11 +169,11 @@ class ThemeTest {darkTheme = false,androidTheme = true) {- val colorScheme = dynamicLightColorSchemeWithFallback()+ val colorScheme = LightAndroidColorSchemeassertColorSchemesEqual(colorScheme, MaterialTheme.colorScheme)- val gradientColors = dynamicGradientColorsWithFallback(colorScheme)+ val gradientColors = LightAndroidGradientColorsassertEquals(gradientColors, LocalGradientColors.current)- val backgroundTheme = defaultBackgroundTheme(colorScheme)+ val backgroundTheme = LightAndroidBackgroundThemeassertEquals(backgroundTheme, LocalBackgroundTheme.current)}}@@ -183,11 +186,11 @@ class ThemeTest {darkTheme = true,androidTheme = true) {- val colorScheme = dynamicDarkColorSchemeWithFallback()+ val colorScheme = DarkAndroidColorSchemeassertColorSchemesEqual(colorScheme, MaterialTheme.colorScheme)- val gradientColors = dynamicGradientColorsWithFallback(colorScheme)+ val gradientColors = DarkAndroidGradientColorsassertEquals(gradientColors, LocalGradientColors.current)- val backgroundTheme = defaultBackgroundTheme(colorScheme)+ val backgroundTheme = DarkAndroidBackgroundThemeassertEquals(backgroundTheme, LocalBackgroundTheme.current)}}@@ -211,7 +214,9 @@ class ThemeTest {}}- private val emptyGradientColors = GradientColors()+ private fun emptyGradientColors(colorScheme: ColorScheme): GradientColors {+ return GradientColors(container = colorScheme.surfaceColorAtElevation(2.dp))+ }private fun defaultGradientColors(colorScheme: ColorScheme): GradientColors {return GradientColors(@@ -223,7 +228,7 @@ class ThemeTest {private fun dynamicGradientColorsWithFallback(colorScheme: ColorScheme): GradientColors {return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {- emptyGradientColors+ emptyGradientColors(colorScheme)} else {defaultGradientColors(colorScheme)}diff --git a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.ktindex 80b635be0..cc405421e 100644--- a/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt+++ b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt@@ -25,6 +25,7 @@ import androidx.compose.material3.darkColorSchemeimport androidx.compose.material3.dynamicDarkColorSchemeimport androidx.compose.material3.dynamicLightColorSchemeimport androidx.compose.material3.lightColorScheme+import androidx.compose.material3.surfaceColorAtElevationimport androidx.compose.runtime.Composableimport androidx.compose.runtime.CompositionLocalProviderimport androidx.compose.ui.graphics.Color@@ -159,6 +160,16 @@ val DarkAndroidColorScheme = darkColorScheme(outline = GreenGray60)+/**+ * Light Android gradient colors+ */+val LightAndroidGradientColors = GradientColors(container = DarkGreenGray95)++/**+ * Dark Android gradient colors+ */+val DarkAndroidGradientColors = GradientColors(container = Color.Black)+/*** Light Android background theme*/@@ -207,33 +218,23 @@ internal fun NiaTheme() {// Color schemeval colorScheme = when {- !disableDynamicTheming -> {- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {- val context = LocalContext.current- if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)- } else {- if (darkTheme) DarkDefaultColorScheme else LightDefaultColorScheme- }- }androidTheme -> if (darkTheme) DarkAndroidColorScheme else LightAndroidColorScheme+ !disableDynamicTheming && supportsDynamicTheming() -> {+ val context = LocalContext.current+ if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)+ }else -> if (darkTheme) DarkDefaultColorScheme else LightDefaultColorScheme}// Gradient colors- val emptyGradientColors = GradientColors()+ val emptyGradientColors = GradientColors(container = colorScheme.surfaceColorAtElevation(2.dp))val defaultGradientColors = GradientColors(top = colorScheme.inverseOnSurface,bottom = colorScheme.primaryContainer,container = colorScheme.surface)val gradientColors = when {- !disableDynamicTheming -> {- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {- emptyGradientColors- } else {- defaultGradientColors- }- }- androidTheme -> emptyGradientColors+ androidTheme -> if (darkTheme) DarkAndroidGradientColors else LightAndroidGradientColors+ !disableDynamicTheming && supportsDynamicTheming() -> emptyGradientColorselse -> defaultGradientColors}// Background theme@@ -242,7 +243,6 @@ internal fun NiaTheme(tonalElevation = 2.dp)val backgroundTheme = when {- !disableDynamicTheming -> defaultBackgroundThemeandroidTheme -> if (darkTheme) DarkAndroidBackgroundTheme else LightAndroidBackgroundThemeelse -> defaultBackgroundTheme}