Skip to content

Commit 7b628db

Browse files
dsn5ftafohrman
authored andcommitted
Update MDC Catalog to use baseline Material colors and DayNight theme by
default PiperOrigin-RevId: 234864670
1 parent fdbd553 commit 7b628db

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

catalog/java/io/material/catalog/application/theme/res/values/colors.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,4 @@
1616
-->
1717
<resources>
1818
<color name="cat_title_text_color">#FFFFFF</color>
19-
20-
<color name="cat_color_primary">#30E57E</color>
21-
<color name="cat_color_primary_dark">#00B250</color>
22-
<color name="cat_color_on_primary">#000000</color>
23-
24-
<color name="cat_color_secondary">#212121</color>
25-
<color name="cat_color_on_secondary">#FFFFFF</color>
2619
</resources>

catalog/java/io/material/catalog/application/theme/res/values/themes.xml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
-->
1717
<resources>
1818

19-
<style name="Theme.Catalog" parent="Theme.MaterialComponents.Light.NoActionBar">
20-
<item name="colorPrimary">@color/cat_color_primary</item>
21-
<item name="colorPrimaryDark">@color/cat_color_primary_dark</item>
22-
<item name="colorOnPrimary">@color/cat_color_on_primary</item>
23-
<item name="colorSecondary">@color/cat_color_secondary</item>
24-
<item name="colorOnSecondary">@color/cat_color_on_secondary</item>
19+
<style name="Theme.Catalog" parent="Theme.MaterialComponents.DayNight.NoActionBar">
2520
<item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
2621
<item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
2722
<item name="windowActionModeOverlay">true</item>
@@ -32,10 +27,4 @@
3227
<item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
3328
<item name="windowActionModeOverlay">true</item>
3429
</style>
35-
36-
<style name="Theme.Catalog.DayNight" parent="Theme.MaterialComponents.DayNight.NoActionBar">
37-
<item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
38-
<item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
39-
<item name="windowActionModeOverlay">true</item>
40-
</style>
4130
</resources>

0 commit comments

Comments
 (0)