Live tinting of message bubbles

This commit is contained in:
Moez Bhatti
2015-12-24 17:40:09 -05:00
parent 0b8dbebac5
commit f76f0863f8
4 changed files with 50 additions and 13 deletions
@@ -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;
@@ -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) {
@@ -130,7 +130,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
if (sent) {
// set up colors
holder.mBodyTextView.setOnColorBackground(ThemeManager.getSentBubbleColor() == ThemeManager.getColor());
holder.mBodyTextView.setOnColorBackground(ThemeManager.getSentBubbleColor() != ThemeManager.getNeutralBubbleColor());
holder.mDateView.setOnColorBackground(false);
holder.mDeliveredIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
holder.mLockedIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
@@ -145,7 +145,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
}
} else {
// set up colors
holder.mBodyTextView.setOnColorBackground(ThemeManager.getReceivedBubbleColor() == ThemeManager.getColor());
holder.mBodyTextView.setOnColorBackground(ThemeManager.getReceivedBubbleColor() != ThemeManager.getNeutralBubbleColor());
holder.mDateView.setOnColorBackground(false);
holder.mDeliveredIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
holder.mLockedIndicator.setColorFilter(ThemeManager.getTextOnBackgroundSecondary(), PorterDuff.Mode.SRC_ATOP);
@@ -306,11 +306,14 @@ public class MessageListAdapter extends RecyclerCursorAdapter<MessageListViewHol
ThemeManager.getReceivedBubbleRes()) : (messageItem.isMe() ?
ThemeManager.getSentBubbleAltRes() : ThemeManager.getReceivedBubbleAltRes()));
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.setLiveViewCallback(() -> {
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);
@@ -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<MessageItem> implements SlideViewInterface {
public class MessageListViewHolder extends ClickyViewHolder<MessageItem> 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<MessageItem> 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<MessageItem> 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<MessageItem> 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<MessageItem> impleme
}
@Override
public void refresh() {
if (mLiveViewCallback != null) {
mLiveViewCallback.onRefresh();
}
}
static protected class ImageLoadedCallback implements ItemLoadedCallback<ThumbnailManager.ImageLoaded> {
private long mMessageId;
private final MessageListViewHolder mListItem;