set correct delivery/lock icon colors, tackles #170

This commit is contained in:
B. Petersen
2019-01-03 17:41:39 +01:00
parent b780a9e783
commit 2184d898f6
2 changed files with 4 additions and 5 deletions
@@ -48,7 +48,6 @@ public class ConversationItemFooter extends LinearLayout {
if (attrs != null) {
TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.ConversationItemFooter, 0, 0);
setTextColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_text_color, getResources().getColor(R.color.core_white)));
setIconColor(typedArray.getInt(R.styleable.ConversationItemFooter_footer_icon_color, getResources().getColor(R.color.core_white)));
typedArray.recycle();
}
}
@@ -66,9 +65,6 @@ public class ConversationItemFooter extends LinearLayout {
public void setTextColor(int color) {
dateView.setTextColor(color);
}
public void setIconColor(int color) {
secureIndicatorView.setColorFilter(color);
deliveryStatusView.setTint(color);
}
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.components;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.util.AttributeSet;
import android.view.View;
import android.view.animation.Animation;
@@ -11,6 +12,7 @@ import android.widget.FrameLayout;
import android.widget.ImageView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.util.ResUtil;
public class DeliveryStatusView extends FrameLayout {
@@ -50,7 +52,8 @@ public class DeliveryStatusView extends FrameLayout {
if (attrs != null) {
TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DeliveryStatusView, 0, 0);
setTint(typedArray.getColor(R.styleable.DeliveryStatusView_iconColor, getResources().getColor(R.color.core_white)));
int color = ResUtil.getColor(getContext(), R.attr.conversation_item_outgoing_text_secondary_color);
setTint(color);
typedArray.recycle();
}
}