Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-19 07:23:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow gray settings card background

Browse Source
This commit is contained in:
M66B
2021-05-12 18:32:19 +02:00
parent 01869a4fe8
commit 88d1d4cb09
11 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@@ -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());

8
app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
View File

@@ -409,8 +409,12 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);

8
app/src/main/java/eu/faircode/email/FragmentOptionsConnection.java
View File

@@ -253,8 +253,12 @@ public class FragmentOptionsConnection extends FragmentBase implements SharedPre
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);

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

@@ -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()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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;

8
app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
View File

@@ -317,8 +317,12 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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");

8
app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
View File

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

8
app/src/main/java/eu/faircode/email/FragmentOptionsNotifications.java
View File

@@ -473,8 +473,12 @@ public class FragmentOptionsNotifications extends FragmentBase implements Shared
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);

8
app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
View File

@@ -335,8 +335,12 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);

8
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
View File

@@ -422,8 +422,12 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);

8
app/src/main/java/eu/faircode/email/FragmentOptionsSynchronize.java
View File

@@ -333,8 +333,12 @@ public class FragmentOptionsSynchronize extends FragmentBase implements SharedPr
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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>>() {

9
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -403,8 +403,13 @@ public class FragmentSetup extends FragmentBase {
});
// Initialize
if (!Helper.isDarkTheme(getContext()))
view.setBackgroundColor(ContextCompat.getColor(getContext(), R.color.lightColorBackground_cards_beige));
if (!Helper.isDarkTheme(getContext())) {
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);