From 26617988f2cf040b3867863652d39c122734e4dd Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 10 Mar 2022 15:51:15 +0100
Subject: [PATCH] Add colors for shield vector drawable

---
 changelog.d/4860.bugfix                                     | 1 +
 library/ui-styles/src/main/res/values/colors.xml            | 6 ++++++
 vector/src/main/res/drawable/ic_shield_black.xml            | 2 +-
 vector/src/main/res/drawable/ic_shield_black_no_border.xml  | 2 +-
 vector/src/main/res/drawable/ic_shield_custom.xml           | 2 +-
 vector/src/main/res/drawable/ic_shield_trusted.xml          | 2 +-
 .../src/main/res/drawable/ic_shield_trusted_no_border.xml   | 2 +-
 vector/src/main/res/drawable/ic_shield_warning.xml          | 2 +-
 .../src/main/res/drawable/ic_shield_warning_no_border.xml   | 4 ++--
 vector/src/main/res/drawable/ic_shield_warning_small.xml    | 2 +-
 10 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 changelog.d/4860.bugfix

diff --git a/changelog.d/4860.bugfix b/changelog.d/4860.bugfix
new file mode 100644
index 0000000000..32049face4
--- /dev/null
+++ b/changelog.d/4860.bugfix
@@ -0,0 +1 @@
+Add colors for shield vector drawable
\ No newline at end of file
diff --git a/library/ui-styles/src/main/res/values/colors.xml b/library/ui-styles/src/main/res/values/colors.xml
index 1b214cfc59..75b03a7d2e 100644
--- a/library/ui-styles/src/main/res/values/colors.xml
+++ b/library/ui-styles/src/main/res/values/colors.xml
@@ -126,4 +126,10 @@
     <attr name="vctr_live_location" format="color" />
     <color name="vctr_live_location_light">@color/palette_prune</color>
     <color name="vctr_live_location_dark">@color/palette_prune</color>
+
+    <!-- Shield colors -->
+    <color name="shield_color_trust">#0DBD8B</color>
+    <color name="shield_color_black">#17191C</color>
+    <color name="shield_color_warning">#FF4B55</color>
+
 </resources>
diff --git a/vector/src/main/res/drawable/ic_shield_black.xml b/vector/src/main/res/drawable/ic_shield_black.xml
index 8ab70d981b..ddde3442b7 100644
--- a/vector/src/main/res/drawable/ic_shield_black.xml
+++ b/vector/src/main/res/drawable/ic_shield_black.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
-      android:fillColor="#17191C"
+      android:fillColor="@color/shield_color_black"
       android:strokeColor="#ffffff"/>
 </vector>
diff --git a/vector/src/main/res/drawable/ic_shield_black_no_border.xml b/vector/src/main/res/drawable/ic_shield_black_no_border.xml
index 1e322c77c3..f9fa5de9f6 100644
--- a/vector/src/main/res/drawable/ic_shield_black_no_border.xml
+++ b/vector/src/main/res/drawable/ic_shield_black_no_border.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#17191C"
+        android:fillColor="@color/shield_color_black"
         android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z" />
 </vector>
diff --git a/vector/src/main/res/drawable/ic_shield_custom.xml b/vector/src/main/res/drawable/ic_shield_custom.xml
index ca58f028d9..aa6cbabad3 100644
--- a/vector/src/main/res/drawable/ic_shield_custom.xml
+++ b/vector/src/main/res/drawable/ic_shield_custom.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#03B381"
+        android:fillColor="@color/shield_color_trust"
         android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
         android:strokeWidth="1"
         android:strokeColor="#ffffff" />
