From bad44b145c968971517616a7a1b3f23ee9daedb4 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Sat, 3 Dec 2022 16:25:28 -0300
Subject: [PATCH] Adding blue theme and refactoring styles.xml

---
 .../android/GlobalUserPreferences.java        |   3 +-
 .../android/fragments/SettingsFragment.java   |   5 +
 .../android/ui/utils/UiUtils.java             |  11 +-
 mastodon/src/main/res/menu/color_picker.xml   |   1 +
 mastodon/src/main/res/values-night/styles.xml |   3 +
 mastodon/src/main/res/values-v27/colors.xml   |   1 +
 mastodon/src/main/res/values/colors.xml       |  35 ++-
 mastodon/src/main/res/values/strings.xml      |   1 +
 mastodon/src/main/res/values/styles.xml       | 273 ++++++++++--------
 9 files changed, 205 insertions(+), 128 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 2d9a2f9ee..6879e0be4 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -54,7 +54,8 @@ public class GlobalUserPreferences{
 	public enum ColorPreference{
 		PINK,
 		PURPLE,
-		GREEN
+		GREEN,
+		BLUE
 	}
 
 	public enum ThemePreference{
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
index f2fb9522b..301a9319d 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -679,6 +679,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
 					pref = GlobalUserPreferences.ColorPreference.GREEN;
 					onColorPreferenceClick(pref);
 				}
+				else if(id==R.id.blue_color) {
+					pref = GlobalUserPreferences.ColorPreference.BLUE;
+					onColorPreferenceClick(pref);
+				}
 				else
 					return false;
 				return true;
@@ -694,6 +698,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
 				case PINK -> R.string.pink_color;
 				case PURPLE -> R.string.purple_color;
 				case GREEN -> R.string.green_color;
+				case BLUE -> R.string.blue_color;
 			});
 		}
 	}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
index 8a56efc7c..2ff74b184 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
@@ -688,7 +688,16 @@ public class UiUtils{
 							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Green : R.style.Theme_Mastodon_Dark_Green;
 				});
 				break;
-
+			case BLUE:
+				context.setTheme(switch(GlobalUserPreferences.theme){
+					case AUTO ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Blue : R.style.Theme_Mastodon_AutoLightDark_Blue;
+					case LIGHT ->
+							R.style.Theme_Mastodon_Light_Blue;
+					case DARK ->
+							GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue;
+				});
+				break;
 		}
 
 	}
diff --git a/mastodon/src/main/res/menu/color_picker.xml b/mastodon/src/main/res/menu/color_picker.xml
index f0b918ad8..74dbb335b 100644
--- a/mastodon/src/main/res/menu/color_picker.xml
+++ b/mastodon/src/main/res/menu/color_picker.xml
@@ -3,4 +3,5 @@
     <item android:id="@+id/pink_color" android:title="@string/pink_color"/>
     <item android:id="@+id/purple_color" android:title="@string/purple_color"/>
     <item android:id="@+id/green_color" android:title="@string/green_color"/>
+    <item android:id="@+id/blue_color" android:title="@string/blue_color"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-night/styles.xml b/mastodon/src/main/res/values-night/styles.xml
index 9487294d7..a83ac0e0c 100644
--- a/mastodon/src/main/res/values-night/styles.xml
+++ b/mastodon/src/main/res/values-night/styles.xml
@@ -9,4 +9,7 @@
 	<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Dark.Green"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Green" parent="Theme.Mastodon.Dark.TrueBlack.Green"/>
 
+	<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Dark.Blue"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.TrueBlack.Blue"/>
+
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values-v27/colors.xml b/mastodon/src/main/res/values-v27/colors.xml
index 52eac2311..520ccb946 100644
--- a/mastodon/src/main/res/values-v27/colors.xml
+++ b/mastodon/src/main/res/values-v27/colors.xml
@@ -2,4 +2,5 @@
 <resources>
 	<color name="navigation_bar_bg">@color/gray_50</color>
 	<color name="green_navigation_bar_bg">@color/green_gray_50</color>
