Skip to content

Commit 3637c23

Browse files
dsn5ftgsajith
dsn5ft
authored and
gsajith
committed
Dark theme color palette
PiperOrigin-RevId: 219143246
1 parent 38ef896 commit 3637c23

File tree

9 files changed

+158
-44
lines changed

9 files changed

+158
-44
lines changed

‎lib/java/com/google/android/material/appbar/res/values/styles.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@
6363
<item name="android:elevation" tools:ignore="NewApi">@dimen/design_appbar_elevation</item>
6464
<item name="android:background">?attr/colorPrimary</item>
6565
<item name="titleTextColor">?attr/colorOnPrimary</item>
66-
<item name="subtitleTextColor">@color/mtrl_on_primary_emphasis_medium</item>
66+
<item name="subtitleTextColor">?attr/colorOnPrimaryEmphasisMedium</item>
6767
<!-- Note: this theme overlay will only work if the style is applied directly to a Toolbar. -->
6868
<item name="android:theme">@style/ThemeOverlay.MaterialComponents.Toolbar.Primary</item>
6969
</style>
7070

7171
<style name="Widget.MaterialComponents.Toolbar.Surface">
7272
<item name="android:background">?attr/colorSurface</item>
73-
<item name="titleTextColor">@color/mtrl_on_surface_emphasis_high_type</item>
74-
<item name="subtitleTextColor">@color/mtrl_on_surface_emphasis_medium</item>
73+
<item name="titleTextColor">?attr/colorOnSurfaceEmphasisHighType</item>
74+
<item name="subtitleTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
7575
<!-- Note: this theme overlay will only work if the style is applied directly to a Toolbar. -->
7676
<item name="android:theme">@style/ThemeOverlay.MaterialComponents.Toolbar.Surface</item>
7777
</style>
@@ -108,24 +108,24 @@
108108
</style>
109109

110110
<style name="ThemeOverlay.MaterialComponents.Toolbar.Surface" parent="">
111-
<item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
112-
<item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
111+
<item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
112+
<item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
113113
</style>
114114

115115
<style name="ThemeOverlay.MaterialComponents.ActionBar.Primary" parent="">
116116
<item name="android:textColorPrimary">?attr/colorOnPrimary</item>
117-
<item name="android:textColorSecondary">@color/mtrl_on_primary_emphasis_medium</item>
117+
<item name="android:textColorSecondary">?attr/colorOnPrimaryEmphasisMedium</item>
118118
<item name="actionMenuTextColor">?attr/colorOnPrimary</item>
119119
<item name="colorControlNormal">?attr/colorOnPrimary</item>
120120
<!-- Counteracts the effect of setting textColorPrimary for popup menus. -->
121121
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
122122
</style>
123123

124124
<style name="ThemeOverlay.MaterialComponents.ActionBar.Surface" parent="">
125-
<item name="android:textColorPrimary">@color/mtrl_on_surface_emphasis_high_type</item>
126-
<item name="android:textColorSecondary">@color/mtrl_on_surface_emphasis_medium</item>
127-
<item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
128-
<item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
125+
<item name="android:textColorPrimary">?attr/colorOnSurfaceEmphasisHighType</item>
126+
<item name="android:textColorSecondary">?attr/colorOnSurfaceEmphasisMedium</item>
127+
<item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
128+
<item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
129129
<!-- Counteracts the effect of setting textColorPrimary for popup menus. -->
130130
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
131131
</style>

‎lib/java/com/google/android/material/bottomappbar/res/values/styles.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</style>
4848

4949
<style name="ThemeOverlay.MaterialComponents.BottomAppBar.Surface" parent="">
50-
<item name="colorControlNormal">@color/mtrl_on_surface_emphasis_medium</item>
51-
<item name="actionMenuTextColor">@color/mtrl_on_surface_emphasis_medium</item>
50+
<item name="colorControlNormal">?attr/colorOnSurfaceEmphasisMedium</item>
51+
<item name="actionMenuTextColor">?attr/colorOnSurfaceEmphasisMedium</item>
5252
</style>
5353

5454
<style name="ThemeOverlay.MaterialComponents.BottomAppBar.Primary" parent="">

