From 277361a56282bfc302ef141e44d2dceb92c41d9c Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sun, 18 Dec 2022 12:41:40 -0300
Subject: [PATCH] merge moshidon's red theme

closes sk22#160
---
 mastodon/src/main/res/values-night/styles.xml |  2 +-
 mastodon/src/main/res/values-v27/colors.xml   |  1 +
 mastodon/src/main/res/values/colors.xml       | 20 ++++
 mastodon/src/main/res/values/styles.xml       | 97 ++++++++++++++++---
 4 files changed, 103 insertions(+), 17 deletions(-)

diff --git a/mastodon/src/main/res/values-night/styles.xml b/mastodon/src/main/res/values-night/styles.xml
index da0f1d201..4065beb4d 100644
--- a/mastodon/src/main/res/values-night/styles.xml
+++ b/mastodon/src/main/res/values-night/styles.xml
@@ -19,7 +19,7 @@
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Yellow" parent="Theme.Mastodon.Dark.TrueBlack.Yellow"/>
 
 	<style name="Theme.Mastodon.AutoLightDark.Red" parent="Theme.Mastodon.Dark.Red"/>
-	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Red" parent="Theme.Mastodon.Dark.Red"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Red" parent="Theme.Mastodon.Dark.TrueBlack.Red"/>
 
 	<style name="Theme.Mastodon.AutoLightDark.Material3" parent="Theme.Mastodon.Dark.Material3"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Material3" parent="Theme.Mastodon.Dark.TrueBlack.Material3"/>
diff --git a/mastodon/src/main/res/values-v27/colors.xml b/mastodon/src/main/res/values-v27/colors.xml
index 29c7f3102..635f842ba 100644
--- a/mastodon/src/main/res/values-v27/colors.xml
+++ b/mastodon/src/main/res/values-v27/colors.xml
@@ -5,4 +5,5 @@
 	<color name="blue_navigation_bar_bg">@color/blue_gray_50</color>
 	<color name="brown_navigation_bar_bg">@color/brown_gray_50</color>
 	<color name="yellow_navigation_bar_bg">@color/yellow_gray_50</color>
+	<color name="red_navigation_bar_bg">@color/red_gray_50</color>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
index dd1a9aaf9..f3eb20df1 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -99,6 +99,18 @@
 	<color name="yellow_primary_800">#3c2f00</color>
 	<color name="yellow_primary_900">#231b00</color>
 
+	<color name="red_primary_25">#FFFBFA</color>
+	<color name="red_primary_50">#FEF3F2</color>
+	<color name="red_primary_100">#FEE4E2</color>
+	<color name="red_primary_200">#FECDCA</color>
+	<color name="red_primary_300">#FDA29B</color>
+	<color name="red_primary_400">#F97066</color>
+	<color name="red_primary_500">#F04438</color>
+	<color name="red_primary_600">#D92D20</color>
+	<color name="red_primary_700">#B42318</color>
+	<color name="red_primary_800">#912018</color>
+	<color name="red_primary_900">#7A271A</color>
+
 	<color name="green_gray_400">#a2b095</color>
 	<color name="green_gray_300">#bdcbaf</color>
 	<color name="green_gray_200">#d9e7ca</color>
@@ -131,6 +143,14 @@
 	<color name="yellow_gray_50">#fff0ca</color>
 	<color name="yellow_gray_25">#f7f8fa</color>
 
+	<color name="red_gray_400">#d69f84</color>
+	<color name="red_gray_300">#f4ba9e</color>
+	<color name="red_gray_200">#ffdbcb</color>
+	<color name="red_gray_100">#ffedea</color>
+	<color name="red_gray_50t">#ffede6ca</color>
+	<color name="red_gray_50">#ffede6</color>
+	<color name="red_gray_25">#f7f8fa</color>
+
 	<color name="error_25">#FFFBFA</color>
 	<color name="error_50">#FEF3F2</color>
 	<color name="error_100">#FEE4E2</color>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 665871293..e2921996b 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -946,31 +946,96 @@
 		<item name="android:textColorSecondary">@color/gray_800</item>
 	</style>
 
-
-	<style name="Theme.Mastodon.Dark.Red" parent="Theme.Mastodon.Dark">
-		<item name="android:colorAccent">@color/error_400</item>
-		<item name="colorPollMostVoted">@color/error_700</item>
-		<item name="colorAccentLight">@color/error_600</item>
-		<item name="colorAccentLightest">@color/error_800</item>
+	<style name="Theme.Mastodon.Light.Red" parent="Theme.Mastodon.Light.CustomBase">
+		<item name="android:colorAccent">@color/red_primary_700</item>
+		<item name="android:colorBackground">@color/red_gray_100</item>
+		<item name="colorButtonText">@color/red_gray_50</item>
+		<item name="colorBackgroundLight">@color/red_gray_50</item>
+		<item name="colorBackgroundLightest">@color/red_gray_25</item>
+		<item name="android:statusBarColor">@color/red_gray_50</item>
+		<item name="android:navigationBarColor">@color/red_navigation_bar_bg</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Red</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Red</item>
+		<item name="colorPollMostVoted">@color/red_primary_500</item>
+		<item name="colorPollVoted">@color/red_gray_300</item>
+		<item name="colorAccentLight">@color/red_primary_600</item>
+		<item name="colorSearchField">@color/red_gray_200</item>
+		<item name="colorTabInactive">@color/red_gray_400</item>
+		<item name="colorAccentLightest">@color/red_primary_100</item>
+		<item name="colorSecondary">@color/red_gray_50</item>
 	</style>
 
