From f76f0863f8032ce96d67a1b6cc20207c81441f17 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 24 Dec 2015 17:40:09 -0500 Subject: [PATCH] Live tinting of message bubbles --- .../common/preferences/QKPreference.java | 5 +++- .../java/com/moez/QKSMS/ui/ThemeManager.java | 16 +++++++++--- .../ui/messagelist/MessageListAdapter.java | 17 +++++++------ .../ui/messagelist/MessageListViewHolder.java | 25 ++++++++++++++++++- 4 files changed, 50 insertions(+), 13 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 5683bedc..7e788ab3 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 @@ -87,7 +87,10 @@ 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_THEME("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 53ace59d..e44a3763 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/ThemeManager.java @@ -36,6 +36,8 @@ import com.moez.QKSMS.ui.widget.WidgetProvider; import java.util.Set; +import static com.moez.QKSMS.common.preferences.QKPreference.ACTIVE_THEME; + public class ThemeManager { private final static String TAG = "ThemeManager"; @@ -81,9 +83,11 @@ public class ThemeManager { private static int sTextOnBackgroundSecondary; private static int sSentBubbleRes; private static int sSentBubbleAltRes; + private static boolean sSentBubbleColored; private static int sSentBubbleColor; private static int sReceivedBubbleRes; private static int sReceivedBubbleAltRes; + private static boolean sReceivedBubbleColored; private static int sReceivedBubbleColor; private static Drawable sRippleBackground; @@ -473,7 +477,7 @@ public class ThemeManager { } public static int getSentBubbleColor() { - return sSentBubbleColor; + return sSentBubbleColored ? sActiveColor : getNeutralBubbleColor(); } public static int getReceivedBubbleRes() { @@ -485,7 +489,7 @@ public class ThemeManager { } public static int getReceivedBubbleColor() { - return sReceivedBubbleColor; + return sReceivedBubbleColored ? sActiveColor : getNeutralBubbleColor(); } public static void setBubbleStyleNew(boolean styleNew) { @@ -496,11 +500,11 @@ public class ThemeManager { } public static void setSentBubbleColored(boolean colored) { - sSentBubbleColor = colored ? sColor : getNeutralBubbleColor(); + sSentBubbleColored = colored; } public static void setReceivedBubbleColored(boolean colored) { - sReceivedBubbleColor = colored ? sColor : getNeutralBubbleColor(); + sReceivedBubbleColored = colored; } public static int getNeutralBubbleColor() { @@ -705,6 +709,10 @@ public class ThemeManager { if (sNavigationTintEnabled) { mWindow.setNavigationBarColor(ColorUtils.darken(color)); } + + for (LiveView view : LiveViewManager.getViews(ACTIVE_THEME.getKey())) { + view.refresh(); + } } private static boolean isColorDarkEnough(int color) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index 45196a64..9820e8cd 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -130,7 +130,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + if (messageItem.isMe()) { + holder.mBodyTextView.getBackground().setColorFilter(ThemeManager.getSentBubbleColor(), PorterDuff.Mode.SRC_ATOP); + } else { + holder.mBodyTextView.getBackground().setColorFilter(ThemeManager.getReceivedBubbleColor(), PorterDuff.Mode.SRC_ATOP); + } + }); + holder.refresh(); if (messageItem.isMe() && !mPrefs.getBoolean(SettingsFragment.HIDE_AVATAR_SENT, true)) { holder.mAvatarView.setVisibility(showAvatar ? View.VISIBLE : View.GONE); 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 12664ce9..bacaf5ed 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 @@ -9,8 +9,11 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import com.moez.QKSMS.R; +import com.moez.QKSMS.common.LiveViewManager; import com.moez.QKSMS.common.google.ItemLoadedCallback; import com.moez.QKSMS.common.google.ThumbnailManager; +import com.moez.QKSMS.common.preferences.QKPreference; +import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.interfaces.SlideViewInterface; import com.moez.QKSMS.ui.base.ClickyViewHolder; import com.moez.QKSMS.ui.base.QKActivity; @@ -20,9 +23,13 @@ import com.moez.QKSMS.ui.view.QKTextView; import java.util.Map; -public class MessageListViewHolder extends ClickyViewHolder implements SlideViewInterface { +public class MessageListViewHolder extends ClickyViewHolder implements SlideViewInterface, LiveView { private final String TAG = "MessageListViewHolder"; + protected interface LiveViewCallback { + void onRefresh(); + } + // Views protected View mRoot; protected QKTextView mBodyTextView; @@ -44,6 +51,8 @@ public class MessageListViewHolder extends ClickyViewHolder impleme protected ImageLoadedCallback mImageLoadedCallback; protected Presenter mPresenter; + protected LiveViewCallback mLiveViewCallback; + public MessageListViewHolder(QKActivity context, View view) { super(context, view); @@ -56,6 +65,9 @@ public class MessageListViewHolder extends ClickyViewHolder impleme mAvatarView = (AvatarView) view.findViewById(R.id.avatar); mMessageBlock = (LinearLayout) view.findViewById(R.id.message_block); mSpace = view.findViewById(R.id.space); + + LiveViewManager.registerView(this); + LiveViewManager.registerPreference(this, QKPreference.ACTIVE_THEME.getKey()); } protected void showMmsView(boolean visible) { @@ -90,6 +102,10 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } } + protected void setLiveViewCallback(LiveViewCallback liveViewCallback) { + mLiveViewCallback = liveViewCallback; + } + @Override public void setImage(String name, Bitmap bitmap) { showMmsView(true); @@ -209,6 +225,13 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } + @Override + public void refresh() { + if (mLiveViewCallback != null) { + mLiveViewCallback.onRefresh(); + } + } + static protected class ImageLoadedCallback implements ItemLoadedCallback { private long mMessageId; private final MessageListViewHolder mListItem;