+	<color name="blue_navigation_bar_bg">@color/blue_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 1fd169783..d00b4acfb 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -55,12 +55,25 @@
 	<color name="green_primary_800">#163800</color>
 	<color name="green_primary_900">#0a2100</color>
 
-	<color name="green_gray_900">#000000</color>
-	<color name="green_gray_800t">#171717</color>
-	<color name="green_gray_800">#171717</color>
-	<color name="green_gray_700">#191919</color>
-	<color name="green_gray_600">#212121</color>
-	<color name="green_gray_500">#242424</color>
+	<color name="blue_primary_25">#fafaff</color>
+	<color name="blue_primary_50">#e8f2ff</color>
+	<color name="blue_primary_100">#cee5ff</color>
+	<color name="blue_primary_200">#97cbff</color>
+	<color name="blue_primary_300">#65b1f4</color>
+	<color name="blue_primary_400">#4796d7</color>
+	<color name="blue_primary_500">#227bba</color>
+	<color name="blue_primary_600">#00639b</color>
+	<color name="blue_primary_700">#004a76</color>
+	<color name="blue_primary_800">#003354</color>
+	<color name="blue_primary_900">#001d33</color>
+
+	<color name="custom_gray_900">#000000</color>
+	<color name="custom_gray_800t">#171717</color>
+	<color name="custom_gray_800">#171717</color>
+	<color name="custom_gray_700">#191919</color>
+	<color name="custom_gray_600">#212121</color>
+	<color name="custom_gray_500">#242424</color>
+
 	<color name="green_gray_400">#8f918e</color>
 	<color name="green_gray_300">#a9aca8</color>
 	<color name="green_gray_200">#c5c7c3</color>
@@ -69,6 +82,14 @@
 	<color name="green_gray_50">#eff1ed</color>
 	<color name="green_gray_25">#f7f8fa</color>
 
+	<color name="blue_gray_400">#cee5ff</color>
+	<color name="blue_gray_300">#e8f2ff</color>
+	<color name="blue_gray_200">#e8f2ff</color>
+	<color name="blue_gray_100">#e8f2ff</color>
+	<color name="blue_gray_50t">#e8f2ff</color>
+	<color name="blue_gray_50">#e8f2ff</color>
+	<color name="blue_gray_25">#f7f8fa</color>
+
 	<color name="error_25">#FFFBFA</color>
 	<color name="error_50">#FEF3F2</color>
 	<color name="error_100">#FEE4E2</color>
@@ -125,8 +146,6 @@
 	<color name="purple_800">#4A1FB8</color>
 	<color name="purple_900">#3E1C96</color>
 
-
-
 	<color name="fab_icon">#282C37</color>
 	<color name="navigation_bar_bg">#282C37</color>
 	<color name="highlight_over_dark">#30FFFFFF</color>
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 06fe5b436..85d9882d3 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -432,4 +432,5 @@
 	<string name="pink_color">Pink</string>
 	<string name="purple_color">Purple</string>
 	<string name="green_color">Green</string>
+	<string name="blue_color">Blue</string>
 </resources>
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 92b9fdb6f..9c7cf79f0 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -114,96 +114,47 @@
 	<style name="Theme.Mastodon.AutoLightDark" parent="Theme.Mastodon.Light"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack" parent="Theme.Mastodon.Light"/>
 
-	<style name="Theme.Mastodon.Dark.Green" parent="Theme.AppKit">
+	<style name="Theme.Mastodon.Light.CustomBase" parent="Theme.Mastodon.Light">
 		<!-- needed to disable scrim on API 29+ -->
-		<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
-		<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
-		<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
-		<item name="android:splitMotionEvents">false</item>
-		<item name="android:windowBackground">?colorWindowBackground</item>
-		<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
+		<item name="android:colorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorSecondary">@color/custom_gray_500</item>
+		<item name="colorDarkIcon">@color/custom_gray_900</item>
+		<item name="colorSearchHint">@color/custom_gray_600</item>
+		<item name="profileHeaderBackground">@color/custom_gray_500</item>
+	</style>
 
