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

move button text/background to styles

This commit is contained in:
sk 2022-12-20 16:06:28 +01:00
parent 523efac4fb
commit 3ce58d2edf
2 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mastodon/src/main/res/values/palettes.xml
View File

@ -26,27 +26,6 @@
<item name="colorGray50t">@color/gray_50t</item>
<item name="colorGray50">@color/gray_50</item>
<item name="colorGray25">@color/gray_25</item>
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</item>
</style>
<style name="ColorPalette.Material3">

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

@ -73,6 +73,24 @@
<item name="colorM3OnError">#FFF</item>
<item name="colorM3ErrorContainer">#F9DEDC</item>
<item name="colorM3OnErrorContainer">#410E0B</item>
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</item>
</style>
@ -149,6 +167,24 @@
<item name="colorM3OnError">#601410</item>
<item name="colorM3ErrorContainer">#8C1D18</item>
<item name="colorM3OnErrorContainer">#F9DEDC</item>
<!-- colors for button_bg|text_primary|secondary_dark|light_on_light|dark.xml -->
<item name="colorButtonBackgroundPrimaryDarkOnLight">?colorGray800</item>
<item name="colorButtonBackgroundPrimaryDarkOnLightDisabled">?colorGray300</item>
<item name="colorButtonTextPrimaryDarkOnLight">?colorGray50</item>
<item name="colorButtonTextPrimaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundPrimaryLightOnDark">?colorGray100</item>
<item name="colorButtonBackgroundPrimaryLightOnDarkDisabled">?colorGray500</item>
<item name="colorButtonTextPrimaryLightOnDark">?colorGray800</item>
<item name="colorButtonTextPrimaryLightOnDarkDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryDarkOnLight">?colorGray25</item>
<item name="colorButtonBackgroundSecondaryDarkOnLightDisabled">?colorGray100</item>
<item name="colorButtonTextSecondaryDarkOnLight">?colorGray800</item>
<item name="colorButtonTextSecondaryDarkOnLightDisabled">?colorGray400</item>
<item name="colorButtonBackgroundSecondaryLightOnDark">?colorGray600</item>
<item name="colorButtonBackgroundSecondaryLightOnDarkDisabled">?colorGray300</item>
<item name="colorButtonTextSecondaryLightOnDark">?colorGray50</item>
<item name="colorButtonTextSecondaryLightOnDarkDisabled">?colorGray400</item>
</style>
<style name="Theme.Mastodon.Dark.TrueBlack">