From e70e5a137613aa11204c05c93836f26c0bc687a3 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 5 Mar 2022 08:44:05 +0100
Subject: [PATCH] Updated key icons

---
 .../email/EditTextMultiAutoComplete.java      |  4 +--
 .../res/drawable/twotone_vpn_key_24_b.xml     | 32 +++++++++++++------
 ..._key_24_l.xml => twotone_vpn_key_24_p.xml} | 19 ++++++++---
 ..._key_24_r.xml => twotone_vpn_key_24_s.xml} | 19 ++++++++---
 4 files changed, 53 insertions(+), 21 deletions(-)
 rename app/src/main/res/drawable/{twotone_vpn_key_24_l.xml => twotone_vpn_key_24_p.xml} (71%)
 rename app/src/main/res/drawable/{twotone_vpn_key_24_r.xml => twotone_vpn_key_24_s.xml} (69%)

diff --git a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
index 0068156acf..effe0505da 100644
--- a/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
+++ b/app/src/main/java/eu/faircode/email/EditTextMultiAutoComplete.java
@@ -75,8 +75,8 @@ public class EditTextMultiAutoComplete extends AppCompatMultiAutoCompleteTextVie
     private static ExecutorService executor = Helper.getBackgroundExecutor(1, "chips");
 
     private static int[] icons = new int[]{
-            R.drawable.twotone_vpn_key_24_r,
-            R.drawable.twotone_vpn_key_24_l,
+            R.drawable.twotone_vpn_key_24_p,
+            R.drawable.twotone_vpn_key_24_s,
             R.drawable.twotone_vpn_key_24_b
     };
 
diff --git a/app/src/main/res/drawable/twotone_vpn_key_24_b.xml b/app/src/main/res/drawable/twotone_vpn_key_24_b.xml
index 8b7290d8df..0529e239de 100644
--- a/app/src/main/res/drawable/twotone_vpn_key_24_b.xml
+++ b/app/src/main/res/drawable/twotone_vpn_key_24_b.xml
@@ -4,7 +4,11 @@
     android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group android:translateY="-2">
+
+    <group
+        android:rotation="-90"
+        android:translateX="-5"
+        android:translateY="24">
         <path
             android:fillAlpha="0.3"
             android:fillColor="@android:color/white"
@@ -15,13 +19,23 @@
             android:pathData="M7,5c-3.86,0 -7,3.14 -7,7s3.14,7 7,7c2.72,0 5.17,-1.58 6.32,-4L16,15v4h6v-4h2L24,9L13.32,9C12.17,6.58 9.72,5 7,5zM22,13h-2v4h-2v-4h-6.06l-0.23,0.67C11.01,15.66 9.11,17 7,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5c2.11,0 4.01,1.34 4.71,3.33l0.23,0.67L22,11v2zM7,9c-1.65,0 -3,1.35 -3,3s1.35,3 3,3 3,-1.35 3,-3 -1.35,-3 -3,-3zM7,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
     </group>
 
-    <path
-        android:pathData="M0,24 L10,24z"
-        android:strokeWidth="5"
-        android:strokeColor="@android:color/white" />
+    <group
+        android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="-2"
+        android:translateY="-8">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M21.5,10.5v1c0,0.8 -0.7,1.5 -1.5,1.5h-2v2h-1.5V9H20C20.8,9 21.5,9.7 21.5,10.5zM20,10.5h-2v1h2V10.5z" />
+    </group>
 
-    <path
-        android:pathData="M14,24 L24,24z"
-        android:strokeWidth="5"
-        android:strokeColor="@android:color/white" />
+    <group
+        android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="11.9"
+        android:translateY="3">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M10,14v-1.75c0,-0.55 -0.45,-1 -1,-1H6.5V10.5H10V9H6c-0.55,0 -1,0.45 -1,1v1.75c0,0.55 0.45,1 1,1h2.5v0.75H5V15h4C9.55,15 10,14.55 10,14z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/twotone_vpn_key_24_l.xml b/app/src/main/res/drawable/twotone_vpn_key_24_p.xml
similarity index 71%
rename from app/src/main/res/drawable/twotone_vpn_key_24_l.xml
rename to app/src/main/res/drawable/twotone_vpn_key_24_p.xml
index aadad08eda..a6a8139371 100644
--- a/app/src/main/res/drawable/twotone_vpn_key_24_l.xml
+++ b/app/src/main/res/drawable/twotone_vpn_key_24_p.xml
@@ -4,7 +4,11 @@
     android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group android:translateY="-2">