diff --git a/vector/src/main/res/drawable/ic_shield_trusted.xml b/vector/src/main/res/drawable/ic_shield_trusted.xml
index cac0cfcaf6..c122446a3c 100644
--- a/vector/src/main/res/drawable/ic_shield_trusted.xml
+++ b/vector/src/main/res/drawable/ic_shield_trusted.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
-      android:fillColor="#0DBD8B"
+      android:fillColor="@color/shield_color_trust"
       android:strokeColor="#ffffff"/>
   <path
       android:pathData="M17.4157,6.8094C17.1457,6.5244 16.6957,6.5094 16.4107,6.7794L10.0057,12.7794L7.6507,11.1294C7.3357,10.9194 6.9007,10.9194 6.6007,11.1894C6.2407,11.4894 6.2107,12.0294 6.5107,12.3894L9.2257,15.5094C9.2707,15.5544 9.3157,15.6144 9.3757,15.6444C9.8857,16.0644 10.6507,15.9894 11.0707,15.4794L11.1157,15.4194L17.4457,7.7544C17.6557,7.4844 17.6557,7.0794 17.4157,6.8094Z"
diff --git a/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
index 2266c23548..24bbbeeebb 100644
--- a/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
+++ b/vector/src/main/res/drawable/ic_shield_trusted_no_border.xml
@@ -5,7 +5,7 @@
     android:viewportHeight="24">
   <path
       android:pathData="M1.5,12.405V3.075L12,0L22.5,3.075V12.405C22.5,21.945 12,24 12,24C12,24 1.5,21.945 1.5,12.405Z"
-      android:fillColor="#0DBD8B"/>
+      android:fillColor="@color/shield_color_trust"/>
   <path
       android:pathData="M17.4157,6.8094C17.1457,6.5244 16.6957,6.5094 16.4107,6.7794L10.0057,12.7794L7.6507,11.1294C7.3357,10.9194 6.9007,10.9194 6.6007,11.1894C6.2407,11.4894 6.2107,12.0294 6.5107,12.3894L9.2257,15.5094C9.2707,15.5544 9.3157,15.6144 9.3757,15.6444C9.8857,16.0644 10.6507,15.9894 11.0707,15.4794L11.1157,15.4194L17.4457,7.7544C17.6557,7.4844 17.6557,7.0794 17.4157,6.8094Z"
       android:fillColor="#ffffff"/>
diff --git a/vector/src/main/res/drawable/ic_shield_warning.xml b/vector/src/main/res/drawable/ic_shield_warning.xml
index ace7d7dbae..237f2aa5fd 100644
--- a/vector/src/main/res/drawable/ic_shield_warning.xml
+++ b/vector/src/main/res/drawable/ic_shield_warning.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
-      android:fillColor="#FF4B55"
+      android:fillColor="@color/shield_color_warning"
       android:strokeColor="#ffffff"/>
   <path
       android:pathData="M10.8527,8.0725C10.7964,7.4313 11.2689,6.8688 11.9102,6.8238C12.5402,6.7788 13.1027,7.2513 13.1702,7.8925V8.0725L12.8102,12.5725C12.7764,12.9888 12.4277,13.3038 12.0114,13.3038H11.9439C11.5502,13.27 11.2464,12.9663 11.2127,12.5725L10.8527,8.0725ZM12.9888,15.5076C12.9888,16.0543 12.5456,16.4976 11.9988,16.4976C11.452,16.4976 11.0088,16.0543 11.0088,15.5076C11.0088,14.9608 11.452,14.5176 11.9988,14.5176C12.5456,14.5176 12.9888,14.9608 12.9888,15.5076Z"
