Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Setting purple as default and making it work idk

This commit is contained in:
LucasGGamerM 2022-12-22 11:49:07 -03:00
parent f0bd9233b7
commit 6774a642d9
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
View File

@ -59,10 +59,10 @@ public class GlobalUserPreferences{
recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>()); recentLanguages=fromJson(prefs.getString("recentLanguages", "{}"), recentLanguagesType, new HashMap<>());
try { try {
color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.PINK.name())); color=ColorPreference.valueOf(prefs.getString("color", ColorPreference.MATERIAL3.name()));
} catch (IllegalArgumentException|ClassCastException ignored) { } catch (IllegalArgumentException|ClassCastException ignored) {
// invalid color name or color was previously saved as integer // invalid color name or color was previously saved as integer
color=ColorPreference.PINK; color=ColorPreference.PURPLE;
} }
} }

35
mastodon/src/main/res/values/colors.xml
View File

@ -39,6 +39,19 @@
<color name="primary_800">#ae218a</color> <color name="primary_800">#ae218a</color>
<color name="primary_900">#6d1556</color> <color name="primary_900">#6d1556</color>
<color name="purple_primary_25">#fafaff</color>
<color name="purple_primary_50">#f4f3ff</color>
<color name="purple_primary_100">#ebebff</color>
<color name="purple_primary_200">#d7d7ff</color>
<color name="purple_primary_300">#c2c2ff</color>
<color name="purple_primary_400">#9999ff</color>
<color name="purple_primary_500">#6364ff</color>
<color name="purple_primary_600">#562cfc</color>
<color name="purple_primary_700">#431cbb</color>
<color name="purple_primary_800">#2f0c7a</color>
<color name="purple_primary_900">#17063b</color>
<color name="error_25">#FFFBFA</color> <color name="error_25">#FFFBFA</color>
<color name="error_50">#FEF3F2</color> <color name="error_50">#FEF3F2</color>
<color name="error_100">#FEE4E2</color> <color name="error_100">#FEE4E2</color>
@ -124,17 +137,17 @@
<color name="m3_gray_50">@color/gray_50</color> <color name="m3_gray_50">@color/gray_50</color>
<color name="m3_gray_25">@color/gray_25</color> <color name="m3_gray_25">@color/gray_25</color>
<color name="m3_primary_25">@color/primary_25</color> <color name="m3_primary_25">@color/purple_primary_25</color>
<color name="m3_primary_50">@color/primary_50</color> <color name="m3_primary_50">@color/purple_primary_50</color>
<color name="m3_primary_100">@color/primary_100</color> <color name="m3_primary_100">@color/purple_primary_100</color>
<color name="m3_primary_200">@color/primary_200</color> <color name="m3_primary_200">@color/purple_primary_200</color>
<color name="m3_primary_300">@color/primary_300</color> <color name="m3_primary_300">@color/purple_primary_300</color>
<color name="m3_primary_400">@color/primary_400</color> <color name="m3_primary_400">@color/purple_primary_400</color>
<color name="m3_primary_500">@color/primary_500</color> <color name="m3_primary_500">@color/purple_primary_500</color>
<color name="m3_primary_600">@color/primary_600</color> <color name="m3_primary_600">@color/purple_primary_600</color>
<color name="m3_primary_700">@color/primary_700</color> <color name="m3_primary_700">@color/purple_primary_700</color>
<color name="m3_primary_800">@color/primary_800</color> <color name="m3_primary_800">@color/purple_primary_800</color>
<color name="m3_primary_900">@color/primary_900</color> <color name="m3_primary_900">@color/purple_primary_900</color>
<!-- light theme --> <!-- light theme -->
<color name="m3_sys_light_primary">#6750A4</color> <color name="m3_sys_light_primary">#6750A4</color>

22
mastodon/src/main/res/values/palettes.xml
View File

@ -102,17 +102,17 @@
</style> </style>
<style name="ColorPalette.Purple"> <style name="ColorPalette.Purple">
<item name="colorPrimary25">#fafaff</item> <item name="colorPrimary25">@color/purple_primary_25</item>
<item name="colorPrimary50">#f4f3ff</item> <item name="colorPrimary50">@color/purple_primary_50</item>
<item name="colorPrimary100">#ebebff</item> <item name="colorPrimary100">@color/purple_primary_100</item>
<item name="colorPrimary200">#d7d7ff</item> <item name="colorPrimary200">@color/purple_primary_200</item>
<item name="colorPrimary300">#c2c2ff</item> <item name="colorPrimary300">@color/purple_primary_300</item>
<item name="colorPrimary400">#9999ff</item> <item name="colorPrimary400">@color/purple_primary_400</item>
<item name="colorPrimary500">#6364ff</item> <item name="colorPrimary500">@color/purple_primary_500</item>
<item name="colorPrimary600">#562cfc</item> <item name="colorPrimary600">@color/purple_primary_600</item>
<item name="colorPrimary700">#431cbb</item> <item name="colorPrimary700">@color/purple_primary_700</item>
<item name="colorPrimary800">#2f0c7a</item> <item name="colorPrimary800">@color/purple_primary_800</item>
<item name="colorPrimary900">#17063b</item> <item name="colorPrimary900">@color/purple_primary_900</item>
</style> </style>
<style name="ColorPalette.Green"> <style name="ColorPalette.Green">