Fix wrong icon color in expiry footer

signalapp · Oct 21, 2019 · 2f93da6 · 2f93da6
1 parent 78f3e28
commit 2f93da6
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 14 deletions.
diff --git a/res/drawable/ic_timer_00_16.xml b/res/drawable/ic_timer_00_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="?conversation_item_sent_text_secondary_color"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8.25,2h-0.5L7.75,1h0.5ZM8.25,3h-0.5l-0.5,5a0.75,0.75 0,0 0,1.5 0Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_05_16.xml b/res/drawable/ic_timer_05_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8.65,8.375l-0.011,-0.006A0.739,0.739 0,0 1,8 8.75,0.75 0.75,0 0,1 7.25,8a0.732,0.732 0,0 1,0.111 -0.369L7.35,7.625l2.933,-4.08 0.434,0.25L8.694,8.276l-0.015,0.034ZM11.5,1.942A6.946,6.946 0,0 0,8 1V2a5.952,5.952 0,0 1,3 0.809Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_10_16.xml b/res/drawable/ic_timer_10_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8.375,8.65l-0.006,-0.011A0.732,0.732 0,0 1,8 8.75,0.75 0.75,0 0,1 7.25,8a0.739,0.739 0,0 1,0.381 -0.639L7.625,7.35l0.065,-0.029 0.034,-0.015 4.481,-2.022 0.25,0.432ZM13.19,5l0.867,-0.5A6.989,6.989 0,0 0,8 1V2A6,6 0,0 1,13.19 5Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_15_16.xml b/res/drawable/ic_timer_15_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M13,7.75v0.5l-5,0.5a0.75,0.75 0,0 1,0 -1.5ZM14,8h1A7,7 0,0 0,8 1V2A6.007,6.007 0,0 1,14 8Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_20_16.xml b/res/drawable/ic_timer_20_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8,2L8,1a6.992,6.992 0,0 1,6.058 10.5l-0.867,-0.5A5.991,5.991 0,0 0,8 2ZM12.205,10.716 L12.455,10.284L8.375,7.35l-0.006,0.011A0.732,0.732 0,0 0,8 7.25,0.75 0.75,0 0,0 7.25,8a0.739,0.739 0,0 0,0.381 0.639l-0.006,0.011 0.065,0.029 0.034,0.015Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_25_16.xml b/res/drawable/ic_timer_25_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M15,8a6.989,6.989 0,0 1,-3.5 6.057L11,13.19A6,6 0,0 0,8 2V1A7,7 0,0 1,15 8ZM8.694,7.724 L8.679,7.69 8.65,7.625l-0.011,0.006A0.739,0.739 0,0 0,8 7.25,0.75 0.75,0 0,0 7.25,8a0.732,0.732 0,0 0,0.111 0.369l-0.011,0.006 2.933,4.08 0.434,-0.25Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_30_16.xml b/res/drawable/ic_timer_30_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M7.25,8a0.75,0.75 0,0 1,1.5 0l-0.5,5h-0.5ZM8,1V2A6,6 0,0 1,8 14v1A7,7 0,0 0,8 1Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_35_16.xml b/res/drawable/ic_timer_35_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M15,8A6.992,6.992 0,0 1,4.5 14.058l0.5,-0.867A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.75,8A0.75,0.75 0,0 0,8 7.25a0.739,0.739 0,0 0,-0.639 0.381L7.35,7.625l-0.029,0.065 -0.015,0.034L5.283,12.205l0.434,0.25L8.65,8.375l-0.011,-0.006A0.732,0.732 0,0 0,8.75 8Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_40_16.xml b/res/drawable/ic_timer_40_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M15,8A7,7 0,0 1,1.943 11.5L2.81,11A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.75,8A0.75,0.75 0,0 0,8 7.25a0.732,0.732 0,0 0,-0.369 0.111L7.625,7.35l-4.08,2.934 0.25,0.432L8.276,8.694l0.034,-0.015 0.065,-0.029 -0.006,-0.011A0.739,0.739 0,0 0,8.75 8Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_45_16.xml b/res/drawable/ic_timer_45_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8,7.25a0.75,0.75 0,0 1,0 1.5l-5,-0.5v-0.5ZM8,1V2A6,6 0,1 1,2 8H1A7,7 0,1 0,8 1Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_50_16.xml b/res/drawable/ic_timer_50_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M15,8A7,7 0,1 1,1.942 4.5l0.867,0.5A6,6 0,1 0,8 2V1A7,7 0,0 1,15 8ZM8.369,7.361l0.006,-0.011L8.31,7.321l-0.034,-0.015L3.8,5.284l-0.25,0.432L7.625,8.65l0.006,-0.011A0.732,0.732 0,0 0,8 8.75,0.75 0.75,0 0,0 8.75,8 0.739,0.739 0,0 0,8.369 7.361Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_55_16.xml b/res/drawable/ic_timer_55_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8.75,8A0.75,0.75 0,0 1,8 8.75a0.739,0.739 0,0 1,-0.639 -0.381l-0.011,0.006L7.321,8.31l-0.015,-0.034L5.283,3.8l0.434,-0.25L8.65,7.625l-0.011,0.006A0.732,0.732 0,0 1,8.75 8ZM8,1V2a6.019,6.019 0,1 1,-3 0.81l-0.5,-0.867A6.991,6.991 0,1 0,8 1Z"/>
 </vector>
diff --git a/res/drawable/ic_timer_60_16.xml b/res/drawable/ic_timer_60_16.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#FFFFFFFF"
       android:pathData="M8,2A6,6 0,1 1,2 8,6.007 6.007,0 0,1 8,2M8,1a7,7 0,1 0,7 7A7,7 0,0 0,8 1ZM8.25,3h-0.5l-0.5,5a0.75,0.75 0,0 0,1.5 0Z"/>
 </vector>
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -4,6 +4,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.graphics.PorterDuff;
 import android.os.AsyncTask;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -86,7 +87,7 @@ public void setTextColor(int color) {
   }
 
   public void setIconColor(int color) {
-    timerView.setColorFilter(color);
+    timerView.setColorFilter(color, PorterDuff.Mode.SRC_IN);
     insecureIndicatorView.setColorFilter(color);
     deliveryStatusView.setTint(color);
   }