-		<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_LightOnDark</item>
-		<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_LightOnDark</item>
-		<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_LightOnDark</item>
-		<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_LightOnDark</item>
-		<item name="android:colorAccent">@color/green_primary_400</item>
-		<item name="android:colorPrimary">@color/green_gray_50</item>
-		<item name="android:colorBackground">@color/green_gray_700</item>
-		<item name="android:textColorPrimary">@color/green_gray_50</item>
-		<item name="android:textColorSecondary">@color/green_gray_400</item>
-		<item name="colorButtonText">@color/green_gray_800</item>
-		<item name="colorSecondary">#E9EDF2</item>
-		<item name="colorBackgroundLight">@color/green_gray_700</item>
-		<item name="colorBackgroundLightest">@color/green_gray_900</item>
+	<style name="Theme.Mastodon.Dark.CustomBase" parent="Theme.Mastodon.Dark">
+		<!-- needed to disable scrim on API 29+ -->
+		<item name="android:colorBackground">@color/custom_gray_700</item>
+		<item name="colorButtonText">@color/custom_gray_800</item>
+		<item name="colorBackgroundLight">@color/custom_gray_700</item>
+		<item name="colorBackgroundLightest">@color/custom_gray_900</item>
 		<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
 		<item name="colorDarkIcon">@color/gray_25</item>
-		<item name="colorWindowBackground">@color/green_gray_800</item>
-		<item name="android:statusBarColor">@color/green_gray_800</item>
-		<item name="android:navigationBarColor">@color/green_gray_800</item>
-		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.Green</item>
-		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Green</item>
-		<item name="colorPollMostVoted">@color/green_primary_700</item>
-		<item name="colorPollVoted">@color/green_gray_600</item>
-		<item name="colorAccentLight">@color/green_primary_600</item>
-		<item name="colorAccentLightest">@color/green_primary_800</item>
-		<item name="colorTabInactive">@color/green_gray_400</item>
+		<item name="colorWindowBackground">@color/custom_gray_800</item>
+		<item name="android:statusBarColor">@color/custom_gray_800</item>
+		<item name="android:navigationBarColor">@color/custom_gray_800</item>
+		<item name="colorPollVoted">@color/custom_gray_600</item>
 		<item name="profileHeaderBackground">?colorWindowBackground</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Dark.CustomBase</item>
 
 		<!-- TODO dark colors -->
-		<item name="colorSearchField">@color/green_gray_700</item>
-		<item name="colorSearchHint">@color/green_gray_300</item>
-
-		<item name="buttonBackground">@drawable/bg_button_primary_light_on_dark</item>
-		<item name="android:editTextBackground">@drawable/bg_edittext_dark</item>
-
-		<item name="android:windowLightStatusBar">false</item>
-		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">false</item>
-		<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
-		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
+		<item name="colorSearchField">@color/custom_gray_700</item>
 	</style>
 
-	<style name="Theme.Mastodon.Dark.TrueBlack.Green" parent="Theme.Mastodon.Dark.TrueBlack">
-		<item name="android:colorAccent">@color/green_primary_400</item>
-		<item name="colorPollMostVoted">@color/green_primary_700</item>
-		<item name="colorAccentLight">@color/green_primary_600</item>
-		<item name="colorAccentLightest">@color/green_primary_800</item>
-		<item name="colorPollVoted">@color/green_gray_800</item>
-		<item name="colorSearchField">@color/green_gray_900</item>
-		<item name="colorBackgroundPopup">@color/green_gray_900</item>
+	<style name="Theme.Mastodon.Dark.TrueBlack.CustomBase" parent="Theme.Mastodon.Dark.TrueBlack">
+		<item name="colorPollVoted">@color/custom_gray_800</item>
+		<item name="colorSearchField">@color/custom_gray_900</item>
+		<item name="colorBackgroundPopup">@color/custom_gray_900</item>
 	</style>
 
