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 @@
+
\ 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 @@
+
+
+
\ 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 @@
@color/gray_50
@color/green_gray_50
+ @color/blue_gray_50
\ 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 @@
#163800
#0a2100
- #000000
- #171717
- #171717
- #191919
- #212121
- #242424
+ #fafaff
+ #e8f2ff
+ #cee5ff
+ #97cbff
+ #65b1f4
+ #4796d7
+ #227bba
+ #00639b
+ #004a76
+ #003354
+ #001d33
+
+ #000000
+ #171717
+ #171717
+ #191919
+ #212121
+ #242424
+
#8f918e
#a9aca8
#c5c7c3
@@ -69,6 +82,14 @@
#eff1ed
#f7f8fa
+ #cee5ff
+ #e8f2ff
+ #e8f2ff
+ #e8f2ff
+ #e8f2ff
+ #e8f2ff
+ #f7f8fa
+
#FFFBFA
#FEF3F2
#FEE4E2
@@ -125,8 +146,6 @@
#4A1FB8
#3E1C96
-
-
#282C37
#282C37
#30FFFFFF
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 @@
Pink
Purple
Green
+ Blue
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/Widget.Mastodon.Button.Primary_LightOnDark
- - @style/Widget.Mastodon.Button.Secondary_LightOnDark
- - @style/Widget.Mastodon.Button.Large.Primary_LightOnDark
- - @style/Widget.Mastodon.Button.Large.Secondary_LightOnDark
- - @color/green_primary_400
- - @color/green_gray_50
- - @color/green_gray_700
- - @color/green_gray_50
- - @color/green_gray_400
- - @color/green_gray_800
- - #E9EDF2
- - @color/green_gray_700
- - @color/green_gray_900
+
-
-
-
-
-
-
-
-
- - @drawable/bg_button_primary_dark_on_light
- - @drawable/bg_edittext_light
+
- - true
- - true
- - @style/Widget.Mastodon.PopupMenu
- - @style/Widget.Mastodon.PopupMenu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -384,34 +449,6 @@
- @color/gray_400
-
-
-
-