Allow gray settings card background

app/src/main/java/eu/faircode/email/ActivityBase.java

@@ -570,7 +570,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     @Override
     public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
         Log.i("Preference " + key + "=" + prefs.getAll().get(key));
-        if ("theme".equals(key)) {
+        if ("theme".equals(key) || "beige".equals(key)) {
             finish();
             if (this.getClass().equals(ActivitySetup.class) || this.getClass().equals(ActivityView.class))
                 startActivity(getIntent());

app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java

@@ -409,8 +409,12 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 

app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java

@@ -253,8 +253,12 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 

app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java

@@ -283,6 +283,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         swBeige.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                getActivity().getIntent().putExtra("tab", "display");
                 prefs.edit().putBoolean("beige", checked).apply();
             }
         });
@@ -854,8 +855,13 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
+
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 
         return view;

app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java

@@ -317,8 +317,12 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         try {
             int maxKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength("AES");

app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java

@@ -772,8 +772,12 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         tvFtsIndexed.setText(null);
 

app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java

@@ -473,8 +473,12 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         swAlertOnce.setVisibility(Log.isXiaomi() || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
 

app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java

@@ -335,8 +335,12 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 

app/src/main/java/eu/faircode/email/FragmentOptionsSend.java

@@ -422,8 +422,12 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         PreferenceManager.getDefaultSharedPreferences(getContext()).registerOnSharedPreferenceChangeListener(this);
 

app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java

@@ -333,8 +333,12 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         DB db = DB.getInstance(getContext());
         db.account().liveSynchronizingAccounts().observe(getViewLifecycleOwner(), new Observer<List<EntityAccount>>() {

app/src/main/java/eu/faircode/email/FragmentSetup.java

@@ -403,8 +403,13 @@ public class FragmentSetup extends FragmentBase {
         });
 
         // Initialize
-        if (!Helper.isDarkTheme(getContext()))
+        if (!Helper.isDarkTheme(getContext())) {
-            view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
+            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+            boolean beige = prefs.getBoolean("beige", true);
+            view.setBackgroundColor(ContextCompat.getColor(getContext(), beige
+                    ? R.color.lightColorBackground_cards_beige
+                    : R.color.lightColorBackground_cards));
+        }
 
         btnIdentity.setEnabled(false);
         tvNoComposable.setVisibility(View.GONE);