-<!--	<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light">-->
-<!--		<item name="android:colorAccent">@color/green_primary_400</item>-->
-<!--		<item name="colorPollMostVoted">@color/green_primary_700</item>-->
-<!--		<item name="colorAccentLight">@color/green_primary_600</item>-->
-<!--		<item name="colorAccentLightest">@color/green_primary_800</item>-->
-<!--	</style>-->
-	<style name="Theme.Mastodon.Light.Green" parent="Theme.AppKit.Light">
-		<!-- needed to disable scrim on API 29+ -->
-		<item name="android:enforceNavigationBarContrast" tools:ignore="NewApi">false</item>
-		<item name="android:enforceStatusBarContrast" tools:ignore="NewApi">false</item>
-		<item name="appkitBackDrawable">@drawable/ic_fluent_arrow_left_24_regular</item>
-		<item name="android:splitMotionEvents">false</item>
-		<item name="android:windowBackground">?colorWindowBackground</item>
-		<item name="android:editTextStyle">@style/Widget.Mastodon.EditText</item>
-
-		<item name="android:buttonStyle">@style/Widget.Mastodon.Button.Primary_DarkOnLight</item>
-		<item name="secondaryButtonStyle">@style/Widget.Mastodon.Button.Secondary_DarkOnLight</item>
-		<item name="primaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Primary_DarkOnLight</item>
-		<item name="secondaryLargeButtonStyle">@style/Widget.Mastodon.Button.Large.Secondary_DarkOnLight</item>
+	<style name="Theme.Mastodon.Light.Green" parent="Theme.Mastodon.Light.CustomBase">
 		<item name="android:colorAccent">@color/green_primary_700</item>
-		<item name="android:colorPrimary">@color/green_gray_800</item>
 		<item name="android:colorBackground">@color/green_gray_100</item>
-		<item name="android:textColorPrimary">@color/green_gray_800</item>
-		<item name="android:textColorSecondary">@color/green_gray_500</item>
 		<item name="colorButtonText">@color/green_gray_50</item>
-		<item name="colorSecondary">#E9EDF2</item>
 		<item name="colorBackgroundLight">@color/green_gray_50</item>
 		<item name="colorBackgroundLightest">@color/green_gray_25</item>
-		<item name="colorBackgroundPopup">?colorBackgroundLightest</item>
-		<item name="colorDarkIcon">@color/green_gray_900</item>
-		<item name="colorWindowBackground">@color/white</item>
 		<item name="android:statusBarColor">@color/green_gray_50</item>
 		<item name="android:navigationBarColor">@color/green_navigation_bar_bg</item>
 		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Green</item>
@@ -212,23 +163,143 @@
 		<item name="colorPollVoted">@color/green_gray_300</item>
 		<item name="colorAccentLight">@color/green_primary_600</item>
 		<item name="colorSearchField">@color/green_gray_200</item>
-		<item name="colorSearchHint">@color/green_gray_600</item>
 		<item name="colorTabInactive">@color/green_gray_400</item>
 		<item name="colorAccentLightest">@color/green_primary_100</item>
-		<item name="profileHeaderBackground">@color/green_gray_500</item>
+	</style>
 
-		<item name="buttonBackground">@drawable/bg_button_primary_dark_on_light</item>
-		<item name="android:editTextBackground">@drawable/bg_edittext_light</item>
+	<style name="Theme.Mastodon.Dark.Green" parent="Theme.Mastodon.Dark.CustomBase">
+		<item name="android:colorAccent">@color/green_primary_400</item>
+		<item name="android:colorPrimary">@color/green_gray_50</item>
+		<item name="android:textColorPrimary">@color/green_gray_50</item>
+		<item name="android:textColorSecondary">@color/green_gray_400</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Green</item>
+		<item name="colorPollMostVoted">@color/green_primary_700</item>
+		<item name="colorAccentLight">@color/green_primary_600</item>
+		<item name="colorAccentLightest">@color/green_primary_800</item>
+		<item name="colorTabInactive">@color/green_gray_400</item>
+		<item name="colorSearchHint">@color/green_gray_300</item>
+	</style>
 
