From 6db7f44e2be4b85324951def42da9ee260d9bfd8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 3 Jan 2016 17:20:55 -0500 Subject: [PATCH] Use one Preference for all Theme LiveViews --- .../common/preferences/QKPreference.java | 7 +-- .../java/com/moez/QKSMS/ui/ThemeManager.java | 6 +-- .../com/moez/QKSMS/ui/base/QKActivity.java | 4 +- .../ConversationListAdapter.java | 47 ++++++++----------- .../ui/messagelist/MessageListViewHolder.java | 2 +- .../com/moez/QKSMS/ui/view/AvatarView.java | 2 +- .../com/moez/QKSMS/ui/view/ComposeView.java | 2 +- 7 files changed, 31 insertions(+), 39 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java b/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java index 8a92aeea..ef2e847e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/preferences/QKPreference.java @@ -1,11 +1,13 @@ package com.moez.QKSMS.common.preferences; +import com.moez.QKSMS.ui.ThemeManager; + import java.util.Arrays; import java.util.HashSet; public enum QKPreference { // Appearance - THEME("pref_key_theme", 0xFFFFF), + THEME("pref_key_theme", ThemeManager.DEFAULT_COLOR), ICON("pref_key_icon"), BACKGROUND("pref_key_background", "offwhite"), @@ -87,10 +89,9 @@ public enum QKPreference { TAP_DISMISS("pref_key_quickreply_dismiss", true), // QK Compose - QK_COMPOSE("pref_key_quickcompose", false), + QK_COMPOSE("pref_key_quickcompose", false); // LiveViews - ACTIVE_COLOR("pref_key_active_theme"); private String mKey; private Object mDefaultValue; 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 c1de8a4a..b0424a16 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -371,7 +371,7 @@ public class ThemeManager { setReceivedBubbleColored(mPrefs.getBoolean(SettingsFragment.COLOUR_RECEIVED, false)); setBubbleStyleNew(mPrefs.getBoolean(SettingsFragment.BUBBLES_NEW, true)); - LiveViewManager.refreshViews(QKPreference.THEME); + LiveViewManager.refreshViews(QKPreference.BACKGROUND); } public static void setIcon(final QKActivity context) { @@ -639,7 +639,7 @@ public class ThemeManager { mWindow.setNavigationBarColor(ColorUtils.darken(color1)); } - LiveViewManager.refreshViews(QKPreference.ACTIVE_COLOR); + LiveViewManager.refreshViews(QKPreference.THEME); }); colorAnimation.addListener(new AnimatorListenerAdapter() { @Override @@ -679,7 +679,7 @@ public class ThemeManager { mWindow.setNavigationBarColor(ColorUtils.darken(color)); } - LiveViewManager.refreshViews(QKPreference.ACTIVE_COLOR); + LiveViewManager.refreshViews(QKPreference.THEME); } private static boolean isColorDarkEnough(int color) { 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 be2eeeda..ad48ffee 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 @@ -73,11 +73,11 @@ public abstract class QKActivity extends AppCompatActivity { setSupportActionBar(mToolbar); } - LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, key -> { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { mToolbar.setBackgroundColor(ThemeManager.getColor()); }); - LiveViewManager.registerView(QKPreference.THEME, this, key -> { + LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> { switch (ThemeManager.getTheme()) { case WHITE: case OFFWHITE: diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java index 906ef0f8..27eb81ee 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListAdapter.java @@ -1,9 +1,6 @@ package com.moez.QKSMS.ui.conversationlist; import android.content.SharedPreferences; -import android.graphics.PorterDuff; -import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -25,24 +22,9 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { - mMuted.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); - mUnread.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); - mError.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); - notifyDataSetChanged(); - }); } protected Conversation getItem(int position) { @@ -54,7 +36,19 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { + holder.mutedView.setColorFilter(ThemeManager.getColor()); + holder.unreadView.setColorFilter(ThemeManager.getColor()); + holder.errorIndicator.setColorFilter(ThemeManager.getColor()); + }); + + return holder; } @Override @@ -67,20 +61,13 @@ public class ConversationListAdapter extends RecyclerCursorAdapter { + holder.dateView.setTextColor(hasUnreadMessages ? ThemeManager.getColor() : ThemeManager.getTextOnBackgroundSecondary()); + }); + if (isInMultiSelectMode()) { holder.mSelected.setVisibility(View.VISIBLE); if (isSelected(conversation.getThreadId())) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java index a8d14dfc..0b76429c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java @@ -94,7 +94,7 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } protected void setLiveViewCallback(LiveView liveViewCallback) { - LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, liveViewCallback); + LiveViewManager.registerView(QKPreference.THEME, this, liveViewCallback); } @Override diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index ead8d0ac..c25e0e78 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -91,7 +91,7 @@ public class AvatarView extends ImageView implements View.OnClickListener { setOnClickListener(this); - LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, key -> { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { mPaint.setColor(ThemeManager.getTextOnColorPrimary()); mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index c1881f57..83283a7a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -181,7 +181,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener { mCancel.setOnClickListener(this); mDelay.setOnClickListener(this); - LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, key -> { + LiveViewManager.registerView(QKPreference.THEME, this, key -> { mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP); mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);