Utilize icon_tint color filter for UpdateItem icons.

This commit is contained in:
Alex Hart 2019-11-06 09:52:07 -04:00 committed by Alan Evans
parent b3e66a9259
commit ffa6c9acd1

View File

@ -158,7 +158,7 @@ public class ConversationUpdateItem extends LinearLayout
icon.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_timer_disabled_24)); 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))); title.setText(ExpirationUtil.getExpirationDisplayValue(getContext(), (int)(messageRecord.getExpiresIn() / 1000)));
body.setText(messageRecord.getDisplayBody(getContext())); body.setText(messageRecord.getDisplayBody(getContext()));
@ -167,13 +167,13 @@ public class ConversationUpdateItem extends LinearLayout
date.setVisibility(GONE); date.setVisibility(GONE);
} }
private ColorFilter getGreyFilter() { private ColorFilter getIconTintFilter() {
return new PorterDuffColorFilter(ContextCompat.getColor(getContext(), R.color.core_grey_50), PorterDuff.Mode.MULTIPLY); return new PorterDuffColorFilter(ThemeUtil.getThemedColor(getContext(), R.attr.icon_tint), PorterDuff.Mode.SRC_IN);
} }
private void setIdentityRecord(final MessageRecord messageRecord) { private void setIdentityRecord(final MessageRecord messageRecord) {
icon.setImageDrawable(ThemeUtil.getThemedDrawable(getContext(), R.attr.safety_number_icon)); icon.setImageDrawable(ThemeUtil.getThemedDrawable(getContext(), R.attr.safety_number_icon));
icon.setColorFilter(getGreyFilter()); icon.setColorFilter(getIconTintFilter());
body.setText(messageRecord.getDisplayBody(getContext())); body.setText(messageRecord.getDisplayBody(getContext()));
title.setVisibility(GONE); title.setVisibility(GONE);
@ -185,7 +185,7 @@ public class ConversationUpdateItem extends LinearLayout
if (messageRecord.isIdentityVerified()) icon.setImageResource(R.drawable.ic_check_white_24dp); if (messageRecord.isIdentityVerified()) icon.setImageResource(R.drawable.ic_check_white_24dp);
else icon.setImageResource(R.drawable.ic_info_outline_white_24dp); else icon.setImageResource(R.drawable.ic_info_outline_white_24dp);
icon.setColorFilter(getGreyFilter()); icon.setColorFilter(getIconTintFilter());
body.setText(messageRecord.getDisplayBody(getContext())); body.setText(messageRecord.getDisplayBody(getContext()));
title.setVisibility(GONE); title.setVisibility(GONE);
@ -216,7 +216,7 @@ public class ConversationUpdateItem extends LinearLayout
private void setEndSessionRecord(MessageRecord messageRecord) { private void setEndSessionRecord(MessageRecord messageRecord) {
icon.setImageResource(R.drawable.ic_refresh_white_24dp); icon.setImageResource(R.drawable.ic_refresh_white_24dp);
icon.setColorFilter(getGreyFilter()); icon.setColorFilter(getIconTintFilter());
body.setText(messageRecord.getDisplayBody(getContext())); body.setText(messageRecord.getDisplayBody(getContext()));
title.setVisibility(GONE); title.setVisibility(GONE);