From a126dcf70cb58b34c9bc87f9d01499339072a5a9 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 7 Dec 2015 12:26:42 -0500 Subject: [PATCH] Fixed popup menu background color --- .../main/java/com/moez/QKSMS/ui/ThemeManager.java | 6 ++++++ .../main/java/com/moez/QKSMS/ui/base/QKActivity.java | 3 ++- QKSMS/src/main/res/layout/view_toolbar.xml | 2 +- QKSMS/src/main/res/values/themes.xml | 12 ++++++++++++ 4 files changed, 21 insertions(+), 2 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 3c43f2f9..b7b95d13 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -358,12 +358,18 @@ public class ThemeManager { sTextOnBackgroundPrimary = sResources.getColor(R.color.theme_light_text_primary); sTextOnBackgroundSecondary = sResources.getColor(R.color.theme_light_text_secondary); sRippleBackground = sResources.getDrawable(R.drawable.button_background_transparent); + if (mActivity != null) { + mActivity.getToolbar().setPopupTheme(R.style.PopupThemeLight); + } break; case GREY: case BLACK: sTextOnBackgroundPrimary = sResources.getColor(R.color.theme_dark_text_primary); sTextOnBackgroundSecondary = sResources.getColor(R.color.theme_dark_text_secondary); sRippleBackground = sResources.getDrawable(R.drawable.button_background_transparent_light); + if (mActivity != null) { + mActivity.getToolbar().setPopupTheme(R.style.PopupTheme); + } 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 c1773d2f..0db22257 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 @@ -67,6 +67,7 @@ public abstract class QKActivity extends ActionBarActivity { if (mToolbar == null) { throw new RuntimeException("Toolbar not found in BaseActivity layout."); } else { + mToolbar.setPopupTheme(R.style.PopupTheme); mTitle = (QKTextView) mToolbar.findViewById(R.id.toolbar_title); setSupportActionBar(mToolbar); } @@ -216,7 +217,7 @@ public abstract class QKActivity extends ActionBarActivity { * * @return */ - protected Toolbar getToolbar() { + public Toolbar getToolbar() { return mToolbar; } diff --git a/QKSMS/src/main/res/layout/view_toolbar.xml b/QKSMS/src/main/res/layout/view_toolbar.xml index 8a51b5ac..0aa97fc8 100644 --- a/QKSMS/src/main/res/layout/view_toolbar.xml +++ b/QKSMS/src/main/res/layout/view_toolbar.xml @@ -5,8 +5,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="56dp" - android:minHeight="56dp" android:gravity="center_vertical" + android:minHeight="56dp" app:theme="@style/ActionBarTheme"> + + + + \ No newline at end of file