msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Small theme selection improvement

Browse Source
pull/171/head
M66B 5 years ago
parent db7352e441
commit e565dd17d4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save