From ffcf8839329c9c69cf1e9f5653b6b33286473cf8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 19 Jul 2021 21:19:36 +0200
Subject: [PATCH] Replaced icons

---
 app/src/main/res/drawable/authenticated.xml   |  8 +++---
 .../main/res/drawable/twotone_gpp_bad_24.xml  | 15 +++++++++++
 .../main/res/drawable/twotone_gpp_good_24.xml | 15 +++++++++++
 ...shield_24.xml => twotone_gpp_maybe_24.xml} |  4 +--
 .../res/drawable/twotone_shield_check_24.xml  | 24 -----------------
 .../res/drawable/twotone_shield_cross_24.xml  | 24 -----------------
 .../drawable/twotone_shield_warning_24.xml    | 27 -------------------
 .../res/layout/fragment_options_display.xml   |  6 ++---
 8 files changed, 39 insertions(+), 84 deletions(-)
 create mode 100644 app/src/main/res/drawable/twotone_gpp_bad_24.xml
 create mode 100644 app/src/main/res/drawable/twotone_gpp_good_24.xml
 rename app/src/main/res/drawable/{twotone_shield_24.xml => twotone_gpp_maybe_24.xml} (77%)
 delete mode 100644 app/src/main/res/drawable/twotone_shield_check_24.xml
 delete mode 100644 app/src/main/res/drawable/twotone_shield_cross_24.xml
 delete mode 100644 app/src/main/res/drawable/twotone_shield_warning_24.xml

diff --git a/app/src/main/res/drawable/authenticated.xml b/app/src/main/res/drawable/authenticated.xml
index bf42703a60..3d7ea72d45 100644
--- a/app/src/main/res/drawable/authenticated.xml
+++ b/app/src/main/res/drawable/authenticated.xml
@@ -4,15 +4,15 @@
         android:drawable="@drawable/twotone_flag_24"
         android:maxLevel="0" />
     <item
-        android:drawable="@drawable/twotone_shield_cross_24"
+        android:drawable="@drawable/twotone_gpp_bad_24"
         android:maxLevel="1" />
     <item
-        android:drawable="@drawable/twotone_shield_warning_24"
+        android:drawable="@drawable/twotone_gpp_maybe_24"
         android:maxLevel="2" />
     <item
-        android:drawable="@drawable/twotone_shield_warning_24"
+        android:drawable="@drawable/twotone_gpp_maybe_24"
         android:maxLevel="3" />
     <item
-        android:drawable="@drawable/twotone_shield_check_24"
+        android:drawable="@drawable/twotone_gpp_good_24"
         android:maxLevel="4" />
 </level-list>
diff --git a/app/src/main/res/drawable/twotone_gpp_bad_24.xml b/app/src/main/res/drawable/twotone_gpp_bad_24.xml
new file mode 100644
index 0000000000..28f2bbb6fb
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_gpp_bad_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09zM9.91,8.5L8.5,9.91L10.59,12L8.5,14.09l1.41,1.41L12,13.42l2.09,2.08l1.41,-1.41L13.42,12l2.08,-2.09L14.09,8.5L12,10.59L9.91,8.5z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39zM15.5,9.91L13.42,12l2.08,2.09l-1.41,1.41L12,13.42L9.91,15.5L8.5,14.09L10.59,12L8.5,9.91L9.91,8.5L12,10.59l2.09,-2.09L15.5,9.91z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_gpp_good_24.xml b/app/src/main/res/drawable/twotone_gpp_good_24.xml
new file mode 100644
index 0000000000..6e5a539229
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_gpp_good_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M6,6.31v4.78c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83V6.31l-6,-2.12L6,6.31zM16.6,9.88l-5.66,5.66L7.4,12l1.41,-1.41l2.12,2.12l4.24,-4.24L16.6,9.88z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83V6.31l6,-2.12l6,2.12V11.09zM8.82,10.59L7.4,12l3.54,3.54l5.66,-5.66l-1.41,-1.41l-4.24,4.24L8.82,10.59z"/>
+</vector>
diff --git a/app/src/main/res/drawable/twotone_shield_24.xml b/app/src/main/res/drawable/twotone_gpp_maybe_24.xml
similarity index 77%
rename from app/src/main/res/drawable/twotone_shield_24.xml
rename to app/src/main/res/drawable/twotone_gpp_maybe_24.xml
index 0782edbf15..fc39401f0b 100644
--- a/app/src/main/res/drawable/twotone_shield_24.xml
+++ b/app/src/main/res/drawable/twotone_gpp_maybe_24.xml
@@ -6,10 +6,10 @@
     android:tint="?attr/colorControlNormal">
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
+      android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39zM13,16h-2v-2h2V16zM13,12h-2V7h2V12z"
       android:strokeAlpha="0.3"
       android:fillAlpha="0.3"/>
   <path
       android:fillColor="@android:color/white"
