mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Small theme selection improvement

This commit is contained in:
M66B 2019-12-28 09:02:00 +01:00
parent db7352e441
commit e565dd17d4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@ -681,6 +681,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
boolean system = (swSystem.isEnabled() && swSystem.isChecked());
swReverse.setEnabled(swReverse.isEnabled() && !system);
swDark.setEnabled(swDark.isEnabled() && !system);
swSystem.setEnabled(swSystem.isEnabled() && !reverse && !dark);
}
@ -771,32 +772,35 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
ContactInfo.clearCache();
boolean reverse = (swReverse.isEnabled() && swReverse.isChecked());
boolean dark = (swDark.isEnabled() && swDark.isChecked());
boolean system = (swSystem.isEnabled() && swSystem.isChecked());
switch (rgTheme.getCheckedRadioButtonId()) {
case R.id.rbThemeBlueOrange:
if (swSystem.isChecked())
if (system)
prefs.edit().putString("theme", "system").apply();
else
prefs.edit().putString("theme",
(swReverse.isChecked() ? "orange_blue" : "blue_orange") +
(swDark.isChecked() ? "_dark" : "_light")).apply();
(reverse ? "orange_blue" : "blue_orange") +
(dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeYellowPurple:
prefs.edit().putString("theme",
(swReverse.isChecked() ? "purple_yellow" : "yellow_purple") +
(swDark.isChecked() ? "_dark" : "_light")).apply();
(reverse ? "purple_yellow" : "yellow_purple") +
(dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeRedGreen:
prefs.edit().putString("theme",
(swReverse.isChecked() ? "green_red" : "red_green") +
(swDark.isChecked() ? "_dark" : "_light")).apply();
(reverse ? "green_red" : "red_green") +
(dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeGrey:
if (swSystem.isChecked())
if (system)
prefs.edit().putString("theme", "grey_system").apply();
else if (swDark.isChecked())
prefs.edit().putString("theme", "grey_dark").apply();
else
prefs.edit().putString("theme", "grey_light").apply();
prefs.edit().putString("theme",
"grey" + (dark ? "_dark" : "_light")).apply();
break;
case R.id.rbThemeBlack:
prefs.edit().putString("theme", "black").apply();