From 22c6bdeb11fb38fb6821a8103eb30f054969d79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Sun, 25 Jul 2021 21:03:01 +0700
Subject: [PATCH] Cherish:Update and Add icons for Cherish Settings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/drawable/ic_arrow.xml          |  9 +++------
 res/drawable/ic_block.xml          |  7 +++++++
 res/drawable/ic_dark_mode.xml      |  7 +++++++
 res/drawable/ic_signal.xml         |  2 +-
 res/drawable/ic_swipe.xml          | 12 +++---------
 res/drawable/ic_wifi.xml           |  2 +-
 res/xml/cherish_settings_misc.xml  |  2 ++
 res/xml/cherish_settings_theme.xml |  3 ++-
 8 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 res/drawable/ic_block.xml
 create mode 100644 res/drawable/ic_dark_mode.xml

diff --git a/res/drawable/ic_arrow.xml b/res/drawable/ic_arrow.xml
index 605638f..04b1ade 100644
--- a/res/drawable/ic_arrow.xml
+++ b/res/drawable/ic_arrow.xml
@@ -1,10 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
+    android:width="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6 -6,-6z"/>
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M5.5,4.14L4.5,5.86L15,12L4.5,18.14L5.5,19.86L19,12L5.5,4.14Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_block.xml b/res/drawable/ic_block.xml
new file mode 100644
index 0000000..0a39e45
--- /dev/null
+++ b/res/drawable/ic_block.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M12,0A12,12 0 0,1 24,12A12,12 0 0,1 12,24A12,12 0 0,1 0,12A12,12 0 0,1 12,0M12,2A10,10 0 0,0 2,12C2,14.4 2.85,16.6 4.26,18.33L18.33,4.26C16.6,2.85 14.4,2 12,2M12,22A10,10 0 0,0 22,12C22,9.6 21.15,7.4 19.74,5.67L5.67,19.74C7.4,21.15 9.6,22 12,22Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_dark_mode.xml b/res/drawable/ic_dark_mode.xml
new file mode 100644
index 0000000..bd17f40
--- /dev/null
+++ b/res/drawable/ic_dark_mode.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M17.75,4.09L15.22,6.03L16.13,9.09L13.5,7.28L10.87,9.09L11.78,6.03L9.25,4.09L12.44,4L13.5,1L14.56,4L17.75,4.09M21.25,11L19.61,12.25L20.2,14.23L18.5,13.06L16.8,14.23L17.39,12.25L15.75,11L17.81,10.95L18.5,9L19.19,10.95L21.25,11M18.97,15.95C19.8,15.87 20.69,17.05 20.16,17.8C19.84,18.25 19.5,18.67 19.08,19.07C15.17,23 8.84,23 4.94,19.07C1.03,15.17 1.03,8.83 4.94,4.93C5.34,4.53 5.76,4.17 6.21,3.85C6.96,3.32 8.14,4.21 8.06,5.04C7.79,7.9 8.75,10.87 10.95,13.06C13.14,15.26 16.1,16.22 18.97,15.95M17.33,17.97C14.5,17.81 11.7,16.64 9.53,14.5C7.36,12.31 6.2,9.5 6.04,6.68C3.23,9.82 3.34,14.64 6.35,17.66C9.37,20.67 14.19,20.78 17.33,17.97Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_signal.xml b/res/drawable/ic_signal.xml
index fcffb0d..080be4b 100644
--- a/res/drawable/ic_signal.xml
+++ b/res/drawable/ic_signal.xml
@@ -3,5 +3,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000000" android:pathData="M3,21H6V18H3M8,21H11V14H8M13,21H16V9H13M18,21H21V3H18V21Z" />
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M19.5,5.5V18.5H17.5V5.5H19.5M21,4H16V20H21V4M14,9H9V20H14V9M7,14H2V20H7V14Z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_swipe.xml b/res/drawable/ic_swipe.xml
index 8c757b8..2b86de9 100644
--- a/res/drawable/ic_swipe.xml
+++ b/res/drawable/ic_swipe.xml
@@ -1,13 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
+    android:width="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20.5,2v2.02C18.18,2.13 15.22,1 12,1S5.82,2.13 3.5,4.02V2H2v3.5V7h1.5H7V5.5H4.09c2.11,-1.86 4.88,-3 7.91,-3s5.79,1.14 7.91,3H17V7h3.5H22V5.5V2H20.5z"/>
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18.89,13.77l-3.8,-1.67C14.96,12.04 14.81,12 14.65,12H14l0,-4.37c0,-1.32 -0.96,-2.5 -2.27,-2.62C10.25,4.88 9,6.05 9,7.5v8.15l-1.87,-0.4c-0.19,-0.03 -1.02,-0.15 -1.73,0.56L4,17.22l5.12,5.19C9.49,22.79 10,23 10.53,23h6.55c0.98,0 1.81,-0.7 1.97,-1.67l0.92,-5.44C20.12,15.03 19.68,14.17 18.89,13.77zM18,15.56L17.08,21h-6.55l-3.7,-3.78L11,18.11V7.5C11,7.22 11.22,7 11.5,7S12,7.22 12,7.5v6.18h1.76L18,15.56z"/>
+    android:viewportHeight="24">
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M20.11,3.89L22,2V7H17L19.08,4.92C18.55,4.23 17.64,3.66 16.36,3.19C15.08,2.72 13.63,2.5 12,2.5C10.38,2.5 8.92,2.72 7.64,3.19C6.36,3.66 5.45,4.23 4.92,4.92L7,7H2V2L3.89,3.89C4.64,3 5.74,2.31 7.2,1.78C8.65,1.25 10.25,1 12,1C13.75,1 15.35,1.25 16.8,1.78C18.26,2.31 19.36,3 20.11,3.89M19.73,16.27V16.45L19,21.7C18.92,22.08 18.76,22.39 18.5,22.64C18.23,22.89 17.91,23 17.53,23H10.73C10.36,23 10,22.86 9.7,22.55L4.73,17.63L5.53,16.83C5.75,16.61 6,16.5 6.33,16.5H6.56L10,17.25V6.5C10,6.11 10.13,5.76 10.43,5.46C10.73,5.16 11.08,5 11.5,5C11.89,5 12.24,5.16 12.54,5.46C12.84,5.76 13,6.11 13,6.5V12.5H13.78C13.88,12.5 14.05,12.55 14.3,12.61L18.84,14.86C19.44,15.14 19.73,15.61 19.73,16.27Z" />
 </vector>
