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

theming support for m3 colors

Browse Source
This commit is contained in:
sk
2023-05-30 23:52:26 +02:00
parent 18ae3f4f61
commit e005731ba6
5 changed files with 297 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,29 +63,29 @@
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<!-- M3 colors -->
<item name="colorM3Primary">@color/m3_sys_light_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_light_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_light_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_light_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_light_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_light_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_light_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_light_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_light_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_light_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_light_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_light_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_light_background</item>
<item name="colorM3OnBackground">@color/m3_sys_light_on_background</item>
<item name="colorM3Surface">@color/m3_sys_light_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_light_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_light_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_light_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_light_outline</item>
<item name="colorM3Primary">?colorPrimary600</item>
<item name="colorM3OnPrimary">@color/white</item>
<item name="colorM3PrimaryContainer">?colorPrimary100</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary900</item>
<item name="colorM3Secondary">?colorSecondary600</item>
<item name="colorM3OnSecondary">@color/white</item>
<item name="colorM3SecondaryContainer">?colorSecondary100</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary900</item>
<item name="colorM3Tertiary">?colorTertiary600</item>
<item name="colorM3OnTertiary">@color/white</item>
<item name="colorM3TertiaryContainer">?colorTertiary100</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary900</item>
<item name="colorM3Background">?colorGray25</item>
<item name="colorM3OnBackground">?colorGray900</item>
<item name="colorM3Surface">?colorGray25</item>
<item name="colorM3OnSurface">?colorGray900</item>
<item name="colorM3SurfaceVariant">?colorNeutral100</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral700</item>
<item name="colorM3Outline">?colorNeutral500</item>
<item name="colorM3DisabledBackground">#1F1F1F1F</item>
<item name="colorM3PressedOverlay">@color/m3_sys_light_on_primary</item>
<item name="colorM3PressedOverlay">@color/white</item>
<item name="colorM3Error">#B3261E</item>
<item name="colorM3OnError">#FFF</item>
<item name="colorM3OnError">@color/white</item>
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
@@ -163,27 +163,27 @@
<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
<!-- M3 colors -->
<item name="colorM3Primary">@color/m3_sys_dark_primary</item>
<item name="colorM3OnPrimary">@color/m3_sys_dark_on_primary</item>
<item name="colorM3PrimaryContainer">@color/m3_sys_dark_primary_container</item>
<item name="colorM3OnPrimaryContainer">@color/m3_sys_dark_on_primary_container</item>
<item name="colorM3Secondary">@color/m3_sys_dark_secondary</item>
<item name="colorM3OnSecondary">@color/m3_sys_dark_on_secondary</item>
<item name="colorM3SecondaryContainer">@color/m3_sys_dark_secondary_container</item>
<item name="colorM3OnSecondaryContainer">@color/m3_sys_dark_on_secondary_container</item>
<item name="colorM3Tertiary">@color/m3_sys_dark_tertiary</item>
<item name="colorM3OnTertiary">@color/m3_sys_dark_on_tertiary</item>
<item name="colorM3TertiaryContainer">@color/m3_sys_dark_tertiary_container</item>
<item name="colorM3OnTertiaryContainer">@color/m3_sys_dark_on_tertiary_container</item>
<item name="colorM3Background">@color/m3_sys_dark_background</item>
<item name="colorM3OnBackground">@color/m3_sys_dark_on_background</item>
<item name="colorM3Surface">@color/m3_sys_dark_surface</item>
<item name="colorM3OnSurface">@color/m3_sys_dark_on_surface</item>
<item name="colorM3SurfaceVariant">@color/m3_sys_dark_surface_variant</item>
<item name="colorM3OnSurfaceVariant">@color/m3_sys_dark_on_surface_variant</item>
<item name="colorM3Outline">@color/m3_sys_dark_outline</item>
<item name="colorM3Primary">?colorPrimary200</item>
<item name="colorM3OnPrimary">?colorPrimary800</item>
<item name="colorM3PrimaryContainer">?colorPrimary700</item>
<item name="colorM3OnPrimaryContainer">?colorPrimary100</item>
<item name="colorM3Secondary">?colorSecondary200</item>
<item name="colorM3OnSecondary">?colorSecondary800</item>
<item name="colorM3SecondaryContainer">?colorSecondary700</item>
<item name="colorM3OnSecondaryContainer">?colorSecondary100</item>
<item name="colorM3Tertiary">?colorTertiary200</item>
<item name="colorM3OnTertiary">?colorTertiary800</item>
<item name="colorM3TertiaryContainer">?colorTertiary700</item>
<item name="colorM3OnTertiaryContainer">?colorTertiary100</item>
<item name="colorM3Background">?colorGray900</item>
<item name="colorM3OnBackground">?colorGray100</item>
<item name="colorM3Surface">?colorGray900</item>
<item name="colorM3OnSurface">?colorGray100</item>
<item name="colorM3SurfaceVariant">?colorNeutral700</item>
<item name="colorM3OnSurfaceVariant">?colorNeutral200</item>
<item name="colorM3Outline">?colorNeutral400</item>
<item name="colorM3DisabledBackground">#1FE3E3E3</item>
<item name="colorM3PressedOverlay">@color/m3_sys_dark_primary</item>
<item name="colorM3PressedOverlay">?colorPrimary200</item>
<item name="colorM3Error">#F2B8B5</item>
<item name="colorM3OnError">#601410</item>
<item name="colorM3ErrorContainer">#8C1D18</item>
@@ -231,7 +231,8 @@
<item name="colorComposeButton">?android:colorAccent</item>
<item name="colorComposeButtonBackground">?colorGray900</item>
<item name="colorM3Background">#000</item>
<item name="colorM3Background">@color/black</item>
<item name="colorM3Surface">@color/black</item>
<!-- <item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray900</item>-->
</style>