Skip to content

Commit fea726f

Browse files
pekingmehunterstich
pekingme
authored and
hunterstich
committed
[Colors] Refactor Material3Expressive Dynamic Color Themes
PiperOrigin-RevId: 885635803
1 parent 38db2e8 commit fea726f

1 file changed

Lines changed: 138 additions & 2 deletions

File tree

  • lib/java/com/google/android/material/theme/res/values-v31

‎lib/java/com/google/android/material/theme/res/values-v31/themes.xml‎

Lines changed: 138 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,143 @@
1515
~ limitations under the License.
1616
-->
1717
<resources>
18-
<style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3.DynamicColors.Light"/>
18+
<!-- LINT.IfChange(Material3ExpressiveDynamicColorsLight) -->
19+
<style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3Expressive.Light">
20+
<item name="isMaterial3DynamicColorApplied">true</item>
21+
22+
<!-- Color palettes -->
23+
<item name="colorPrimary">@color/m3_sys_color_dynamic_light_primary</item>
24+
<item name="colorOnPrimary">@color/m3_sys_color_dynamic_light_on_primary</item>
25+
<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_light_inverse_primary</item>
26+
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_light_primary_container</item>
27+
<item name="colorOnPrimaryContainer">@color/m3_ref_palette_primary30</item>
28+
<item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
29+
<item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
30+
<item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
31+
<item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
32+
<item name="colorSecondary">@color/m3_sys_color_dynamic_light_secondary</item>
33+
<item name="colorOnSecondary">@color/m3_sys_color_dynamic_light_on_secondary</item>
34+
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_light_secondary_container</item>
35+
<item name="colorOnSecondaryContainer">@color/m3_ref_palette_secondary30</item>
36+
<item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
37+
<item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
38+
<item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
39+
<item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
40+
<item name="colorTertiary">@color/m3_sys_color_dynamic_light_tertiary</item>
41+
<item name="colorOnTertiary">@color/m3_sys_color_dynamic_light_on_tertiary</item>
42+
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_light_tertiary_container</item>
43+
<item name="colorOnTertiaryContainer">@color/m3_ref_palette_tertiary30</item>
44+
<item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
45+
<item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
46+
<item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
47+
<item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
48+
<item name="android:colorBackground">@color/m3_sys_color_dynamic_light_background</item>
49+
<item name="colorOnBackground">@color/m3_sys_color_dynamic_light_on_background</item>
50+
<item name="colorSurface">@color/m3_sys_color_dynamic_light_surface</item>
51+
<item name="colorOnSurface">@color/m3_sys_color_dynamic_light_on_surface</item>
52+
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_light_surface_variant</item>
53+
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_light_on_surface_variant</item>
54+
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_surface</item>
55+
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_light_inverse_on_surface</item>
56+
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_light_surface_bright</item>
57+
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_light_surface_dim</item>
58+
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_light_surface_container</item>
59+
<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_light_surface_container_low</item>
60+
<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_light_surface_container_high</item>
61+
<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_light_surface_container_lowest</item>
62+
<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_light_surface_container_highest</item>
63+
<item name="colorOutline">@color/m3_sys_color_dynamic_light_outline</item>
64+
<item name="colorError">@color/m3_sys_color_light_error</item>
65+
<item name="colorOnError">@color/m3_sys_color_light_on_error</item>
66+
<item name="colorErrorContainer">@color/m3_sys_color_light_error_container</item>
67+
<item name="colorOnErrorContainer">@color/m3_ref_palette_error30</item>
1968

