Utilize icon_tint color filter for UpdateItem icons.

signalapp · Nov 9, 2019 · ffa6c9a · ffa6c9a
1 parent b3e66a9
commit ffa6c9a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -158,7 +158,7 @@ private void setTimerRecord(final MessageRecord messageRecord) {
       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 @@ private void setTimerRecord(final MessageRecord messageRecord) {
     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 @@ private void setIdentityVerifyUpdate(final MessageRecord messageRecord) {
     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 @@ private void setJoinedRecord(MessageRecord messageRecord) {
 
   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);