-	<style name="Theme.Mastodon.Dark.TrueBlack.Red" parent="Theme.Mastodon.Dark.TrueBlack">
-		<item name="android:colorAccent">@color/error_400</item>
-		<item name="colorPollMostVoted">@color/error_700</item>
-		<item name="colorAccentLight">@color/error_600</item>
-		<item name="colorAccentLightest">@color/error_800</item>
+	<style name="Theme.Mastodon.Dark.Red" parent="Theme.Mastodon.Dark.CustomBase">
+		<item name="android:colorAccent">@color/red_primary_400</item>
+		<item name="android:colorPrimary">@color/red_gray_50</item>
+		<item name="android:textColorPrimary">@color/red_gray_50</item>
+		<item name="android:textColorSecondary">@color/red_gray_400</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Red</item>
+		<item name="colorPollMostVoted">@color/red_primary_700</item>
+		<item name="colorAccentLight">@color/red_primary_600</item>
+		<item name="colorAccentLightest">@color/red_primary_800</item>
+		<item name="colorTabInactive">@color/red_gray_400</item>
+		<item name="colorSearchHint">@color/red_gray_300</item>
+		<item name="colorSecondary">@color/red_gray_50</item>
 	</style>
 
-	<style name="Theme.Mastodon.Light.Red" parent="Theme.Mastodon.Light">
-		<item name="android:colorAccent">@color/error_700</item>
-		<item name="colorPollMostVoted">@color/error_800</item>
-		<item name="colorAccentLight">@color/error_600</item>
-		<item name="colorAccentLightest">@color/error_800</item>
+	<style name="Theme.Mastodon.Dark.TrueBlack.Red" parent="Theme.Mastodon.Dark.Red">
+		<item name="android:colorAccent">@color/red_primary_400</item>
+		<item name="colorPollMostVoted">@color/red_primary_700</item>
+		<item name="colorAccentLight">@color/red_primary_600</item>
+		<item name="colorAccentLightest">@color/red_primary_800</item>
+		<item name="colorSecondary">@color/red_gray_50</item>
+
+		<item name="colorPollVoted">@color/gray_800</item>
+		<item name="colorSearchField">@color/gray_900</item>
+		<item name="colorBackgroundPopup">@color/gray_900</item>
+		<item name="android:navigationBarColor">@color/black</item>
+		<item name="android:colorBackground">@color/black</item>
+		<item name="android:statusBarColor">@color/black</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.TrueBlack</item>
+		<item name="colorBackgroundLight">@color/black</item>
+		<item name="colorWindowBackground">@color/black</item>
+		<item name="colorButtonText">@color/black</item>
+		<item name="colorBackgroundLightest">@color/black</item>
 	</style>
 
 	<style name="Theme.Mastodon.AutoLightDark.Red" parent="Theme.Mastodon.Light.Red"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Red" parent="Theme.Mastodon.Light.Red"/>
 
+	<style name="Theme.Mastodon.Dialog.Alert.Dark.Red" parent="android:Theme.Material.Dialog.Alert">
+		<item name="android:windowTitleStyle">@style/alert_title</item>
+		<item name="android:dialogPreferredPadding">24dp</item>
+		<item name="android:windowBackground">@drawable/bg_alert</item>
+		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
+
+		<!-- colors -->
+		<item name="android:colorAccent">@color/red_primary_600</item>
+		<item name="android:colorPrimary">@color/red_gray_50</item>
+		<item name="android:colorBackground">@color/gray_700</item>
+		<item name="android:textColorPrimary">@color/red_gray_50</item>
+		<item name="android:textColorSecondary">@color/red_gray_400</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dialog.Alert.Red" parent="android:Theme.Material.Light.Dialog.Alert">
+		<item name="android:windowTitleStyle">@style/alert_title</item>
+		<item name="android:dialogPreferredPadding">24dp</item>
+		<item name="android:windowBackground">@drawable/bg_alert</item>
+		<item name="android:buttonBarButtonStyle">@style/Widget.Mastodon.ButtonBarButton</item>
+
+		<!-- colors -->
+		<item name="android:colorAccent">@color/red_primary_700</item>
+		<item name="android:colorPrimary">@color/gray_800</item>
+		<item name="android:colorBackground">@color/red_gray_100</item>
+		<item name="android:textColorPrimary">@color/gray_800</item>
+		<item name="android:textColorSecondary">@color/gray_500</item>
+	</style>
+
+	<style name="Theme.Mastodon.Toolbar.Red" parent="android:ThemeOverlay.Material.ActionBar">
+		<item name="android:colorPrimary">@color/red_gray_50</item>
+		<item name="android:textColorPrimary">@color/gray_800</item>
+		<item name="android:textColorSecondary">@color/gray_800</item>
+	</style>
+
 
 	<style name="Theme.Mastodon.Dark.Original" parent="Theme.Mastodon.Dark">
 		<item name="android:colorAccent">@color/original_primary_400</item>