Skip to content

Commit 9f9568f

Browse files
committed
ui: align dynamic theme colors with Android defaults
1 parent 863c6bd commit 9f9568f

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

app/src/main/kotlin/ui/Theme.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,22 @@ fun AppTheme(
3636
ColorModeThemeSystem -> ThemeController(
3737
ColorSchemeMode.MonetSystem,
3838
keyColor = keyColor,
39-
colorSpec = ThemeColorSpec.Spec2021,
40-
paletteStyle = ThemePaletteStyle.Content,
39+
colorSpec = AndroidDynamicColorSpec,
40+
paletteStyle = AndroidDynamicPaletteStyle,
4141
)
4242

4343
ColorModeThemeLight -> ThemeController(
4444
ColorSchemeMode.MonetLight,
4545
keyColor = keyColor,
46-
colorSpec = ThemeColorSpec.Spec2021,
47-
paletteStyle = ThemePaletteStyle.Content,
46+
colorSpec = AndroidDynamicColorSpec,
47+
paletteStyle = AndroidDynamicPaletteStyle,
4848
)
4949

5050
ColorModeThemeDark -> ThemeController(
5151
ColorSchemeMode.MonetDark,
5252
keyColor = keyColor,
53-
colorSpec = ThemeColorSpec.Spec2021,
54-
paletteStyle = ThemePaletteStyle.Content,
53+
colorSpec = AndroidDynamicColorSpec,
54+
paletteStyle = AndroidDynamicPaletteStyle,
5555
)
5656

5757
else -> ThemeController(ColorSchemeMode.System)
@@ -84,3 +84,6 @@ val KeyColors: List<Color> = listOf(
8484
)
8585

8686
fun keyColorFor(index: Int): Color? = if (index <= 0) null else KeyColors.getOrNull(index - 1)
87+
88+
private val AndroidDynamicColorSpec = ThemeColorSpec.Spec2025
89+
private val AndroidDynamicPaletteStyle = ThemePaletteStyle.TonalSpot

0 commit comments

Comments
 (0)