From 9960f87a64aa8f7239f4397c96d278812e42db19 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 29 Mar 2018 22:09:32 -0700
Subject: [PATCH] Fix inconsistent shortcut icons

Will Google ever quit being high and make a consistent UI/specs? I guess not.
---
 .../drawable-v26/ic_qu_camera_foreground.xml  | 12 -------
 .../drawable-v26/ic_qu_camera_launcher.xml    |  7 ++--
 .../ic_qu_shadowsocks_foreground.xml          | 18 ----------
 .../ic_qu_shadowsocks_launcher.xml            |  5 +--
 .../drawable/ic_app_shortcut_background.xml   | 21 ++++++++++++
 .../main/res/drawable/ic_image_camera_alt.xml | 12 +++++++
 .../res/drawable/ic_qu_camera_launcher.xml    | 34 +++++++++----------
 .../drawable/ic_qu_shadowsocks_foreground.xml | 11 ++++++
 .../drawable/ic_qu_shadowsocks_launcher.xml   | 32 ++++++++---------
 mobile/src/main/res/values/colors.xml         |  1 -
 plugin/src/main/res/values/colors.xml         |  2 ++
 11 files changed, 85 insertions(+), 70 deletions(-)
 delete mode 100644 mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
 delete mode 100644 mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
 create mode 100644 mobile/src/main/res/drawable/ic_app_shortcut_background.xml
 create mode 100644 mobile/src/main/res/drawable/ic_image_camera_alt.xml
 create mode 100644 mobile/src/main/res/drawable/ic_qu_shadowsocks_foreground.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
deleted file mode 100644
index a454dbb3..00000000
--- a/mobile/src/main/res/drawable-v26/ic_qu_camera_foreground.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<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"/>
-  <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"/>
-</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
index 799c7047..360b0364 100755
--- a/mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml
+++ b/mobile/src/main/res/drawable-v26/ic_qu_camera_launcher.xml
@@ -1,9 +1,10 @@
 <?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"/>
+    <background android:drawable="@color/material_grey_100"/>
     <foreground>
+        <!-- 44dp icon scaled to 52dp in 72dp, padding = (1-52/44*24/72)/2 -->
         <inset
-            android:drawable="@drawable/ic_qu_camera_foreground"
-            android:inset="9.26%"/>
+            android:drawable="@drawable/ic_image_camera_alt"
+            android:inset="30.303%"/>
     </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
deleted file mode 100644
index b2989495..00000000
--- a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_foreground.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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: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>
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
index b7309c2f..9392e5be 100755
--- a/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml
+++ b/mobile/src/main/res/drawable-v26/ic_qu_shadowsocks_launcher.xml
@@ -1,9 +1,10 @@
 <?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"/>
+    <background android:drawable="@color/material_grey_100"/>
     <foreground>
+        <!-- 44dp icon scaled to 52dp in 72dp, padding = (1-52/44*24/72)/2 -->
         <inset
             android:drawable="@drawable/ic_qu_shadowsocks_foreground"
-            android:inset="9.26%"/>
+            android:inset="30.303%"/>
     </foreground>
 </adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable/ic_app_shortcut_background.xml b/mobile/src/main/res/drawable/ic_app_shortcut_background.xml
