diff --git a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java index 9ebcf2e54..5f3174b47 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java +++ b/mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java @@ -59,10 +59,10 @@ public class GlobalUserPreferences{ recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>()); try { - color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name())); + color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name())); } catch (IllegalArgumentException|ClassCastException ignored) { // invalid color name or color was previously saved as integer - color=ColorPreference.PINK; + color=ColorPreference.PURPLE; } } diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml index 89a18590c..3e678e8da 100644 --- a/mastodon/src/main/res/values/colors.xml +++ b/mastodon/src/main/res/values/colors.xml @@ -39,6 +39,19 @@ #ae218a #6d1556 + #fafaff + #f4f3ff + #ebebff + #d7d7ff + #c2c2ff + #9999ff + #6364ff + #562cfc + #431cbb + #2f0c7a + #17063b + + #FFFBFA #FEF3F2 #FEE4E2 @@ -124,17 +137,17 @@ @color/gray_50 @color/gray_25 - @color/primary_25 - @color/primary_50 - @color/primary_100 - @color/primary_200 - @color/primary_300 - @color/primary_400 - @color/primary_500 - @color/primary_600 - @color/primary_700 - @color/primary_800 - @color/primary_900 + @color/purple_primary_25 + @color/purple_primary_50 + @color/purple_primary_100 + @color/purple_primary_200 + @color/purple_primary_300 + @color/purple_primary_400 + @color/purple_primary_500 + @color/purple_primary_600 + @color/purple_primary_700 + @color/purple_primary_800 + @color/purple_primary_900 #6750A4 diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml index 77a7c416f..10bd16d13 100644 --- a/mastodon/src/main/res/values/palettes.xml +++ b/mastodon/src/main/res/values/palettes.xml @@ -102,17 +102,17 @@