From 07078f5c88249368bf87ab9622f7261233417b8c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 4 Jan 2016 00:17:16 -0500 Subject: [PATCH] Fix activity theme setting --- .../java/com/moez/QKSMS/ui/ThemeManager.java | 8 -------- .../com/moez/QKSMS/ui/base/QKActivity.java | 19 +++++++++++++++++++ .../moez/QKSMS/ui/base/QKPopupActivity.java | 19 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java index e044a72a..36741767 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -302,23 +302,15 @@ public class ThemeManager { switch (theme) { case WHITE: mBackgroundColor = mResources.getColor(R.color.white_pure); - if (mContext != null) mContext.setTheme(mContext instanceof MainActivity ? - R.style.AppThemeWhite : R.style.AppThemeWhiteDialog); break; case OFFWHITE: mBackgroundColor = mResources.getColor(R.color.grey_light_mega_ultra); - if (mContext != null) mContext.setTheme(mContext instanceof MainActivity ? - R.style.AppThemeLight : R.style.AppThemeLightDialog); break; case GREY: mBackgroundColor = mResources.getColor(R.color.grey_material); - if (mContext != null) mContext.setTheme(mContext instanceof MainActivity ? - R.style.AppThemeDark : R.style.AppThemeDarkDialog); break; case BLACK: mBackgroundColor = mResources.getColor(R.color.black); - if (mContext != null) mContext.setTheme(mContext instanceof MainActivity ? - R.style.AppThemeDarkAmoled : R.style.AppThemeDarkAmoledDialog); break; } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java index 15eea0ac..71cc3650 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKActivity.java @@ -99,6 +99,7 @@ public abstract class QKActivity extends AppCompatActivity { }); LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { + setTheme(getThemeRes()); switch (ThemeManager.getTheme()) { case WHITE: case OFFWHITE: @@ -260,6 +261,24 @@ public abstract class QKActivity extends AppCompatActivity { } } + protected int getThemeRes() { + switch (ThemeManager.getTheme()) { + case WHITE: + return R.style.AppThemeWhite; + + case OFFWHITE: + return R.style.AppThemeLight; + + case GREY: + return R.style.AppThemeDark; + + case BLACK: + return R.style.AppThemeDarkAmoled; + } + + return R.style.AppThemeLight; + } + public void makeToast(@StringRes int message) { Toast.makeText(this, message, Toast.LENGTH_LONG).show(); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java index d6c3313a..c46ed99c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/base/QKPopupActivity.java @@ -38,5 +38,24 @@ public abstract class QKPopupActivity extends QKActivity { } } + @Override + protected int getThemeRes() { + switch (ThemeManager.getTheme()) { + case WHITE: + return R.style.AppThemeWhiteDialog; + + case OFFWHITE: + return R.style.AppThemeLightDialog; + + case GREY: + return R.style.AppThemeDarkDialog; + + case BLACK: + return R.style.AppThemeDarkAmoledDialog; + } + + return R.style.AppThemeLightDialog; + } + protected abstract int getLayoutResource(); }