diff --git a/res/drawable/ic_wifi.xml b/res/drawable/ic_wifi.xml
index b742ee7..a886eb0 100644
--- a/res/drawable/ic_wifi.xml
+++ b/res/drawable/ic_wifi.xml
@@ -3,5 +3,5 @@
     android:width="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path android:fillColor="#000000" android:pathData="M4,6V4H4.1C12.9,4 20,11.1 20,19.9V20H18V19.9C18,12.2 11.8,6 4,6M4,10V8A12,12 0 0,1 16,20H14A10,10 0 0,0 4,10M4,14V12A8,8 0 0,1 12,20H10A6,6 0 0,0 4,14M4,16A4,4 0 0,1 8,20H4V16Z" />
+    <path android:fillColor="?android:attr/colorControlNormal" android:pathData="M6.18,15.64A2.18,2.18 0 0,1 8.36,17.82C8.36,19 7.38,20 6.18,20C5,20 4,19 4,17.82A2.18,2.18 0 0,1 6.18,15.64M4,4.44A15.56,15.56 0 0,1 19.56,20H16.73A12.73,12.73 0 0,0 4,7.27V4.44M4,10.1A9.9,9.9 0 0,1 13.9,20H11.07A7.07,7.07 0 0,0 4,12.93V10.1Z" />
 </vector>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_misc.xml b/res/xml/cherish_settings_misc.xml
index 436abb1..289c9d6 100644
--- a/res/xml/cherish_settings_misc.xml
+++ b/res/xml/cherish_settings_misc.xml
@@ -128,12 +128,14 @@
 		<Preference
             android:key="wakelock_blocker"
             android:title="@string/wakelock_blocker_title"
+			android:icon="@drawable/ic_block"
             android:summary="@string/wakelock_blocker_summary"
             android:fragment="com.cherish.settings.fragments.WakeLockBlocker" />
 			
 		<Preference
             android:key="alarm_blocker"
             android:title="@string/alarm_blocker"
+			android:icon="@drawable/ic_alarm"
             android:summary="@string/alarm_blocker_summary"
             android:fragment="com.cherish.settings.fragments.AlarmBlocker" />
 		
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 8ea6302..3c74108 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -29,6 +29,7 @@
 		<Preference
             android:key="dark_ui_mode"
             android:title="@string/dark_ui_mode"
+			 android:icon="@drawable/ic_dark_mode"
             android:summary="@string/dark_ui_mode_summary"
             android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
             settings:controller="com.android.settings.display.DarkUIPreferenceController" />
@@ -43,7 +44,7 @@
 
     <net.margaritov.preference.colorpicker.ColorPickerPreference
         android:key="gradient_color"
-        android:icon="@drawable/ic_gradient"
+        android:icon="@drawable/ic_accent_picker"
         android:title="@string/gradient_color"
         android:summary="@string/gradient_summary"
         android:defaultValue="0xffffff"