diff --git a/vector/src/main/res/drawable/ic_shield_warning_no_border.xml b/vector/src/main/res/drawable/ic_shield_warning_no_border.xml
index 49698f273f..a16e905d99 100644
--- a/vector/src/main/res/drawable/ic_shield_warning_no_border.xml
+++ b/vector/src/main/res/drawable/ic_shield_warning_no_border.xml
@@ -6,11 +6,11 @@
   <path
       android:strokeWidth="1"
       android:pathData="M12.0077,23.4869C12.0051,23.4875 12.0025,23.4881 12,23.4886C11.9975,23.4881 11.9949,23.4875 11.9923,23.4869C11.9204,23.4706 11.8129,23.4452 11.6749,23.4092C11.3989,23.3373 11.0015,23.2235 10.5233,23.0575C9.5654,22.725 8.2921,22.186 7.0225,21.3608C4.4897,19.7145 2,16.954 2,12.405V3.4496L12,0.521L22,3.4496V12.405C22,16.954 19.5103,19.7145 16.9775,21.3608C15.7079,22.186 14.4346,22.725 13.4767,23.0575C12.9985,23.2235 12.6011,23.3373 12.3251,23.4092C12.1871,23.4452 12.0796,23.4706 12.0077,23.4869Z"
-      android:fillColor="#FF4B55"
+      android:fillColor="@color/shield_color_warning"
       android:strokeColor="#ffffff"/>
   <path
       android:pathData="M1.5,12.405V3.075L12,0L22.5,3.075V12.405C22.5,21.945 12,24 12,24C12,24 1.5,21.945 1.5,12.405Z"
-      android:fillColor="#FF4B55"/>
+      android:fillColor="@color/shield_color_warning"/>
   <path
       android:pathData="M10.8527,8.0725C10.7964,7.4313 11.2689,6.8688 11.9102,6.8238C12.5402,6.7788 13.1027,7.2513 13.1702,7.8925V8.0725L12.8102,12.5725C12.7764,12.9888 12.4277,13.3038 12.0114,13.3038H11.9439C11.5502,13.27 11.2464,12.9663 11.2127,12.5725L10.8527,8.0725ZM12.9888,15.5076C12.9888,16.0543 12.5456,16.4976 11.9988,16.4976C11.452,16.4976 11.0088,16.0543 11.0088,15.5076C11.0088,14.9608 11.452,14.5176 11.9988,14.5176C12.5456,14.5176 12.9888,14.9608 12.9888,15.5076Z"
       android:fillColor="#ffffff"
diff --git a/vector/src/main/res/drawable/ic_shield_warning_small.xml b/vector/src/main/res/drawable/ic_shield_warning_small.xml
index 69c1c70bc7..219edb8075 100644
--- a/vector/src/main/res/drawable/ic_shield_warning_small.xml
+++ b/vector/src/main/res/drawable/ic_shield_warning_small.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M6.0995,11.4627C6.0611,11.4727 6.0278,11.481 6,11.4876C5.9722,11.481 5.9389,11.4727 5.9005,11.4627C5.768,11.4282 5.5757,11.3731 5.3437,11.2926C4.8779,11.1309 4.2608,10.8694 3.6475,10.4708C2.4272,9.6776 1.25,8.3665 1.25,6.2025V1.9121L6,0.521L10.75,1.9121V6.2025C10.75,8.3665 9.5728,9.6776 8.3525,10.4708C7.7392,10.8694 7.1221,11.1309 6.6563,11.2926C6.4243,11.3731 6.232,11.4282 6.0995,11.4627Z"
-      android:fillColor="#FF4B55"
+      android:fillColor="@color/shield_color_warning"
       android:strokeColor="#ffffff"/>
   <path
       android:pathData="M5.4263,4.0363C5.3982,3.7156 5.6345,3.4344 5.9551,3.4119C6.2701,3.3894 6.5513,3.6256 6.5851,3.9463V4.0363L6.4051,6.2863C6.3882,6.4944 6.2138,6.6519 6.0057,6.6519H5.972C5.7751,6.635 5.6232,6.4831 5.6063,6.2863L5.4263,4.0363ZM6.4944,7.7538C6.4944,8.0272 6.2728,8.2488 5.9994,8.2488C5.726,8.2488 5.5044,8.0272 5.5044,7.7538C5.5044,7.4804 5.726,7.2588 5.9994,7.2588C6.2728,7.2588 6.4944,7.4804 6.4944,7.7538Z"