Merge branch 'material3_dynamic_color_theme'

LucasGGamerM · Dec 10, 2022 · 90bef7f · 90bef7f
2 parents 028b88a + c1b382e
commit 90bef7f
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
@@ -204,7 +204,7 @@
 		<item name="colorBackgroundLightest">@color/black</item>
 	</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+ -->
 		<item name="android:colorPrimary">@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>
 	</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+ -->
 		<item name="android:colorBackground">@color/m3_gray_700</item>
 		<item name="colorButtonText">@color/m3_gray_800</item>
 		<item name="colorBackgroundLight">@color/m3_gray_700</item>
 		<item name="colorBackgroundLightest">@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="android:statusBarColor">@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>
 	</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="colorPollMostVoted">@color/m3_primary_700</item>
 		<item name="colorAccentLight">@color/m3_primary_600</item>
@@ -294,7 +294,7 @@
 		<!-- colors -->
 		<item name="android:colorAccent">@color/m3_primary_600</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:textColorSecondary">@color/m3_gray_400</item>
 	</style>
@@ -307,16 +307,16 @@
 
 		<!-- colors -->
 		<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:textColorPrimary">@color/custom_gray_800</item>
-		<item name="android:textColorSecondary">@color/custom_gray_500</item>
+		<item name="android:textColorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorSecondary">@color/m3_gray_500</item>
 	</style>
 
 	<style name="Theme.Mastodon.Toolbar.M3" parent="android:ThemeOverlay.Material.ActionBar">
 		<item name="android:colorPrimary">@color/m3_gray_50</item>
-		<item name="android:textColorPrimary">@color/custom_gray_800</item>
-		<item name="android:textColorSecondary">@color/custom_gray_800</item>
+		<item name="android:textColorPrimary">@color/m3_gray_800</item>
+		<item name="android:textColorSecondary">@color/m3_gray_800</item>
 	</style>