diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
index 6c1755247..de49e0ff6 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
@@ -56,7 +56,8 @@ public class GlobalUserPreferences{
PURPLE,
GREEN,
BLUE,
- ORANGE
+ ORANGE,
+ YELLOW
}
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 ec41ed727..f5027db6f 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
@@ -689,6 +689,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
pref = GlobalUserPreferences.ColorPreference.ORANGE;
onColorPreferenceClick(pref);
}
+ else if(id==R.id.yellow_color) {
+ pref = GlobalUserPreferences.ColorPreference.YELLOW;
+ onColorPreferenceClick(pref);
+ }
else
return false;
return true;
@@ -707,6 +711,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case GREEN -> R.string.green_color;
case BLUE -> R.string.blue_color;
case ORANGE -> R.string.orange_color;
+ case YELLOW -> R.string.yellow_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 76f3d5a38..50dafefb7 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
@@ -708,6 +708,16 @@ public class UiUtils{
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Orange : R.style.Theme_Mastodon_Dark_Orange;
});
break;
+ case YELLOW:
+ context.setTheme(switch(GlobalUserPreferences.theme){
+ case AUTO ->
+ GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Yellow : R.style.Theme_Mastodon_AutoLightDark_Yellow;
+ case LIGHT ->
+ R.style.Theme_Mastodon_Light_Yellow;
+ case DARK ->
+ GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Yellow : R.style.Theme_Mastodon_Dark_Yellow;
+ });
+ break;
}
}
diff --git a/mastodon/src/main/res/menu/color_picker.xml b/mastodon/src/main/res/menu/color_picker.xml
index b2cbddc06..665d6decf 100644
--- a/mastodon/src/main/res/menu/color_picker.xml
+++ b/mastodon/src/main/res/menu/color_picker.xml
@@ -5,4 +5,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 6ad64ef72..8a1ec55aa 100644
--- a/mastodon/src/main/res/values-night/styles.xml
+++ b/mastodon/src/main/res/values-night/styles.xml
@@ -14,4 +14,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 5af045554..412172ecb 100644
--- a/mastodon/src/main/res/values-v27/colors.xml
+++ b/mastodon/src/main/res/values-v27/colors.xml
@@ -4,4 +4,5 @@
@color/green_gray_50
@color/blue_gray_50
@color/orange_gray_50
+ @color/yellow_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 127c59c9d..085c1bbf9 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -79,6 +79,18 @@
#482900
#2b1700
+ #fafaff
+ #fff0ca
+ #ffe084
+ #e8c349
+ #cba82f
+ #ae8d10
+ #8f7300
+ #735c00
+ #574500
+ #3c2f00
+ #231b00
+
#000000
#171717
#171717
@@ -127,6 +139,14 @@
#ffeedf
#f7f8fa
+ #b8aa87
+ #d4c5a1
+ #f1e1bb
+ #fff0ca
+ #fff0ca
+ #fff0ca
+ #f7f8fa
+
#FFFBFA
#FEF3F2
#FEE4E2
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index 2d82e702d..f0bc4c1bc 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -434,4 +434,5 @@
Green
Blue
Orange
+ Yellow
diff --git a/mastodon/src/main/res/values/styles.xml b/mastodon/src/main/res/values/styles.xml
index 16bd00dc3..625c4e556 100644
--- a/mastodon/src/main/res/values/styles.xml
+++ b/mastodon/src/main/res/values/styles.xml
@@ -376,6 +376,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+