-		<item name="android:windowLightStatusBar">true</item>
-		<item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
-		<item name="android:popupMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
-		<item name="android:actionOverflowMenuStyle">@style/Widget.Mastodon.PopupMenu</item>
+	<style name="Theme.Mastodon.Dark.TrueBlack.Green" parent="Theme.Mastodon.Dark.TrueBlack.CustomBase">
+		<item name="android:colorAccent">@color/green_primary_400</item>
+		<item name="colorPollMostVoted">@color/green_primary_700</item>
+		<item name="colorAccentLight">@color/green_primary_600</item>
+		<item name="colorAccentLightest">@color/green_primary_800</item>
 	</style>
 
 	<style name="Theme.Mastodon.AutoLightDark.Green" parent="Theme.Mastodon.Light.Green"/>
 	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Green" parent="Theme.Mastodon.Light.Green"/>
 
+	<style name="Theme.Mastodon.Dialog.Alert.Dark.Green" 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/green_primary_600</item>
+		<item name="android:colorPrimary">@color/green_gray_50</item>
+		<item name="android:colorBackground">@color/custom_gray_700</item>
+		<item name="android:textColorPrimary">@color/green_gray_50</item>
+		<item name="android:textColorSecondary">@color/green_gray_400</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dialog.Alert.Green" 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/green_primary_700</item>
+		<item name="android:colorPrimary">@color/custom_gray_800</item>
+		<item name="android:colorBackground">@color/green_gray_100</item>
+		<item name="android:textColorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorSecondary">@color/custom_gray_500</item>
+	</style>
+
+	<style name="Theme.Mastodon.Toolbar.Green" parent="android:ThemeOverlay.Material.ActionBar">
+		<item name="android:colorPrimary">@color/green_gray_50</item>
+		<item name="android:textColorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorSecondary">@color/custom_gray_800</item>
+	</style>
+
+
+	<style name="Theme.Mastodon.Light.Blue" parent="Theme.Mastodon.Light.CustomBase">
+		<item name="android:colorAccent">@color/blue_primary_700</item>
+		<item name="android:colorBackground">@color/blue_gray_100</item>
+		<item name="colorButtonText">@color/blue_gray_50</item>
+		<item name="colorBackgroundLight">@color/blue_gray_50</item>
+		<item name="colorBackgroundLightest">@color/blue_gray_25</item>
+		<item name="android:statusBarColor">@color/blue_gray_50</item>
+		<item name="android:navigationBarColor">@color/blue_navigation_bar_bg</item>
+		<item name="android:actionBarTheme">@style/Theme.Mastodon.Toolbar.Blue</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Blue</item>
+		<item name="colorPollMostVoted">@color/blue_primary_500</item>
+		<item name="colorPollVoted">@color/blue_gray_300</item>
+		<item name="colorAccentLight">@color/blue_primary_600</item>
+		<item name="colorSearchField">@color/blue_gray_200</item>
+		<item name="colorTabInactive">@color/blue_gray_400</item>
+		<item name="colorAccentLightest">@color/blue_primary_100</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dark.Blue" parent="Theme.Mastodon.Dark.CustomBase">
+		<item name="android:colorAccent">@color/blue_primary_400</item>
+		<item name="android:colorPrimary">@color/blue_gray_50</item>
+		<item name="android:textColorPrimary">@color/blue_gray_50</item>
+		<item name="android:textColorSecondary">@color/blue_gray_400</item>
+		<item name="android:alertDialogTheme">@style/Theme.Mastodon.Dialog.Alert.Dark.Blue</item>
+		<item name="colorPollMostVoted">@color/blue_primary_700</item>
+		<item name="colorAccentLight">@color/blue_primary_600</item>
+		<item name="colorAccentLightest">@color/blue_primary_800</item>
+		<item name="colorTabInactive">@color/blue_gray_400</item>
+		<item name="colorSearchHint">@color/blue_gray_300</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dark.TrueBlack.Blue" parent="Theme.Mastodon.Dark.TrueBlack.CustomBase">
+		<item name="android:colorAccent">@color/blue_primary_400</item>
+		<item name="colorPollMostVoted">@color/blue_primary_700</item>
+		<item name="colorAccentLight">@color/blue_primary_600</item>
+		<item name="colorAccentLightest">@color/blue_primary_800</item>
+	</style>
+
+	<style name="Theme.Mastodon.AutoLightDark.Blue" parent="Theme.Mastodon.Light.Blue"/>
+	<style name="Theme.Mastodon.AutoLightDark.TrueBlack.Blue" parent="Theme.Mastodon.Light.Blue"/>
+
+	<style name="Theme.Mastodon.Dialog.Alert.Dark.Blue" 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/blue_primary_600</item>
+		<item name="android:colorPrimary">@color/blue_gray_50</item>
+		<item name="android:colorBackground">@color/custom_gray_700</item>
+		<item name="android:textColorPrimary">@color/blue_gray_50</item>
+		<item name="android:textColorSecondary">@color/blue_gray_400</item>
+	</style>
+
+	<style name="Theme.Mastodon.Dialog.Alert.Blue" 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/blue_primary_700</item>
+		<item name="android:colorPrimary">@color/custom_gray_800</item>
+		<item name="android:colorBackground">@color/blue_gray_100</item>
+		<item name="android:textColorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorSecondary">@color/custom_gray_500</item>
+	</style>
+
+	<style name="Theme.Mastodon.Toolbar.Blue" parent="android:ThemeOverlay.Material.ActionBar">
+		<item name="android:colorPrimary">@color/blue_gray_50</item>
+		<item name="android:textColorPrimary">@color/custom_gray_800</item>
+		<item name="android:textColorSecondary">@color/custom_gray_800</item>
+	</style>
+
 
 	<style name="Theme.Mastodon.Dark.Original" parent="Theme.Mastodon.Dark">
 		<item name="android:colorAccent">@color/original_primary_400</item>