‎lib/java/com/google/android/material/color/res-public/values/public.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@
4242
<public name="mtrl_on_surface_disabled" type="color"/>
4343
<public name="mtrl_on_surface_emphasis_high_type" type="color"/>
4444
<public name="mtrl_on_surface_emphasis_medium" type="color"/>
45+
<public name="mtrl_dark_on_primary_disabled" type="color"/>
46+
<public name="mtrl_dark_on_primary_emphasis_high_type" type="color"/>
47+
<public name="mtrl_dark_on_primary_emphasis_medium" type="color"/>
48+
<public name="mtrl_dark_on_surface_disabled" type="color"/>
49+
<public name="mtrl_dark_on_surface_emphasis_high_type" type="color"/>
50+
<public name="mtrl_dark_on_surface_emphasis_medium" type="color"/>
4551
<public name="mtrl_emphasis_high_type" format="float" type="dimen" />
4652
<public name="mtrl_emphasis_medium" format="float" type="dimen"/>
4753
<public name="mtrl_emphasis_disabled" format="float" type="dimen"/>

‎lib/java/com/google/android/material/color/res/values-v23/colors.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (C) 2018 The Android Open Source Project
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
<resources>
18+
19+
<!-- On API 23+ these CSLs are theme-aware. -->
20+
<color name="mtrl_dark_on_primary_disabled">@color/mtrl_on_primary_disabled</color>
21+
<color name="mtrl_dark_on_primary_emphasis_high_type">@color/mtrl_on_primary_emphasis_high_type</color>
22+
<color name="mtrl_dark_on_primary_emphasis_medium">@color/mtrl_on_primary_emphasis_medium</color>
23+
<color name="mtrl_dark_on_surface_disabled">@color/mtrl_on_surface_disabled</color>
24+
<color name="mtrl_dark_on_surface_emphasis_high_type">@color/mtrl_on_surface_emphasis_high_type</color>
25+
<color name="mtrl_dark_on_surface_emphasis_medium">@color/mtrl_on_surface_emphasis_medium</color>
26+
</resources>

‎lib/java/com/google/android/material/color/res/values/attrs.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
surface. -->
4141
<attr name="colorOnSurface" format="color"/>
4242

43+
<!-- Private color attributes that help facilitate switching these pre-23 compatibility
44+
values for the light and dark themes. -->
45+
<attr name="colorOnPrimaryDisabled" format="color"/>
46+
<attr name="colorOnPrimaryEmphasisHighType" format="color"/>
47+
<attr name="colorOnPrimaryEmphasisMedium" format="color"/>
48+
<attr name="colorOnSurfaceDisabled" format="color"/>
49+
<attr name="colorOnSurfaceEmphasisHighType" format="color"/>
50+
<attr name="colorOnSurfaceEmphasisMedium" format="color"/>
51+
4352
<!-- The scrim background that appears below modals and expanded navigation menus.
4453
The background can either be a color or a bitmap drawable with tileMode set to repeat. -->
4554
<attr name="scrimBackground" format="color|reference"/>
@@ -53,6 +62,6 @@
5362
be ignored. This value should be set to false when using custom drawables
5463
that should not be tinted. This value is ignored if a buttonTint is set.
5564
Set this attribute on your styles for each selection control.-->
56-
<attr name="useMaterialThemeColors" format="boolean"/>
65+
<attr name="useMaterialThemeColors" format="boolean"/>
5766

5867
</resources>

‎lib/java/com/google/android/material/color/res/values/colors.xml‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,40 @@
1616
-->
1717
<resources>
1818

