From 8a63e3e2690cec1a70a07971ec6f11ba8cff638a Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 11 Jul 2019 08:04:11 +0200 Subject: [PATCH] Fixed main theme --- .../java/eu/faircode/email/ActivityBase.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 4e576852b8..f9cd2f9321 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -72,17 +72,20 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc this.contacts = hasPermission(Manifest.permission.READ_CONTACTS); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - String theme = prefs.getString("theme", null); - if ("system".equals(theme)) { - int uiMode = getResources().getConfiguration().uiMode; - Log.i("UI mode=" + uiMode); - if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0) + + if (!this.getClass().equals(ActivityMain.class)) { + String theme = prefs.getString("theme", null); + if ("system".equals(theme)) { + int uiMode = getResources().getConfiguration().uiMode; + Log.i("UI mode=" + uiMode); + if ((uiMode & Configuration.UI_MODE_NIGHT_YES) != 0) + setTheme(R.style.AppThemeBlack); + } + if ("dark".equals(theme)) + setTheme(R.style.AppThemeDark); + else if ("black".equals(theme)) setTheme(R.style.AppThemeBlack); } - if ("dark".equals(theme)) - setTheme(R.style.AppThemeDark); - else if ("black".equals(theme)) - setTheme(R.style.AppThemeBlack); prefs.registerOnSharedPreferenceChangeListener(this);