From ffa6c9acd19f090034353aee43e57a61d38a8e76 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 6 Nov 2019 09:52:07 -0400 Subject: [PATCH] Utilize icon_tint color filter for UpdateItem icons. --- .../conversation/ConversationUpdateItem.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index d4a2f70056..3115cd9160 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java @@ -158,7 +158,7 @@ public class ConversationUpdateItem extends LinearLayout icon.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_timer_disabled_24)); } - icon.setColorFilter(getGreyFilter()); + icon.setColorFilter(getIconTintFilter()); title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000))); body.setText(messageRecord.getDisplayBody(getContext())); @@ -167,13 +167,13 @@ public class ConversationUpdateItem extends LinearLayout date.setVisibility(GONE); } - private ColorFilter getGreyFilter() { - return new PorterDuffColorFilter(ContextCompat.getColor(getContext(), R.color.core_grey_50), PorterDuff.Mode.MULTIPLY); + private ColorFilter getIconTintFilter() { + return new PorterDuffColorFilter(ThemeUtil.getThemedColor(getContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN); } private void setIdentityRecord(final MessageRecord messageRecord) { icon.setImageDrawable(ThemeUtil.getThemedDrawable(getContext(), R.attr.safety_number_icon)); - icon.setColorFilter(getGreyFilter()); + icon.setColorFilter(getIconTintFilter()); body.setText(messageRecord.getDisplayBody(getContext())); title.setVisibility(GONE); @@ -185,7 +185,7 @@ public class ConversationUpdateItem extends LinearLayout if (messageRecord.isIdentityVerified()) icon.setImageResource(R.drawable.ic_check_white_24dp); else icon.setImageResource(R.drawable.ic_info_outline_white_24dp); - icon.setColorFilter(getGreyFilter()); + icon.setColorFilter(getIconTintFilter()); body.setText(messageRecord.getDisplayBody(getContext())); title.setVisibility(GONE); @@ -216,7 +216,7 @@ public class ConversationUpdateItem extends LinearLayout private void setEndSessionRecord(MessageRecord messageRecord) { icon.setImageResource(R.drawable.ic_refresh_white_24dp); - icon.setColorFilter(getGreyFilter()); + icon.setColorFilter(getIconTintFilter()); body.setText(messageRecord.getDisplayBody(getContext())); title.setVisibility(GONE);