From 726cd5debd400dd458b8f26e3be66ec8462fd7f4 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Fri, 26 Apr 2024 12:17:28 -0500
Subject: [PATCH] Update shortcut icons to be adaptive (#1312)

---
 .../drawable/ic_generator_shortcut_foreground.xml | 10 ++++++++++
 .../drawable/ic_my_vault_shortcut_foreground.xml  | 15 +++++++++++++++
 .../res/mipmap-anydpi/ic_generator_shortcut.xml   |  6 ++++++
 .../main/res/mipmap-anydpi/ic_vault_shortcut.xml  |  6 ++++++
 .../res/values-night/ic_launcher_background.xml   |  1 +
 .../main/res/values/ic_launcher_background.xml    |  1 +
 app/src/main/res/xml/shortcuts.xml                |  4 ++--
 app/src/release/res/xml/shortcuts.xml             |  4 ++--
 8 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_generator_shortcut_foreground.xml
 create mode 100644 app/src/main/res/drawable/ic_my_vault_shortcut_foreground.xml
 create mode 100644 app/src/main/res/mipmap-anydpi/ic_generator_shortcut.xml
 create mode 100644 app/src/main/res/mipmap-anydpi/ic_vault_shortcut.xml

diff --git a/app/src/main/res/drawable/ic_generator_shortcut_foreground.xml b/app/src/main/res/drawable/ic_generator_shortcut_foreground.xml
new file mode 100644
index 0000000000..2c93629f53
--- /dev/null
+++ b/app/src/main/res/drawable/ic_generator_shortcut_foreground.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#000"
+        android:pathData="M74.96,56.69c-0.43,-0.09 -0.87,-0.01 -1.24,0.22 -0.37,0.23 -0.63,0.6 -0.73,1.02 -0.94,3.85 -3.09,7.31 -6.13,9.89s-6.82,4.16 -10.82,4.5c-3.94,0.43 -7.92,-0.36 -11.38,-2.28 -3.46,-1.91 -6.23,-4.85 -7.92,-8.39 -0.06,-0.16 0.08,-0.4 0.41,-0.35l2.6,1.05c0.41,0.17 0.86,0.17 1.27,0.01 0.41,-0.16 0.74,-0.48 0.91,-0.88 0.08,-0.2 0.13,-0.4 0.13,-0.62s-0.04,-0.42 -0.13,-0.62c-0.08,-0.2 -0.2,-0.37 -0.36,-0.52 -0.15,-0.15 -0.33,-0.27 -0.53,-0.34l-6.64,-2.68c-0.39,-0.16 -0.83,-0.17 -1.22,-0.02 -0.4,0.15 -0.72,0.43 -0.91,0.8l-3.11,6.2c-0.09,0.19 -0.15,0.4 -0.16,0.61 -0.01,0.21 0.02,0.42 0.09,0.62 0.07,0.2 0.18,0.38 0.33,0.54 0.15,0.16 0.32,0.28 0.51,0.37 0.23,0.1 0.47,0.16 0.72,0.16 0.31,0 0.61,-0.08 0.88,-0.24 0.26,-0.16 0.48,-0.39 0.62,-0.66l1,-2c0.03,-0.05 0.08,-0.1 0.13,-0.13 0.05,-0.03 0.11,-0.06 0.18,-0.06 0.06,0 0.13,0 0.19,0.02 0.06,0.02 0.11,0.06 0.16,0.1 1.81,3.76 4.66,6.94 8.23,9.17 3.56,2.23 7.69,3.42 11.91,3.43 0.78,0 1.58,-0.04 2.4,-0.11 4.68,-0.45 9.1,-2.32 12.66,-5.35 3.56,-3.03 6.08,-7.07 7.23,-11.58 0.04,-0.21 0.05,-0.42 0,-0.63 -0.04,-0.21 -0.12,-0.41 -0.24,-0.58 -0.12,-0.18 -0.27,-0.33 -0.45,-0.45 -0.18,-0.12 -0.38,-0.2 -0.59,-0.24h0ZM78.08,42.18c-0.23,-0.1 -0.47,-0.16 -0.72,-0.16 -0.31,0 -0.61,0.08 -0.88,0.24 -0.26,0.16 -0.48,0.39 -0.62,0.66l-1,2c-0.03,0.05 -0.08,0.1 -0.13,0.13 -0.05,0.03 -0.11,0.06 -0.18,0.06 -0.06,0 -0.13,0 -0.19,-0.02 -0.06,-0.02 -0.11,-0.06 -0.16,-0.1 -1.81,-3.76 -4.66,-6.94 -8.22,-9.18 -3.56,-2.23 -7.69,-3.42 -11.91,-3.44 -0.78,0 -1.58,0.03 -2.4,0.11 -4.68,0.45 -9.1,2.32 -12.66,5.35 -3.56,3.03 -6.08,7.08 -7.22,11.58 -0.04,0.21 -0.05,0.42 0,0.63 0.04,0.21 0.12,0.41 0.24,0.58 0.12,0.18 0.27,0.33 0.45,0.45 0.18,0.12 0.38,0.2 0.59,0.24 0.43,0.09 0.87,0.01 1.24,-0.22 0.37,-0.23 0.63,-0.6 0.73,-1.02 0.94,-3.85 3.09,-7.31 6.13,-9.89 3.04,-2.58 6.82,-4.16 10.82,-4.5 3.94,-0.43 7.92,0.37 11.38,2.28 3.46,1.91 6.23,4.85 7.92,8.39 0.06,0.16 -0.08,0.4 -0.41,0.35l-2.6,-1.06c-0.41,-0.17 -0.86,-0.17 -1.27,-0.01 -0.41,0.16 -0.74,0.48 -0.92,0.87 -0.08,0.2 -0.13,0.41 -0.13,0.62s0.04,0.42 0.13,0.62c0.08,0.2 0.2,0.37 0.36,0.52s0.33,0.27 0.53,0.34l6.62,2.68c0.39,0.16 0.83,0.17 1.22,0.02 0.4,-0.15 0.72,-0.43 0.91,-0.8l3.11,-6.21c0.09,-0.19 0.15,-0.39 0.16,-0.6 0.01,-0.21 -0.02,-0.42 -0.09,-0.62 -0.07,-0.2 -0.18,-0.38 -0.32,-0.54 -0.14,-0.16 -0.31,-0.28 -0.51,-0.37h0Z"
+        android:strokeWidth="0" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_my_vault_shortcut_foreground.xml b/app/src/main/res/drawable/ic_my_vault_shortcut_foreground.xml
new file mode 100644
index 0000000000..49e17ee300
--- /dev/null
+++ b/app/src/main/res/drawable/ic_my_vault_shortcut_foreground.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#000"
+        android:pathData="M55.5,63.43c0.46,-0.41 0.75,-1.01 0.75,-1.68 0,-1.24 -1.01,-2.25 -2.25,-2.25s-2.25,1.01 -2.25,2.25c0,0.67 0.29,1.27 0.75,1.68v5.07c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-5.07Z"
+        android:strokeWidth="0" />
+    <path
+        android:fillColor="#000"
+        android:fillType="evenOdd"
+        android:pathData="M40.52,43v-1.5c0,-7.46 6.04,-13.5 13.48,-13.5s13.48,6.04 13.48,13.5v1.5h1.5c2.48,0 4.49,2.01 4.49,4.5v24c0,2.49 -2.01,4.5 -4.49,4.5h-29.96c-2.48,0 -4.49,-2.01 -4.49,-4.5v-24c0,-2.49 2.01,-4.5 4.49,-4.5h1.5ZM54,31c5.79,0 10.48,4.7 10.48,10.5v1.5h-20.97v-1.5c0,-5.8 4.69,-10.5 10.48,-10.5ZM39.02,46c-0.83,0 -1.5,0.67 -1.5,1.5v24c0,0.83 0.67,1.5 1.5,1.5h29.96c0.83,0 1.5,-0.67 1.5,-1.5v-24c0,-0.83 -0.67,-1.5 -1.5,-1.5h-29.96Z"
+        android:strokeWidth="0" />
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi/ic_generator_shortcut.xml b/app/src/main/res/mipmap-anydpi/ic_generator_shortcut.xml
new file mode 100644
index 0000000000..84d13fe8bd
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi/ic_generator_shortcut.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shortcut_background" />
+    <foreground android:drawable="@drawable/ic_generator_shortcut_foreground" />
+    <monochrome android:drawable="@drawable/ic_generator_shortcut_foreground" />
+</adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi/ic_vault_shortcut.xml b/app/src/main/res/mipmap-anydpi/ic_vault_shortcut.xml
new file mode 100644
index 0000000000..2dedbb816c
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi/ic_vault_shortcut.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shortcut_background" />
+    <foreground android:drawable="@drawable/ic_my_vault_shortcut_foreground" />
+    <monochrome android:drawable="@drawable/ic_my_vault_shortcut_foreground" />
+</adaptive-icon>
diff --git a/app/src/main/res/values-night/ic_launcher_background.xml b/app/src/main/res/values-night/ic_launcher_background.xml
index 93629affd2..e265dcc8d9 100644
--- a/app/src/main/res/values-night/ic_launcher_background.xml
+++ b/app/src/main/res/values-night/ic_launcher_background.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">@color/dark_gray</color>
+    <color name="ic_shortcut_background">@color/white</color>
 </resources>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index e53878f026..8487c053c3 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">@color/blue_175DDC</color>
+    <color name="ic_shortcut_background">@color/white</color>
 </resources>
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index ebca17b345..05c9b4412a 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -2,7 +2,7 @@
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_generator"
+        android:icon="@mipmap/ic_generator_shortcut"
         android:shortcutId="bitwarden_password_generator"
         android:shortcutLongLabel="@string/password_generator"
         android:shortcutShortLabel="@string/password_generator">
@@ -14,7 +14,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_vault"
+        android:icon="@mipmap/ic_vault_shortcut"
         android:shortcutId="bitwarden_my_vault"
         android:shortcutLongLabel="@string/my_vault"
         android:shortcutShortLabel="@string/my_vault">
diff --git a/app/src/release/res/xml/shortcuts.xml b/app/src/release/res/xml/shortcuts.xml
index ffd41be48f..74a764b2d7 100644
--- a/app/src/release/res/xml/shortcuts.xml
+++ b/app/src/release/res/xml/shortcuts.xml
@@ -2,7 +2,7 @@
 <shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_generator"
+        android:icon="@mipmap/ic_generator_shortcut"
         android:shortcutId="bitwarden_password_generator"
         android:shortcutLongLabel="@string/password_generator"
         android:shortcutShortLabel="@string/password_generator">
@@ -14,7 +14,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_vault"
+        android:icon="@mipmap/ic_vault_shortcut"
         android:shortcutId="bitwarden_my_vault"
         android:shortcutLongLabel="@string/my_vault"
         android:shortcutShortLabel="@string/my_vault">