From 9fbc7127eaa0b30294036dbcb5afd882ca371ed6 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 3 Apr 2020 12:13:05 +0200 Subject: [PATCH] Simplification --- .../eu/faircode/email/FragmentOptionsDisplay.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index c323cfd173..e4367aa51e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -826,20 +826,14 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private void eval() { int checkedId = rgTheme.getCheckedRadioButtonId(); - boolean reverse = (checkedId == R.id.rbThemeBlueOrange || - checkedId == R.id.rbThemeYellowPurple || - checkedId == R.id.rbThemeRedGreen); - boolean dark = (checkedId == R.id.rbThemeBlueOrange || - checkedId == R.id.rbThemeYellowPurple || - checkedId == R.id.rbThemeRedGreen || - checkedId == R.id.rbThemeGrey); - boolean black = (checkedId == R.id.rbThemeBlueOrange || + boolean colored = (checkedId == R.id.rbThemeBlueOrange || checkedId == R.id.rbThemeYellowPurple || checkedId == R.id.rbThemeRedGreen); + boolean dark = (colored || checkedId == R.id.rbThemeGrey); - swReverse.setEnabled(reverse); + swReverse.setEnabled(colored); swDark.setEnabled(dark); - swBlack.setEnabled(black && swDark.isChecked()); + swBlack.setEnabled(colored && swDark.isChecked()); swSystem.setEnabled(dark && !swDark.isChecked()); }