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

Adding orange theme, tweaking the blue and green theme

Browse Source
This commit is contained in:
LucasGGamerM
2022-12-04 11:16:58 -03:00
parent 8d63be513d
commit 29abf70cec
9 changed files with 146 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,8 @@ public class GlobalUserPreferences{
PINK,
PURPLE,
GREEN,
BLUE
BLUE,
ORANGE
}
public enum ThemePreference{

5
mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
View File

@@ -685,6 +685,10 @@ public class SettingsFragment extends MastodonToolbarFragment{
pref = GlobalUserPreferences.ColorPreference.BLUE;
onColorPreferenceClick(pref);
}
else if(id==R.id.orange_color) {
pref = GlobalUserPreferences.ColorPreference.ORANGE;
onColorPreferenceClick(pref);
}
else
return false;
return true;
@@ -702,6 +706,7 @@ public class SettingsFragment extends MastodonToolbarFragment{
case PURPLE -> R.string.purple_color;
case GREEN -> R.string.green_color;
case BLUE -> R.string.blue_color;
case ORANGE -> R.string.orange_color;
});
}
}

10
mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
View File

@@ -698,6 +698,16 @@ public class UiUtils{
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Blue : R.style.Theme_Mastodon_Dark_Blue;
});
break;
case ORANGE:
context.setTheme(switch(GlobalUserPreferences.theme){
case AUTO ->
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_AutoLightDark_TrueBlack_Orange : R.style.Theme_Mastodon_AutoLightDark_Orange;
case LIGHT ->
R.style.Theme_Mastodon_Light_Orange;
case DARK ->
GlobalUserPreferences.trueBlackTheme ? R.style.Theme_Mastodon_Dark_TrueBlack_Orange : R.style.Theme_Mastodon_Dark_Orange;
});
break;
}
}