19+
<!-- Light theme brand colors. -->
1920
<color name="design_default_color_primary">#6200EE</color>
2021
<color name="design_default_color_primary_dark">#303F9F</color>
2122
<color name="design_default_color_primary_variant">#3700B3</color>
23+
<color name="design_default_color_on_primary">#FFFFFF</color>
2224
<color name="design_default_color_secondary">#03DAC6</color>
2325
<color name="design_default_color_secondary_variant">#018786</color>
24-
<color name="design_default_color_background">#FFFFFF</color>
25-
<color name="design_default_color_surface">#FFFFFF</color>
26-
<color name="design_default_color_error">#B00020</color>
27-
<color name="design_default_color_on_primary">#FFFFFF</color>
2826
<color name="design_default_color_on_secondary">#000000</color>
27+
28+
<!-- Light theme neutral colors. -->
29+
<color name="design_default_color_background">#FFFFFF</color>
2930
<color name="design_default_color_on_background">#000000</color>
31+
<color name="design_default_color_surface">#FFFFFF</color>
3032
<color name="design_default_color_on_surface">#000000</color>
33+
<color name="design_default_color_error">#B00020</color>
3134
<color name="design_default_color_on_error">#FFFFFF</color>
3235

36+
<!-- Dark theme brand colors. -->
37+
<color name="design_dark_default_color_primary">#BB86FC</color>
38+
<color name="design_dark_default_color_primary_dark">#8858C8</color>
39+
<color name="design_dark_default_color_primary_variant">#4B01D0</color>
40+
<color name="design_dark_default_color_on_primary">#000000</color>
41+
<color name="design_dark_default_color_secondary">#03DAC6</color>
42+
<color name="design_dark_default_color_secondary_variant">#018786</color>
43+
<color name="design_dark_default_color_on_secondary">#000000</color>
44+
45+
<!-- Dark theme neutral colors. -->
46+
<color name="design_dark_default_color_background">#141414</color>
47+
<color name="design_dark_default_color_on_background">#FFFFFF</color>
48+
<color name="design_dark_default_color_surface">#282828</color>
49+
<color name="design_dark_default_color_on_surface">#FFFFFF</color>
50+
<color name="design_dark_default_color_error">#C26C7A</color>
51+
<color name="design_dark_default_color_on_error">#000000</color>
52+
3353
<!-- 32% opacity black -->
3454
<color name="mtrl_scrim_color">#52000000</color>
3555

@@ -52,4 +72,11 @@
5272
<color name="mtrl_on_surface_disabled">#61000000</color>
5373
<color name="mtrl_on_surface_emphasis_high_type">#DE000000</color>
5474
<color name="mtrl_on_surface_emphasis_medium">#99000000</color>
75+
76+
<color name="mtrl_dark_on_primary_disabled">#61000000</color>
77+
<color name="mtrl_dark_on_primary_emphasis_high_type">#DE000000</color>
78+
<color name="mtrl_dark_on_primary_emphasis_medium">#99000000</color>
79+
<color name="mtrl_dark_on_surface_disabled">#61FFFFFF</color>
80+
<color name="mtrl_dark_on_surface_emphasis_high_type">#DEFFFFFF</color>
81+
<color name="mtrl_dark_on_surface_emphasis_medium">#99FFFFFF</color>
5582
</resources>

‎lib/java/com/google/android/material/dialog/res/values/themes_base.xml‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,28 +35,37 @@
3535
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
3636

3737
<!-- Colors -->
38-
<item name="colorPrimary">@color/design_default_color_primary</item>
39-
<item name="colorPrimaryVariant">@color/design_default_color_primary_variant</item>
38+
<item name="colorPrimary">@color/design_dark_default_color_primary</item>
39+
<item name="colorPrimaryVariant">@color/design_dark_default_color_primary_variant</item>
4040

41-
<item name="colorSecondary">@color/design_default_color_secondary</item>
42-
<item name="colorSecondaryVariant">@color/design_default_color_secondary_variant</item>
41+
<item name="colorSecondary">@color/design_dark_default_color_secondary</item>
42+
<item name="colorSecondaryVariant">@color/design_dark_default_color_secondary_variant</item>
4343

44-
<item name="android:colorBackground">@color/design_default_color_background</item>
45-
<item name="colorError">@color/design_default_color_error</item>
46-
<item name="colorSurface">@color/design_default_color_surface</item>
44+
<item name="android:colorBackground">@color/design_dark_default_color_background</item>
45+
<item name="colorError">@color/design_dark_default_color_error</item>
46+
<item name="colorSurface">@color/design_dark_default_color_surface</item>
4747

