Use one Preference for all Theme LiveViews

This commit is contained in:
Moez Bhatti
2016-01-03 17:20:55 -05:00
parent 33a061ddcc
commit 6db7f44e2b
7 changed files with 31 additions and 39 deletions
@@ -1,11 +1,13 @@
package com.moez.QKSMS.common.preferences; package com.moez.QKSMS.common.preferences;
import com.moez.QKSMS.ui.ThemeManager;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
public enum QKPreference { public enum QKPreference {
// Appearance // Appearance
THEME("pref_key_theme", 0xFFFFF), THEME("pref_key_theme", ThemeManager.DEFAULT_COLOR),
ICON("pref_key_icon"), ICON("pref_key_icon"),
BACKGROUND("pref_key_background", "offwhite"), BACKGROUND("pref_key_background", "offwhite"),
@@ -87,10 +89,9 @@ public enum QKPreference {
TAP_DISMISS("pref_key_quickreply_dismiss", true), TAP_DISMISS("pref_key_quickreply_dismiss", true),
// QK Compose // QK Compose
QK_COMPOSE("pref_key_quickcompose", false), QK_COMPOSE("pref_key_quickcompose", false);
// LiveViews // LiveViews
ACTIVE_COLOR("pref_key_active_theme");
private String mKey; private String mKey;
private Object mDefaultValue; private Object mDefaultValue;
@@ -371,7 +371,7 @@ public class ThemeManager {
setReceivedBubbleColored(mPrefs.getBoolean(SettingsFragment.COLOUR_RECEIVED, false)); setReceivedBubbleColored(mPrefs.getBoolean(SettingsFragment.COLOUR_RECEIVED, false));
setBubbleStyleNew(mPrefs.getBoolean(SettingsFragment.BUBBLES_NEW, true)); setBubbleStyleNew(mPrefs.getBoolean(SettingsFragment.BUBBLES_NEW, true));
LiveViewManager.refreshViews(QKPreference.THEME); LiveViewManager.refreshViews(QKPreference.BACKGROUND);
} }
public static void setIcon(final QKActivity context) { public static void setIcon(final QKActivity context) {
@@ -639,7 +639,7 @@ public class ThemeManager {
mWindow.setNavigationBarColor(ColorUtils.darken(color1)); mWindow.setNavigationBarColor(ColorUtils.darken(color1));
} }
LiveViewManager.refreshViews(QKPreference.ACTIVE_COLOR); LiveViewManager.refreshViews(QKPreference.THEME);
}); });
colorAnimation.addListener(new AnimatorListenerAdapter() { colorAnimation.addListener(new AnimatorListenerAdapter() {
@Override @Override
@@ -679,7 +679,7 @@ public class ThemeManager {
mWindow.setNavigationBarColor(ColorUtils.darken(color)); mWindow.setNavigationBarColor(ColorUtils.darken(color));
} }
LiveViewManager.refreshViews(QKPreference.ACTIVE_COLOR); LiveViewManager.refreshViews(QKPreference.THEME);
} }
private static boolean isColorDarkEnough(int color) { private static boolean isColorDarkEnough(int color) {
@@ -73,11 +73,11 @@ public abstract class QKActivity extends AppCompatActivity {
setSupportActionBar(mToolbar); setSupportActionBar(mToolbar);
} }
LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, key -> { LiveViewManager.registerView(QKPreference.THEME, this, key -> {
mToolbar.setBackgroundColor(ThemeManager.getColor()); mToolbar.setBackgroundColor(ThemeManager.getColor());
}); });
LiveViewManager.registerView(QKPreference.THEME, this, key -> { LiveViewManager.registerView(QKPreference.BACKGROUND, this, key -> {
switch (ThemeManager.getTheme()) { switch (ThemeManager.getTheme()) {
case WHITE: case WHITE:
case OFFWHITE: case OFFWHITE:
@@ -1,9 +1,6 @@
package com.moez.QKSMS.ui.conversationlist; package com.moez.QKSMS.ui.conversationlist;
import android.content.SharedPreferences; 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.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@@ -25,24 +22,9 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
private final SharedPreferences mPrefs; private final SharedPreferences mPrefs;
private final Drawable mMuted;
private final Drawable mUnread;
private final Drawable mError;
public ConversationListAdapter(QKActivity context) { public ConversationListAdapter(QKActivity context) {
super(context); super(context);
mPrefs = mContext.getPrefs(); mPrefs = mContext.getPrefs();
mMuted = ContextCompat.getDrawable(context, R.drawable.ic_notifications_muted);
mUnread = ContextCompat.getDrawable(context, R.drawable.ic_unread_indicator);
mError = ContextCompat.getDrawable(context, R.drawable.ic_error);
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
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) { protected Conversation getItem(int position) {
@@ -54,7 +36,19 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
public ConversationListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public ConversationListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
LayoutInflater inflater = LayoutInflater.from(mContext); LayoutInflater inflater = LayoutInflater.from(mContext);
View view = inflater.inflate(R.layout.list_item_conversation, null); View view = inflater.inflate(R.layout.list_item_conversation, null);
return new ConversationListViewHolder(mContext, view);
ConversationListViewHolder holder = new ConversationListViewHolder(mContext, view);
holder.mutedView.setImageResource(R.drawable.ic_notifications_muted);
holder.unreadView.setImageResource(R.drawable.ic_unread_indicator);
holder.errorIndicator.setImageResource(R.drawable.ic_error);
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
holder.mutedView.setColorFilter(ThemeManager.getColor());
holder.unreadView.setColorFilter(ThemeManager.getColor());
holder.errorIndicator.setColorFilter(ThemeManager.getColor());
});
return holder;
} }
@Override @Override
@@ -67,20 +61,13 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
holder.root.setOnClickListener(holder); holder.root.setOnClickListener(holder);
holder.root.setOnLongClickListener(holder); holder.root.setOnLongClickListener(holder);
// Have to clear the image drawable first, or else it won't reload it at all.
holder.mutedView.setImageDrawable(null);
holder.unreadView.setImageDrawable(null);
holder.errorIndicator.setImageDrawable(null);
holder.mutedView.setImageDrawable(mMuted);
holder.unreadView.setImageDrawable(mUnread);
holder.errorIndicator.setImageDrawable(mError);
holder.mutedView.setVisibility(new ConversationPrefsHelper(mContext, conversation.getThreadId()) holder.mutedView.setVisibility(new ConversationPrefsHelper(mContext, conversation.getThreadId())
.getNotificationsEnabled() ? View.GONE : View.VISIBLE); .getNotificationsEnabled() ? View.GONE : View.VISIBLE);
holder.errorIndicator.setVisibility(conversation.hasError() ? View.VISIBLE : View.GONE); holder.errorIndicator.setVisibility(conversation.hasError() ? View.VISIBLE : View.GONE);
if (conversation.hasUnreadMessages()) { final boolean hasUnreadMessages = conversation.hasUnreadMessages();
if (hasUnreadMessages) {
holder.unreadView.setVisibility(View.VISIBLE); holder.unreadView.setVisibility(View.VISIBLE);
holder.snippetView.setTextColor(ThemeManager.getTextOnBackgroundPrimary()); holder.snippetView.setTextColor(ThemeManager.getTextOnBackgroundPrimary());
holder.dateView.setTextColor(ThemeManager.getColor()); holder.dateView.setTextColor(ThemeManager.getColor());
@@ -90,6 +77,10 @@ public class ConversationListAdapter extends RecyclerCursorAdapter<ConversationL
holder.dateView.setTextColor(ThemeManager.getTextOnBackgroundSecondary()); holder.dateView.setTextColor(ThemeManager.getTextOnBackgroundSecondary());
} }
LiveViewManager.registerView(QKPreference.THEME, this, key -> {
holder.dateView.setTextColor(hasUnreadMessages ? ThemeManager.getColor() : ThemeManager.getTextOnBackgroundSecondary());
});
if (isInMultiSelectMode()) { if (isInMultiSelectMode()) {
holder.mSelected.setVisibility(View.VISIBLE); holder.mSelected.setVisibility(View.VISIBLE);
if (isSelected(conversation.getThreadId())) { if (isSelected(conversation.getThreadId())) {
@@ -94,7 +94,7 @@ public class MessageListViewHolder extends ClickyViewHolder<MessageItem> impleme
} }
protected void setLiveViewCallback(LiveView liveViewCallback) { protected void setLiveViewCallback(LiveView liveViewCallback) {
LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, liveViewCallback); LiveViewManager.registerView(QKPreference.THEME, this, liveViewCallback);
} }
@Override @Override
@@ -91,7 +91,7 @@ public class AvatarView extends ImageView implements View.OnClickListener {
setOnClickListener(this); setOnClickListener(this);
LiveViewManager.registerView(QKPreference.ACTIVE_COLOR, this, key -> { LiveViewManager.registerView(QKPreference.THEME, this, key -> {
mPaint.setColor(ThemeManager.getTextOnColorPrimary()); mPaint.setColor(ThemeManager.getTextOnColorPrimary());
mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); mDefaultDrawable.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
@@ -181,7 +181,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener {
mCancel.setOnClickListener(this); mCancel.setOnClickListener(this);
mDelay.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); mButtonBackground.setColorFilter(ThemeManager.getColor(), PorterDuff.Mode.SRC_ATOP);
mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); mButtonBar1.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);
mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP); mButtonBar2.setColorFilter(ThemeManager.getTextOnColorPrimary(), PorterDuff.Mode.SRC_ATOP);