From 3ce58d2edfb4cd4421b541cf431a6239f93da19b Mon Sep 17 00:00:00 2001
From: sk <sk22@mailbox.org>
Date: Tue, 20 Dec 2022 16:06:28 +0100
Subject: [PATCH] move button text/background to styles

---
 mastodon/src/main/res/values/palettes.xml | 21 -------------
 mastodon/src/main/res/values/styles.xml   | 36 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index 6bc8eb36c..f55ce503c 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -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">
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 79c2754c3..c304a0bcc 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -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">