+
+    <group
+        android:rotation="-90"
+        android:translateX="-5"
+        android:translateY="24">
         <path
             android:fillAlpha="0.3"
             android:fillColor="@android:color/white"
@@ -15,8 +19,13 @@
             android:pathData="M7,5c-3.86,0 -7,3.14 -7,7s3.14,7 7,7c2.72,0 5.17,-1.58 6.32,-4L16,15v4h6v-4h2L24,9L13.32,9C12.17,6.58 9.72,5 7,5zM22,13h-2v4h-2v-4h-6.06l-0.23,0.67C11.01,15.66 9.11,17 7,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5c2.11,0 4.01,1.34 4.71,3.33l0.23,0.67L22,11v2zM7,9c-1.65,0 -3,1.35 -3,3s1.35,3 3,3 3,-1.35 3,-3 -1.35,-3 -3,-3zM7,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
     </group>
 
-    <path
-        android:pathData="M0,24 L10,24z"
-        android:strokeWidth="5"
-        android:strokeColor="@android:color/white" />
+    <group
+        android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="-2"
+        android:translateY="-8">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M21.5,10.5v1c0,0.8 -0.7,1.5 -1.5,1.5h-2v2h-1.5V9H20C20.8,9 21.5,9.7 21.5,10.5zM20,10.5h-2v1h2V10.5z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/twotone_vpn_key_24_r.xml b/app/src/main/res/drawable/twotone_vpn_key_24_s.xml
similarity index 69%
rename from app/src/main/res/drawable/twotone_vpn_key_24_r.xml
rename to app/src/main/res/drawable/twotone_vpn_key_24_s.xml
index e0192e9fa3..e6c2315d87 100644
--- a/app/src/main/res/drawable/twotone_vpn_key_24_r.xml
+++ b/app/src/main/res/drawable/twotone_vpn_key_24_s.xml
@@ -4,7 +4,11 @@
     android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group android:translateY="-2">
+
+    <group
+        android:rotation="-90"
+        android:translateX="-5"
+        android:translateY="24">
         <path
             android:fillAlpha="0.3"
             android:fillColor="@android:color/white"
@@ -15,8 +19,13 @@
             android:pathData="M7,5c-3.86,0 -7,3.14 -7,7s3.14,7 7,7c2.72,0 5.17,-1.58 6.32,-4L16,15v4h6v-4h2L24,9L13.32,9C12.17,6.58 9.72,5 7,5zM22,13h-2v4h-2v-4h-6.06l-0.23,0.67C11.01,15.66 9.11,17 7,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5c2.11,0 4.01,1.34 4.71,3.33l0.23,0.67L22,11v2zM7,9c-1.65,0 -3,1.35 -3,3s1.35,3 3,3 3,-1.35 3,-3 -1.35,-3 -3,-3zM7,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z" />
     </group>
 
-    <path
-        android:pathData="M14,24 L24,24z"
-        android:strokeWidth="5"
-        android:strokeColor="@android:color/white" />
+    <group
+        android:scaleX="1.2"
+        android:scaleY="1.2"
+        android:translateX="11.9"
+        android:translateY="3">
+        <path
+            android:fillColor="@android:color/white"
+            android:pathData="M10,14v-1.75c0,-0.55 -0.45,-1 -1,-1H6.5V10.5H10V9H6c-0.55,0 -1,0.45 -1,1v1.75c0,0.55 0.45,1 1,1h2.5v0.75H5V15h4C9.55,15 10,14.55 10,14z" />
+    </group>
 </vector>