From 698b924603496f8d36bd925a406bc6f38c349cc2 Mon Sep 17 00:00:00 2001
From: onlymash <im@mash.im>
Date: Thu, 29 Mar 2018 16:29:09 +0800
Subject: [PATCH 1/2] add adaptive shortcut icon for android 8.0+

---
 .../res/drawable-v26/ic_qu_camera_foreground.xml   | 14 ++++++++++++++
 .../res/drawable-v26/ic_qu_camera_launcher.xml     |  9 +++++++++
 .../drawable-v26/ic_qu_shadowsocks_foreground.xml  | 14 ++++++++++++++
 .../drawable-v26/ic_qu_shadowsocks_launcher.xml    |  9 +++++++++
 mobile/src/main/res/values/colors.xml              |  1 +
 5 files changed, 47 insertions(+)
 create mode 100644 mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
 create mode 100755 mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml
 create mode 100644 mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
 create mode 100755 mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml

diff --git a/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml b/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
new file mode 100644
index 00000000..9585e97b
--- /dev/null
+++ b/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M60.4,54A6.4,6.4 0,0 1,54 60.4,6.4 6.4,0 0,1 47.6,54 6.4,6.4 0,0 1,54 47.6,6.4 6.4,0 0,1 60.4,54Z"
+      android:fillColor="#546e7a"
+      android:fillAlpha="1"/>
+  <path
+      android:pathData="m48,34 l-3.66,4L38,38c-2.21,0 -4,1.79 -4,4v24c0,2.21 1.79,4 4,4h32c2.21,0 4,-1.79 4,-4L74,42c0,-2.21 -1.79,-4 -4,-4L63.66,38L60,34ZM54,64c-5.52,0 -10,-4.48 -10,-10 0,-5.52 4.48,-10 10,-10 5.52,0 10,4.48 10,10 0,5.52 -4.48,10 -10,10z"
+      android:fillColor="#546e7a"
+      android:fillAlpha="1"/>
+</vector>
diff --git a/mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml b/mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml
new file mode 100755
index 00000000..799c7047
--- /dev/null
+++ b/mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shortcuts_background"/>
+    <foreground>
+        <inset
+            android:drawable="@drawable/ic_qu_camera_foreground"
+            android:inset="9.26%"/>
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
new file mode 100644
index 00000000..a0323268
--- /dev/null
+++ b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="108dp"
+    android:viewportHeight="108.0"
+    android:viewportWidth="108.0"
+    android:width="108dp">
+    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
+          android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
+    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
+          android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
+    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
+          android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
+    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
+          android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
+</vector>
diff --git a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml
new file mode 100755
index 00000000..b7309c2f
--- /dev/null
+++ b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shortcuts_background"/>
+    <foreground>
+        <inset
+            android:drawable="@drawable/ic_qu_shadowsocks_foreground"
+            android:inset="9.26%"/>
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml
index afa4fe44..8f01a132 100644
--- a/mobile/src/main/res/values/colors.xml
+++ b/mobile/src/main/res/values/colors.xml
@@ -2,4 +2,5 @@
 <resources>
     <color name="ic_launcher_background">#7488A1</color>
     <color name="material_drawer_selected_text">@color/material_accent_200</color>
+    <color name="ic_shortcuts_background">#F5F5F5</color>"
 </resources>

From 9a959d6aed621d9999ed573b3394f48b9a69b112 Mon Sep 17 00:00:00 2001
From: onlymash <im@mash.im>
Date: Thu, 29 Mar 2018 17:06:28 +0800
Subject: [PATCH 2/2] remove fillAlpha from shortcut icon

---
 .../drawable-v26/ic_qu_camera_foreground.xml  |  6 ++----
 .../ic_qu_shadowsocks_foreground.xml          | 20 +++++++++++--------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml b/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
index 9585e97b..a454dbb3 100644
--- a/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
+++ b/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
@@ -5,10 +5,8 @@
     android:viewportHeight="108">
   <path
       android:pathData="M60.4,54A6.4,6.4 0,0 1,54 60.4,6.4 6.4,0 0,1 47.6,54 6.4,6.4 0,0 1,54 47.6,6.4 6.4,0 0,1 60.4,54Z"
-      android:fillColor="#546e7a"
-      android:fillAlpha="1"/>
+      android:fillColor="#546e7a"/>
   <path
       android:pathData="m48,34 l-3.66,4L38,38c-2.21,0 -4,1.79 -4,4v24c0,2.21 1.79,4 4,4h32c2.21,0 4,-1.79 4,-4L74,42c0,-2.21 -1.79,-4 -4,-4L63.66,38L60,34ZM54,64c-5.52,0 -10,-4.48 -10,-10 0,-5.52 4.48,-10 10,-10 5.52,0 10,4.48 10,10 0,5.52 -4.48,10 -10,10z"
-      android:fillColor="#546e7a"
-      android:fillAlpha="1"/>
+      android:fillColor="#546e7a"/>
 </vector>
diff --git a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
index a0323268..b2989495 100644
--- a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
+++ b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
@@ -3,12 +3,16 @@
     android:viewportHeight="108.0"
     android:viewportWidth="108.0"
     android:width="108dp">
-    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
-          android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
-    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
-          android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
-    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
-          android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
-    <path android:fillAlpha="0.79" android:fillColor="#546e7a"
-          android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M70.94,35.7l-6.94,30.53l-15.56,-5l13.74,-16.38l-18.31,15.4l-12.81,-4.82l39.88,-19.73z"/>
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M48.79,64.37l4.96,1.6l-4.94,6.73l-0.02,-8.33z"/>
 </vector>