-      android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z"/>
+      android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09zM11,16h2v-2h-2V16zM11,12h2V7h-2V12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/twotone_shield_check_24.xml b/app/src/main/res/drawable/twotone_shield_check_24.xml
deleted file mode 100644
index 434e18aa03..0000000000
--- a/app/src/main/res/drawable/twotone_shield_check_24.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="@android:color/white"
-        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
-        android:strokeAlpha="0.3" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.5"
-        android:scaleY="0.5">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41L9,16.17z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/twotone_shield_cross_24.xml b/app/src/main/res/drawable/twotone_shield_cross_24.xml
deleted file mode 100644
index c92fe2300d..0000000000
--- a/app/src/main/res/drawable/twotone_shield_cross_24.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="@android:color/white"
-        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
-        android:strokeAlpha="0.3" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.5"
-        android:scaleY="0.5">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12 19,6.41z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/twotone_shield_warning_24.xml b/app/src/main/res/drawable/twotone_shield_warning_24.xml
deleted file mode 100644
index 6fb409d982..0000000000
--- a/app/src/main/res/drawable/twotone_shield_warning_24.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillAlpha="0.3"
-        android:fillColor="@android:color/white"
-        android:pathData="M6,6.39v4.7c0,4 2.55,7.7 6,8.83c3.45,-1.13 6,-4.82 6,-8.83v-4.7l-6,-2.25L6,6.39z"
-        android:strokeAlpha="0.3" />
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2L4,5v6.09c0,5.05 3.41,9.76 8,10.91c4.59,-1.15 8,-5.86 8,-10.91V5L12,2zM18,11.09c0,4 -2.55,7.7 -6,8.83c-3.45,-1.13 -6,-4.82 -6,-8.83v-4.7l6,-2.25l6,2.25V11.09z" />
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="0.5"
-        android:scaleY="0.5">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0" />
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M10,3h4v12h-4z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index a5f87afcf4..cb3637adb0 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1459,7 +1459,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
-                    android:drawableStart="@drawable/twotone_shield_cross_24"
+                    android:drawableStart="@drawable/twotone_gpp_bad_24"
                     android:drawablePadding="6dp"
                     android:drawableTint="?attr/colorSeparator"
                     android:text="@string/title_advanced_authentication_none"
@@ -1474,7 +1474,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
-                    android:drawableStart="@drawable/twotone_shield_warning_24"
+                    android:drawableStart="@drawable/twotone_gpp_maybe_24"
                     android:drawablePadding="6dp"
                     android:drawableTint="?attr/colorSeparator"
                     android:text="@string/title_advanced_authentication_some"
@@ -1489,7 +1489,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
-                    android:drawableStart="@drawable/twotone_shield_check_24"
+                    android:drawableStart="@drawable/twotone_gpp_good_24"
                     android:drawablePadding="6dp"
                     android:drawableTint="?attr/colorControlNormal"
                     android:text="@string/title_advanced_authentication_all"