Skip to content

Commit

Permalink
[Theme] Add NoActionBar dynamic color themes
Browse files Browse the repository at this point in the history
Resolves #3636

GIT_ORIGIN_REV_ID=ab4463028a14e4d4fbd3a613c4c402b8de39f552
PiperOrigin-RevId: 578900644
  • Loading branch information
pubiqq authored and paulfthomas committed Nov 6, 2023
1 parent 7674e12 commit 81d1b77
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 10 deletions.
26 changes: 16 additions & 10 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,22 @@ Here are the `Material3` themes you can use to get the latest component styles
and theme-level attributes, as well as their `MaterialComponents` equivalents
when applicable.

`Material3` | `MaterialComponents`
-------------------------------------- | --------------------
`Theme.Material3.Light` | `Theme.MaterialComponents.Light`
`Theme.Material3.Light.NoActionBar` | `Theme.MaterialComponents.Light.NoActionBar`
`Theme.Material3.Dark` | `Theme.MaterialComponents`
`Theme.Material3.Dark.NoActionBar` | `Theme.MaterialComponents.NoActionBar`
`Theme.Material3.DayNight` | `Theme.MaterialComponents.DayNight`
`Theme.Material3.DayNight.NoActionBar` | `Theme.MaterialComponents.DayNight.NoActionBar`
N/A | `Theme.MaterialComponents.Light.DarkActionBar`
N/A | `Theme.MaterialComponents.DayNight.DarkActionBar`
| `Material3` | `MaterialComponents` |
|------------------------------------------------------|---------------------------------------------------|
| `Theme.Material3.Light` | `Theme.MaterialComponents.Light` |
| `Theme.Material3.Light.NoActionBar` | `Theme.MaterialComponents.Light.NoActionBar` |
| `Theme.Material3.Dark` | `Theme.MaterialComponents` |
| `Theme.Material3.Dark.NoActionBar` | `Theme.MaterialComponents.NoActionBar` |
| `Theme.Material3.DayNight` | `Theme.MaterialComponents.DayNight` |
| `Theme.Material3.DayNight.NoActionBar` | `Theme.MaterialComponents.DayNight.NoActionBar` |
| `Theme.Material3.DynamicColors.Light` | N/A |
| `Theme.Material3.DynamicColors.Light.NoActionBar` | N/A |
| `Theme.Material3.DynamicColors.Dark` | N/A |
| `Theme.Material3.DynamicColors.Dark.NoActionBar` | N/A |
| `Theme.Material3.DynamicColors.DayNight` | N/A |
| `Theme.Material3.DynamicColors.DayNight.NoActionBar` | N/A |
| N/A | `Theme.MaterialComponents.Light.DarkActionBar` |
| N/A | `Theme.MaterialComponents.DayNight.DarkActionBar` |

Update your app theme to inherit from one of these themes:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,11 @@
<public name="Theme.Material3.DayNight" type="style"/>
<public name="Theme.Material3.DayNight.NoActionBar" type="style"/>
<public name="Theme.Material3.DynamicColors.Light" type="style"/>
<public name="Theme.Material3.DynamicColors.Light.NoActionBar" type="style"/>
<public name="Theme.Material3.DynamicColors.Dark" type="style"/>
<public name="Theme.Material3.DynamicColors.Dark.NoActionBar" type="style"/>
<public name="Theme.Material3.DynamicColors.DayNight" type="style"/>
<public name="Theme.Material3.DynamicColors.DayNight.NoActionBar" type="style"/>
<public name="Theme.Material3.Light.DialogWhenLarge" type="style"/>
<public name="Theme.Material3.Dark.DialogWhenLarge" type="style"/>
<public name="Theme.Material3.DayNight.DialogWhenLarge" type="style"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<style name="Theme.Material3.DayNight" parent="Theme.Material3.Dark"/>
<style name="Theme.Material3.DayNight.NoActionBar" parent="Theme.Material3.Dark.NoActionBar"/>
<style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Dark"/>
<style name="Theme.Material3.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3.DynamicColors.Dark.NoActionBar"/>
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Dark.DialogWhenLarge"/>

<!-- Material themes (day/night versions) for activities. -->
Expand Down
10 changes: 10 additions & 0 deletions lib/java/com/google/android/material/theme/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@

<style name="Theme.Material3.DynamicColors.Dark" parent="Theme.Material3.Dark"/>

<style name="Theme.Material3.DynamicColors.Light.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.Material3.DynamicColors.Dark.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Theme.Material3.Light.DialogWhenLarge" parent="Base.Theme.Material3.Light.DialogWhenLarge"/>

<style name="Theme.Material3.Dark.DialogWhenLarge" parent="Base.Theme.Material3.Dark.DialogWhenLarge"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<style name="Theme.Material3.DayNight" parent="Theme.Material3.Light"/>
<style name="Theme.Material3.DayNight.NoActionBar" parent="Theme.Material3.Light.NoActionBar"/>
<style name="Theme.Material3.DynamicColors.DayNight" parent="Theme.Material3.DynamicColors.Light"/>
<style name="Theme.Material3.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3.DynamicColors.Light.NoActionBar"/>
<style name="Theme.Material3.DayNight.DialogWhenLarge" parent="Theme.Material3.Light.DialogWhenLarge"/>

<!-- Material themes (day/night versions) for activities. -->
Expand Down

0 comments on commit 81d1b77

Please sign in to comment.