Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'material3_dynamic_color_theme'

This commit is contained in:
LucasGGamerM 2022-12-10 13:18:06 -03:00
parent 028b88aa24 c1b382ef34
commit 90bef7fddb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mastodon/src/main/res/values/styles.xml
View File

@ -204,7 +204,7 @@
<item name="colorBackgroundLightest">@color/black</item> <item name="colorBackgroundLightest">@color/black</item>
</style> </style>
<style name="Theme.Mastodon.Light.Material3" parent="Theme.Mastodon.Light"> <style name="Theme.Mastodon.Light.Material3" parent="Theme.Mastodon.Light.CustomBase">
<!-- needed to disable scrim on API 29+ --> <!-- needed to disable scrim on API 29+ -->
<item name="android:colorPrimary">@color/m3_gray_800</item> <item name="android:colorPrimary">@color/m3_gray_800</item>
<item name="android:textColorPrimary">@color/m3_gray_800</item> <item name="android:textColorPrimary">@color/m3_gray_800</item>
@ -231,14 +231,14 @@
<item name="colorSecondary">@color/m3_gray_50</item> <item name="colorSecondary">@color/m3_gray_50</item>
</style> </style>
<style name="Theme.Mastodon.Dark.Material3" parent="Theme.Mastodon.Dark"> <style name="Theme.Mastodon.Dark.Material3" parent="Theme.Mastodon.Dark.CustomBase">
<!-- needed to disable scrim on API 29+ --> <!-- needed to disable scrim on API 29+ -->
<item name="android:colorBackground">@color/m3_gray_700</item> <item name="android:colorBackground">@color/m3_gray_700</item>
<item name="colorButtonText">@color/m3_gray_800</item> <item name="colorButtonText">@color/m3_gray_800</item>
<item name="colorBackgroundLight">@color/m3_gray_700</item> <item name="colorBackgroundLight">@color/m3_gray_700</item>
<item name="colorBackgroundLightest">@color/m3_gray_900</item> <item name="colorBackgroundLightest">@color/m3_gray_900</item>
<item name="colorBackgroundPopup">@color/m3_gray_900</item> <item name="colorBackgroundPopup">@color/m3_gray_900</item>
<item name="colorDarkIcon">@color/gray_25</item> <item name="colorDarkIcon">@color/m3_gray_25</item>
<item name="colorWindowBackground">@color/m3_gray_800</item> <item name="colorWindowBackground">@color/m3_gray_800</item>
<item name="android:statusBarColor">@color/m3_gray_800</item> <item name="android:statusBarColor">@color/m3_gray_800</item>
<item name="android:navigationBarColor">@color/m3_gray_800</item> <item name="android:navigationBarColor">@color/m3_gray_800</item>
@ -262,7 +262,7 @@
<item name="colorSearchField">@color/m3_gray_700</item> <item name="colorSearchField">@color/m3_gray_700</item>
</style> </style>
<style name="Theme.Mastodon.Dark.TrueBlack.Material3"> <style name="Theme.Mastodon.Dark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.Material3">
<item name="android:colorAccent">@color/m3_primary_400</item> <item name="android:colorAccent">@color/m3_primary_400</item>
<item name="colorPollMostVoted">@color/m3_primary_700</item> <item name="colorPollMostVoted">@color/m3_primary_700</item>
<item name="colorAccentLight">@color/m3_primary_600</item> <item name="colorAccentLight">@color/m3_primary_600</item>
@ -294,7 +294,7 @@
<!-- colors --> <!-- colors -->
<item name="android:colorAccent">@color/m3_primary_600</item> <item name="android:colorAccent">@color/m3_primary_600</item>
<item name="android:colorPrimary">@color/m3_gray_50</item> <item name="android:colorPrimary">@color/m3_gray_50</item>
<item name="android:colorBackground">@color/custom_gray_700</item> <item name="android:colorBackground">@color/m3_gray_700</item>
<item name="android:textColorPrimary">@color/m3_gray_50</item> <item name="android:textColorPrimary">@color/m3_gray_50</item>
<item name="android:textColorSecondary">@color/m3_gray_400</item> <item name="android:textColorSecondary">@color/m3_gray_400</item>
</style> </style>
@ -307,16 +307,16 @@
<!-- colors --> <!-- colors -->
<item name="android:colorAccent">@color/m3_primary_700</item> <item name="android:colorAccent">@color/m3_primary_700</item>
<item name="android:colorPrimary">@color/custom_gray_800</item> <item name="android:colorPrimary">@color/m3_gray_800</item>
<item name="android:colorBackground">@color/m3_gray_100</item> <item name="android:colorBackground">@color/m3_gray_100</item>
<item name="android:textColorPrimary">@color/custom_gray_800</item> <item name="android:textColorPrimary">@color/m3_gray_800</item>
<item name="android:textColorSecondary">@color/custom_gray_500</item> <item name="android:textColorSecondary">@color/m3_gray_500</item>
</style> </style>
<style name="Theme.Mastodon.Toolbar.M3" parent="android:ThemeOverlay.Material.ActionBar"> <style name="Theme.Mastodon.Toolbar.M3" parent="android:ThemeOverlay.Material.ActionBar">
<item name="android:colorPrimary">@color/m3_gray_50</item> <item name="android:colorPrimary">@color/m3_gray_50</item>
<item name="android:textColorPrimary">@color/custom_gray_800</item> <item name="android:textColorPrimary">@color/m3_gray_800</item>
<item name="android:textColorSecondary">@color/custom_gray_800</item> <item name="android:textColorSecondary">@color/m3_gray_800</item>
</style> </style>