20-
<style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3.DynamicColors.Dark"/>
69+
<!-- Default Framework Text Colors. -->
70+
<item name="android:textColorPrimary">@color/m3_dynamic_default_color_primary_text</item>
71+
<item name="android:textColorPrimaryInverse">@color/m3_dynamic_dark_default_color_primary_text</item>
72+
<item name="android:textColorSecondary">@color/m3_dynamic_default_color_secondary_text</item>
73+
<item name="android:textColorSecondaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
74+
<item name="android:textColorTertiary">@color/m3_dynamic_default_color_secondary_text</item>
75+
<item name="android:textColorTertiaryInverse">@color/m3_dynamic_dark_default_color_secondary_text</item>
76+
<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
77+
<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
78+
<item name="android:textColorHint">@color/m3_dynamic_hint_foreground</item>
79+
<item name="android:textColorHintInverse">@color/m3_dynamic_dark_hint_foreground</item>
80+
<item name="android:textColorHighlight">@color/m3_dynamic_highlighted_text</item>
81+
<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
82+
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
83+
</style>
84+
<!-- LINT.ThenChange(:Material3DynamicColorsLight) -->
85+
86+
<!-- LINT.IfChange(Material3ExpressiveDynamicColorsDark) -->
87+
<style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3Expressive.Dark">
88+
<item name="isMaterial3DynamicColorApplied">true</item>
89+
90+
<!-- Color palettes -->
91+
<item name="colorPrimary">@color/m3_sys_color_dynamic_dark_primary</item>
92+
<item name="colorOnPrimary">@color/m3_sys_color_dynamic_dark_on_primary</item>
93+
<item name="colorPrimaryInverse">@color/m3_sys_color_dynamic_dark_inverse_primary</item>
94+
<item name="colorPrimaryContainer">@color/m3_sys_color_dynamic_dark_primary_container</item>
95+
<item name="colorOnPrimaryContainer">@color/m3_sys_color_dynamic_dark_on_primary_container</item>
96+
<item name="colorPrimaryFixed">@color/m3_sys_color_dynamic_primary_fixed</item>
97+
<item name="colorPrimaryFixedDim">@color/m3_sys_color_dynamic_primary_fixed_dim</item>
98+
<item name="colorOnPrimaryFixed">@color/m3_sys_color_dynamic_on_primary_fixed</item>
99+
<item name="colorOnPrimaryFixedVariant">@color/m3_sys_color_dynamic_on_primary_fixed_variant</item>
100+
<item name="colorSecondary">@color/m3_sys_color_dynamic_dark_secondary</item>
101+
<item name="colorOnSecondary">@color/m3_sys_color_dynamic_dark_on_secondary</item>
102+
<item name="colorSecondaryContainer">@color/m3_sys_color_dynamic_dark_secondary_container</item>
103+
<item name="colorOnSecondaryContainer">@color/m3_sys_color_dynamic_dark_on_secondary_container</item>
104+
<item name="colorSecondaryFixed">@color/m3_sys_color_dynamic_secondary_fixed</item>
105+
<item name="colorSecondaryFixedDim">@color/m3_sys_color_dynamic_secondary_fixed_dim</item>
106+
<item name="colorOnSecondaryFixed">@color/m3_sys_color_dynamic_on_secondary_fixed</item>
107+
<item name="colorOnSecondaryFixedVariant">@color/m3_sys_color_dynamic_on_secondary_fixed_variant</item>
108+
<item name="colorTertiary">@color/m3_sys_color_dynamic_dark_tertiary</item>
109+
<item name="colorOnTertiary">@color/m3_sys_color_dynamic_dark_on_tertiary</item>
110+
<item name="colorTertiaryContainer">@color/m3_sys_color_dynamic_dark_tertiary_container</item>
111+
<item name="colorOnTertiaryContainer">@color/m3_sys_color_dynamic_dark_on_tertiary_container</item>
112+
<item name="colorTertiaryFixed">@color/m3_sys_color_dynamic_tertiary_fixed</item>
113+
<item name="colorTertiaryFixedDim">@color/m3_sys_color_dynamic_tertiary_fixed_dim</item>
114+
<item name="colorOnTertiaryFixed">@color/m3_sys_color_dynamic_on_tertiary_fixed</item>
115+
<item name="colorOnTertiaryFixedVariant">@color/m3_sys_color_dynamic_on_tertiary_fixed_variant</item>
116+
<item name="android:colorBackground">@color/m3_sys_color_dynamic_dark_background</item>
117+
<item name="colorOnBackground">@color/m3_sys_color_dynamic_dark_on_background</item>
118+
<item name="colorSurface">@color/m3_sys_color_dynamic_dark_surface</item>
119+
<item name="colorOnSurface">@color/m3_sys_color_dynamic_dark_on_surface</item>
120+
<item name="colorSurfaceVariant">@color/m3_sys_color_dynamic_dark_surface_variant</item>
121+
<item name="colorOnSurfaceVariant">@color/m3_sys_color_dynamic_dark_on_surface_variant</item>
122+
<item name="colorSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_surface</item>
123+
<item name="colorOnSurfaceInverse">@color/m3_sys_color_dynamic_dark_inverse_on_surface</item>
124+
<item name="colorSurfaceBright">@color/m3_sys_color_dynamic_dark_surface_bright</item>
125+
<item name="colorSurfaceDim">@color/m3_sys_color_dynamic_dark_surface_dim</item>
126+
<item name="colorSurfaceContainer">@color/m3_sys_color_dynamic_dark_surface_container</item>
127+
<item name="colorSurfaceContainerLow">@color/m3_sys_color_dynamic_dark_surface_container_low</item>
128+
<item name="colorSurfaceContainerHigh">@color/m3_sys_color_dynamic_dark_surface_container_high</item>
129+
<item name="colorSurfaceContainerLowest">@color/m3_sys_color_dynamic_dark_surface_container_lowest</item>
130+
<item name="colorSurfaceContainerHighest">@color/m3_sys_color_dynamic_dark_surface_container_highest</item>
131+
<item name="colorOutline">@color/m3_sys_color_dynamic_dark_outline</item>
132+
<item name="colorError">@color/m3_sys_color_dark_error</item>
133+
<item name="colorOnError">@color/m3_sys_color_dark_on_error</item>
134+
<item name="colorErrorContainer">@color/m3_sys_color_dark_error_container</item>
135+
<item name="colorOnErrorContainer">@color/m3_sys_color_dark_on_error_container</item>
136+
137+
<!-- Default Framework Text Colors. -->
138+
<item name="android:textColorPrimary">@color/m3_dynamic_dark_default_color_primary_text</item>
139+
<item name="android:textColorPrimaryInverse">@color/m3_dynamic_default_color_primary_text</item>
140+
<item name="android:textColorSecondary">@color/m3_dynamic_dark_default_color_secondary_text</item>
141+
<item name="android:textColorSecondaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
142+
<item name="android:textColorTertiary">@color/m3_dynamic_dark_default_color_secondary_text</item>
143+
<item name="android:textColorTertiaryInverse">@color/m3_dynamic_default_color_secondary_text</item>
144+
<item name="android:textColorPrimaryDisableOnly">@color/m3_dynamic_dark_primary_text_disable_only</item>
145+
<item name="android:textColorPrimaryInverseDisableOnly">@color/m3_dynamic_primary_text_disable_only</item>
146+
<item name="android:textColorHint">@color/m3_dynamic_dark_hint_foreground</item>
147+
<item name="android:textColorHintInverse">@color/m3_dynamic_hint_foreground</item>
148+
<item name="android:textColorHighlight">@color/m3_dynamic_dark_highlighted_text</item>
149+
<item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
150+
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
151+
</style>
152+
<!-- LINT.ThenChange(:Material3DynamicColorsDark) -->
21153

154+
<!-- LINT.IfChange(Material3DynamicColorsLight) -->
22155
<style name="Theme.Material3.DynamicColors.Light" parent="Theme.Material3.Light">
23156
<item name="isMaterial3DynamicColorApplied">true</item>
24157

@@ -84,7 +217,9 @@
84217
<item name="android:textColorHighlightInverse">@color/m3_dynamic_dark_highlighted_text</item>
85218
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_default_color_primary_text</item>
86219
</style>
220+
<!-- LINT.ThenChange(:Material3ExpressiveDynamicColorsLight) -->
87221

222+
<!-- LINT.IfChange(Material3DynamicColorsDark) -->
88223
<style name="Theme.Material3.DynamicColors.Dark" parent="Theme.Material3.Dark">
89224
<item name="isMaterial3DynamicColorApplied">true</item>
90225

@@ -150,4 +285,5 @@
150285
<item name="android:textColorHighlightInverse">@color/m3_dynamic_highlighted_text</item>
151286
<item name="android:textColorAlertDialogListItem">@color/m3_dynamic_dark_default_color_primary_text</item>
152287
</style>
288+
<!-- LINT.ThenChange(:Material3ExpressiveDynamicColorsDark) -->
153289
</resources>

0 commit comments

Comments
 (0)