@@ -267,14 +338,8 @@
 		<item name="android:textColorSecondary">@color/gray_50</item>
 	</style>
 
-	<style name="Theme.Mastodon.Toolbar.Green" parent="android:ThemeOverlay.Material.ActionBar">
-		<item name="android:colorPrimary">@color/green_gray_50</item>
-		<item name="android:textColorPrimary">@color/green_gray_800</item>
-		<item name="android:textColorSecondary">@color/green_gray_800</item>
-	</style>
-
-	<style name="Theme.Mastodon.Toolbar.Dark.Green" parent="android:ThemeOverlay.Material.Dark.ActionBar">
-		<item name="android:colorPrimary">@color/green_gray_800</item>
+	<style name="Theme.Mastodon.Toolbar.Dark.CustomBase" parent="android:ThemeOverlay.Material.Dark.ActionBar">
+		<item name="android:colorPrimary">@color/custom_gray_800</item>
 		<item name="android:textColorPrimary">@color/gray_50</item>
 		<item name="android:textColorSecondary">@color/gray_50</item>
 	</style>
@@ -384,34 +449,6 @@
 		<item name="android:textColorSecondary">@color/gray_400</item>
 	</style>
 
-	<style name="Theme.Mastodon.Dialog.Alert.Dark.Green" 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/green_primary_600</item>
-		<item name="android:colorPrimary">@color/green_gray_50</item>
-		<item name="android:colorBackground">@color/green_gray_700</item>
-		<item name="android:textColorPrimary">@color/green_gray_50</item>
-		<item name="android:textColorSecondary">@color/green_gray_400</item>
-	</style>
-
-	<style name="Theme.Mastodon.Dialog.Alert.Green" 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/green_primary_700</item>
-		<item name="android:colorPrimary">@color/green_gray_800</item>
-		<item name="android:colorBackground">@color/green_gray_100</item>
-		<item name="android:textColorPrimary">@color/green_gray_800</item>
-		<item name="android:textColorSecondary">@color/green_gray_500</item>
-	</style>
-
 	<style name="Widget.Mastodon.ButtonBarButton" parent="android:Widget.Material.Button.Borderless">
 		<item name="android:textAllCaps">false</item>
 		<item name="android:layout_marginEnd">8dp</item>