new file mode 100644
index 00000000..d949e9f7
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_app_shortcut_background.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2017 Google Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software distributed under the License
+  is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+  or implied. See the License for the specific language governing permissions and limitations under
+  the License.
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="@color/material_grey_100" />
+    <size android:width="44dp" android:height="44dp" />
+</shape>
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable/ic_image_camera_alt.xml b/mobile/src/main/res/drawable/ic_image_camera_alt.xml
new file mode 100644
index 00000000..fb564d3e
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_image_camera_alt.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/material_primary_600"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path
+        android:fillColor="@color/material_primary_600"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_qu_camera_launcher.xml b/mobile/src/main/res/drawable/ic_qu_camera_launcher.xml
index 474bcf51..d0a97819 100644
--- a/mobile/src/main/res/drawable/ic_qu_camera_launcher.xml
+++ b/mobile/src/main/res/drawable/ic_qu_camera_launcher.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="48"
-        android:viewportHeight="48">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <path
-        android:fillColor="#f5f5f5"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
-    <path
-        android:fillColor="#546e7a"
-        android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
-C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
-    <path
-        android:fillColor="#546e7a"
-        android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
-A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
-A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />
-</vector>
\ No newline at end of file
+    <item
+        android:drawable="@drawable/ic_app_shortcut_background"
+        android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp" />
+
+    <item
+        android:drawable="@drawable/ic_image_camera_alt"
+        android:left="12dp"
+        android:top="12dp"
+        android:right="12dp"
+        android:bottom="12dp" />
+
+</layer-list>
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable/ic_qu_shadowsocks_foreground.xml b/mobile/src/main/res/drawable/ic_qu_shadowsocks_foreground.xml
new file mode 100644
index 00000000..471705b7
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_qu_shadowsocks_foreground.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:name="path"
+        android:fillColor="@color/material_blue_grey_600"
+        android:pathData="M 21.25 2.28 L 17.55 18.55 L 9.26 15.89 L 16.58 7.16 L 6.83 15.37 L 0 12.8 L 21.25 2.28 ZM 9.45 17.56 L 12.09 18.41 L 9.46 22 L 9.45 17.56 Z" />
+</vector>
\ No newline at end of file
diff --git a/mobile/src/main/res/drawable/ic_qu_shadowsocks_launcher.xml b/mobile/src/main/res/drawable/ic_qu_shadowsocks_launcher.xml
index 99518697..f8bdfcfe 100755
--- a/mobile/src/main/res/drawable/ic_qu_shadowsocks_launcher.xml
+++ b/mobile/src/main/res/drawable/ic_qu_shadowsocks_launcher.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <path
-        android:fillColor="#f5f5f5"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
-    <path
-        android:fillColor="#546e7a"
-        android:pathData="M34,14.72 L30.52,30.04 L22.72,27.53 L29.61,19.31 L20.43,27.04 L14,24.62
-L34,14.72 Z" />
-    <path
-        android:fillColor="#546e7a"
-        android:pathData="M22.89,29.1 L25.38,29.9 L22.9,33.28 L22.89,29.1 Z" />
-</vector>
+    <item
+        android:drawable="@drawable/ic_app_shortcut_background"
+        android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp" />
+
+    <item
+        android:drawable="@drawable/ic_qu_shadowsocks_foreground"
+        android:left="12dp"
+        android:top="12dp"
+        android:right="12dp"
+        android:bottom="12dp" />
+
+</layer-list>
\ 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 8f01a132..afa4fe44 100644
--- a/mobile/src/main/res/values/colors.xml
+++ b/mobile/src/main/res/values/colors.xml
@@ -2,5 +2,4 @@
 <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>
diff --git a/plugin/src/main/res/values/colors.xml b/plugin/src/main/res/values/colors.xml
index 549c9a08..e17b6e2d 100644
--- a/plugin/src/main/res/values/colors.xml
+++ b/plugin/src/main/res/values/colors.xml
@@ -7,10 +7,12 @@
   <color name="material_blue_grey_100">#CFD8DC</color>
   <color name="material_blue_grey_300">#90A4AE</color>
   <color name="material_blue_grey_500">#607D8B</color>
+  <color name="material_blue_grey_600">#546E7A</color>
   <color name="material_blue_grey_700">#455A64</color>
   <color name="material_primary_100">@color/material_blue_grey_100</color>
   <color name="material_primary_300">@color/material_blue_grey_300</color>
   <color name="material_primary_500">@color/material_blue_grey_500</color>
+  <color name="material_primary_600">@color/material_blue_grey_600</color>
   <color name="material_primary_700">@color/material_blue_grey_700</color>
   <color name="material_accent_200">@color/material_green_a700</color>