From 4aac6aa4f41f9349e225402b72fd3982a9c569cd Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Tue, 13 Dec 2022 15:34:34 -0300
Subject: [PATCH] Fixing the material you theme.

---
 mastodon/src/main/res/values-v31/colors.xml |  1 +
 mastodon/src/main/res/values/styles.xml     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/res/values-v31/colors.xml b/mastodon/src/main/res/values-v31/colors.xml
index 8937b4048..662f77798 100644
--- a/mastodon/src/main/res/values-v31/colors.xml
+++ b/mastodon/src/main/res/values-v31/colors.xml
@@ -4,6 +4,7 @@
 
 	<color name="m3_navigation_bar_bg">@android:color/system_neutral1_50</color>
 
+	<color name="m3_gray_1000">@android:color/system_neutral1_1000</color>
 	<color name="m3_gray_900">@android:color/system_neutral1_900</color>
 	<color name="m3_gray_800t">@android:color/system_neutral1_800</color>
 	<color name="m3_gray_800">@android:color/system_neutral1_800</color>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 673deff80..a3e1e7efb 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -233,18 +233,18 @@
 
 	<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="android:colorBackground">@color/m3_gray_800</item>
+		<item name="colorButtonText">@color/m3_gray_900</item>
+		<item name="colorBackgroundLight">@color/m3_gray_800</item>
 		<item name="colorBackgroundLightest">@color/m3_gray_900</item>
 		<item name="colorBackgroundPopup">@color/m3_gray_900</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>
-		<item name="colorPollVoted">@color/m3_gray_600</item>
+		<item name="colorWindowBackground">@color/m3_gray_900</item>
+		<item name="android:statusBarColor">@color/m3_gray_900</item>
+		<item name="android:navigationBarColor">@color/m3_gray_900</item>
+		<item name="colorPollVoted">@color/m3_gray_700</item>
 		<item name="profileHeaderBackground">?colorWindowBackground</item>
-		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.CustomBase</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.Material3</item>
 
 		<item name="android:colorAccent">@color/m3_primary_400</item>
 		<item name="android:colorPrimary">@color/m3_gray_50</item>
@@ -727,7 +727,7 @@
 	</style>
 
 	<style name="Theme.Mastodon.Toolbar.Dark.Material3" parent="android:ThemeOverlay.Material.Dark.ActionBar">
-		<item name="android:colorPrimary">@color/m3_gray_800</item>
+		<item name="android:colorPrimary">@color/m3_gray_900</item>
 		<item name="android:textColorPrimary">@color/m3_gray_50</item>
 		<item name="android:textColorSecondary">@color/m3_gray_50</item>
 	</style>