48-
<item name="colorOnPrimary">@color/design_default_color_on_primary</item>
49-
<item name="colorOnSecondary">@color/design_default_color_on_secondary</item>
50-
<item name="colorOnBackground">@color/design_default_color_on_background</item>
51-
<item name="colorOnError">@color/design_default_color_on_error</item>
52-
<item name="colorOnSurface">@color/design_default_color_on_surface</item>
48+
<item name="colorOnPrimary">@color/design_dark_default_color_on_primary</item>
49+
<item name="colorOnSecondary">@color/design_dark_default_color_on_secondary</item>
50+
<item name="colorOnBackground">@color/design_dark_default_color_on_background</item>
51+
<item name="colorOnError">@color/design_dark_default_color_on_error</item>
52+
<item name="colorOnSurface">@color/design_dark_default_color_on_surface</item>
5353

54-
<item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
54+
<item name="colorPrimaryDark">@color/design_dark_default_color_primary_dark</item>
5555

5656
<item name="colorAccent">?attr/colorSecondary</item>
5757

5858
<item name="scrimBackground">@color/mtrl_scrim_color</item>
5959

60+
<item name="colorOnPrimaryDisabled">@color/mtrl_dark_on_primary_disabled</item>
61+
<item name="colorOnPrimaryEmphasisHighType">@color/mtrl_dark_on_primary_emphasis_high_type
62+
</item>
63+
<item name="colorOnPrimaryEmphasisMedium">@color/mtrl_dark_on_primary_emphasis_medium</item>
64+
<item name="colorOnSurfaceDisabled">@color/mtrl_dark_on_surface_disabled</item>
65+
<item name="colorOnSurfaceEmphasisHighType">@color/mtrl_dark_on_surface_emphasis_high_type
66+
</item>
67+
<item name="colorOnSurfaceEmphasisMedium">@color/mtrl_dark_on_surface_emphasis_medium</item>
68+
6069
<item name="actionBarSize">@dimen/mtrl_toolbar_default_height</item>
6170

6271
<!-- Widget styles -->
@@ -134,6 +143,13 @@
134143

135144
<item name="scrimBackground">@color/mtrl_scrim_color</item>
136145

146+
<item name="colorOnPrimaryDisabled">@color/mtrl_on_primary_disabled</item>
147+
<item name="colorOnPrimaryEmphasisHighType">@color/mtrl_on_primary_emphasis_high_type</item>
148+
<item name="colorOnPrimaryEmphasisMedium">@color/mtrl_on_primary_emphasis_medium</item>
149+
<item name="colorOnSurfaceDisabled">@color/mtrl_on_surface_disabled</item>
150+
<item name="colorOnSurfaceEmphasisHighType">@color/mtrl_on_surface_emphasis_high_type</item>
151+
<item name="colorOnSurfaceEmphasisMedium">@color/mtrl_on_surface_emphasis_medium</item>
152+
137153
<item name="actionBarSize">@dimen/mtrl_toolbar_default_height</item>
138154

139155
<!-- Widget styles -->

‎lib/java/com/google/android/material/theme/res/values/themes_base.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
2424

2525
<!-- Colors -->
26-
<item name="colorPrimary">@color/design_default_color_primary</item>
27-
<item name="colorPrimaryDark">@color/design_default_color_primary_dark</item>
28-
<item name="colorSecondary">@color/design_default_color_secondary</item>
26+
<item name="colorPrimary">@color/design_dark_default_color_primary</item>
27+
<item name="colorPrimaryDark">@color/design_dark_default_color_primary_dark</item>
28+
<item name="colorSecondary">@color/design_dark_default_color_secondary</item>
2929
<item name="colorAccent">?attr/colorSecondary</item>
3030

31-
<item name="android:colorBackground">@color/design_default_color_background</item>
32-
<item name="colorError">@color/design_default_color_error</item>
31+
<item name="android:colorBackground">@color/design_dark_default_color_background</item>
32+
<item name="colorError">@color/design_dark_default_color_error</item>
3333

3434
<item name="actionBarSize">@dimen/mtrl_toolbar_default_height</item>
3535

0 commit comments

Comments
 (0)