From 4b4f5d145be0d5dfa260307ec1e0c7f995ef9815 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Sun, 13 Aug 2023 15:01:07 -0400
Subject: [PATCH] Update UI: a concept for launching icon

---
 .../com/v2ray/ang/receiver/WidgetProvider.kt   |  8 +++++++-
 .../kotlin/com/v2ray/ang/ui/MainActivity.kt    | 10 ++++++++--
 .../ic_qu_switch_24dp.xml}                     |  2 +-
 ...scan_black_24dp.xml => ic_qu_scan_24dp.xml} |  6 +++---
 ..._black_24dp.xml => ic_qu_settings_24dp.xml} |  4 ++--
 .../main/res/drawable/ic_qu_switch_24dp.xml    | 18 ++++++++++++++++++
 ..._theme.xml => ic_rounded_corner_active.xml} |  2 +-
 .../res/drawable/ic_rounded_corner_grey.xml    |  2 +-
 .../res/drawable/ic_shortcut_background.xml    |  2 +-
 .../app/src/main/res/layout/activity_main.xml  |  2 +-
 .../app/src/main/res/layout/widget_switch.xml  |  3 ++-
 .../app/src/main/res/values-night/colors.xml   |  1 +
 V2rayNG/app/src/main/res/values/colors.xml     |  1 +
 V2rayNG/app/src/main/res/xml/shortcuts.xml     |  6 +++---
 14 files changed, 50 insertions(+), 17 deletions(-)
 rename V2rayNG/app/src/main/res/{drawable/ic_qu_switch_black_24dp.xml => drawable-night/ic_qu_switch_24dp.xml} (88%)
 rename V2rayNG/app/src/main/res/drawable/{ic_qu_scan_black_24dp.xml => ic_qu_scan_24dp.xml} (83%)
 rename V2rayNG/app/src/main/res/drawable/{ic_qu_settings_black_24dp.xml => ic_qu_settings_24dp.xml} (99%)
 create mode 100644 V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
 rename V2rayNG/app/src/main/res/drawable/{ic_rounded_corner_theme.xml => ic_rounded_corner_active.xml} (82%)

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt
index 826bf24f..42856ecf 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/receiver/WidgetProvider.kt
@@ -38,12 +38,18 @@ class WidgetProvider : AppWidgetProvider() {
             })
         remoteViews.setOnClickPendingIntent(R.id.layout_switch, pendingIntent)
         if (isRunning) {
+            if (!Utils.getDarkModeStatus(context)) {
+                remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name)
+            }
             remoteViews.setInt(
                 R.id.layout_switch,
                 "setBackgroundResource",
-                R.drawable.ic_rounded_corner_theme
+                R.drawable.ic_rounded_corner_active
             )
         } else {
+            if (!Utils.getDarkModeStatus(context)) {
+                remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name_black)
+            }
             remoteViews.setInt(
                 R.id.layout_switch,
                 "setBackgroundResource",
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
index 7160055c..54a94b06 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
@@ -131,11 +131,17 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         mainViewModel.isRunning.observe(this) { isRunning ->
             adapter.isRunning = isRunning
             if (isRunning) {
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.colorSelected))
+                if (!Utils.getDarkModeStatus(this)) {
+                    binding.fab.setImageResource(R.drawable.ic_stat_name)
+                }
+                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_orange))
                 setTestState(getString(R.string.connection_connected))
                 binding.layoutTest.isFocusable = true
             } else {
-                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.colorUnselected))
+                if (!Utils.getDarkModeStatus(this)) {
+                    binding.fab.setImageResource(R.drawable.ic_stat_name_black)
+                }
+                binding.fab.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(this, R.color.color_fab_grey))
                 setTestState(getString(R.string.connection_not_connected))
                 binding.layoutTest.isFocusable = false
             }
diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml
similarity index 88%
rename from V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml
rename to V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml
index a2faae56..97f8859d 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_black_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable-night/ic_qu_switch_24dp.xml
@@ -9,7 +9,7 @@
         android:bottom="2dp" />
 
     <item
-        android:drawable="@drawable/ic_stat_name_grey"
+        android:drawable="@drawable/ic_stat_name"
         android:left="12dp"
         android:top="12dp"
         android:right="12dp"
diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
similarity index 83%
rename from V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml
rename to V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
index e0b32bf4..ae86efb1 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_black_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="48">
 
     <path
-        android:fillColor="#999999"
+        android:fillColor="@color/colorBg"
         android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/colorText"
         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="#ffffff"
+        android:fillColor="@color/colorText"
         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" />
diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml
similarity index 99%
rename from V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml
rename to V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml
index 063171a3..d8b29fc4 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_qu_settings_black_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_qu_settings_24dp.xml
@@ -4,10 +4,10 @@
     android:viewportHeight="1024"
     android:viewportWidth="1024">
     <path
-        android:fillColor="#999999"
+        android:fillColor="@color/colorBg"
         android:pathData="M0,512C0,229.23 229.81,0 512,0 794.77,0 1024,229.81 1024,512 1024,794.77 794.19,1024 512,1024 229.23,1024 0,794.19 0,512Z" />
 
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/colorText"
         android:pathData="M515.24,389.28c-67.56,0 -122.33,54.77 -122.33,122.33 0,67.58 54.77,122.35 122.33,122.35 67.58,0 122.34,-54.77 122.34,-122.35C637.57,444.04 582.81,389.28 515.24,389.28L515.24,389.28zM582.53,578.9c-17.98,17.98 -41.87,27.87 -67.29,27.87 -25.41,0 -49.31,-9.89 -67.28,-27.87s-27.87,-41.86 -27.87,-67.29c0,-25.42 9.91,-49.31 27.87,-67.28 17.97,-17.98 41.87,-27.87 67.28,-27.87 25.43,0 49.32,9.91 67.29,27.87 17.97,17.97 27.86,41.86 27.86,67.28C610.39,537.03 600.5,560.92 582.53,578.9L582.53,578.9zM816.2,588.62c0.18,-0.2 0.36,-0.43 0.52,-0.66 0.08,-0.12 0.15,-0.22 0.25,-0.35 0.15,-0.2 0.29,-0.43 0.43,-0.66 0.08,-0.14 0.16,-0.27 0.24,-0.41 0.12,-0.2 0.22,-0.42 0.34,-0.64 0.07,-0.17 0.15,-0.33 0.22,-0.48 0.09,-0.2 0.16,-0.4 0.24,-0.6 0.07,-0.19 0.15,-0.38 0.22,-0.57 0.06,-0.18 0.11,-0.39 0.17,-0.57 0.06,-0.21 0.12,-0.42 0.17,-0.64 0,-0.01 0,-0.02 0,-0.04 5.46,-23.29 8.23,-47.32 8.23,-71.43 0,-24.1 -2.77,-48.14 -8.23,-71.42 0,-0.02 0,-0.04 -0.01,-0.06 -0.09,-0.38 -0.2,-0.74 -0.32,-1.11 -0.02,-0.06 -0.04,-0.13 -0.07,-0.19 -0.14,-0.4 -0.3,-0.78 -0.46,-1.16 -0.02,-0.03 -0.02,-0.06 -0.04,-0.1 -0.18,-0.41 -0.4,-0.79 -0.62,-1.18l0,0c-1.99,-3.39 -5.4,-5.81 -9.39,-6.5 -0.01,0 -0.02,-0.01 -0.04,-0.01 -0.28,-0.04 -0.56,-0.07 -0.86,-0.1 -0.17,-0.01 -0.34,-0.05 -0.51,-0.06 -0.19,-0.01 -0.38,-0.01 -0.56,-0.01 -0.28,-0.01 -0.56,-0.02 -0.85,-0.01 -0.02,0 -0.04,0 -0.07,0 -1.29,0.06 -2.41,0.08 -3.48,0.08 -44.92,0 -81.45,-36.54 -81.45,-81.45 0,-15.84 4.55,-31.2 13.16,-44.4 0.02,-0.02 0.02,-0.04 0.04,-0.06 0.17,-0.28 0.34,-0.57 0.49,-0.85 0.07,-0.11 0.12,-0.22 0.17,-0.33 0.14,-0.28 0.26,-0.56 0.38,-0.84 0.06,-0.14 0.14,-0.27 0.19,-0.42 0.09,-0.22 0.15,-0.45 0.22,-0.67 0.07,-0.2 0.14,-0.41 0.2,-0.61 0.04,-0.15 0.07,-0.3 0.1,-0.45 0.07,-0.28 0.14,-0.56 0.19,-0.85 0.01,-0.07 0.02,-0.14 0.03,-0.2 0.07,-0.37 0.12,-0.74 0.14,-1.11 0,-0.03 0,-0.06 0,-0.09 0.03,-0.4 0.04,-0.8 0.04,-1.21 -0.01,-0.1 -0.02,-0.21 -0.04,-0.31 -0.01,-0.33 -0.03,-0.65 -0.07,-0.98 -0.02,-0.26 -0.09,-0.51 -0.12,-0.77 -0.02,-0.17 -0.04,-0.34 -0.09,-0.51 -0.08,-0.33 -0.17,-0.67 -0.25,-1 -0.04,-0.09 -0.05,-0.17 -0.07,-0.26 -0.12,-0.31 -0.22,-0.61 -0.35,-0.92 -0.04,-0.1 -0.07,-0.2 -0.12,-0.3 -0.11,-0.25 -0.22,-0.48 -0.35,-0.72 -0.08,-0.17 -0.14,-0.33 -0.22,-0.48 -0.09,-0.17 -0.2,-0.33 -0.3,-0.5 -0.13,-0.22 -0.27,-0.45 -0.4,-0.66 -0.09,-0.11 -0.16,-0.22 -0.24,-0.33 -0.2,-0.26 -0.38,-0.51 -0.6,-0.76 -0.06,-0.08 -0.15,-0.16 -0.22,-0.24 -0.22,-0.26 -0.46,-0.51 -0.72,-0.77 -0.02,-0.01 -0.03,-0.03 -0.04,-0.04 -35.58,-34.22 -79.25,-59.78 -126.27,-73.91 -0.1,-0.04 -0.21,-0.06 -0.32,-0.08 -0.25,-0.07 -0.51,-0.14 -0.77,-0.19 -0.18,-0.04 -0.38,-0.08 -0.56,-0.11 -0.25,-0.04 -0.51,-0.08 -0.75,-0.11 -0.2,-0.02 -0.4,-0.04 -0.61,-0.05 -0.22,-0.02 -0.46,-0.03 -0.7,-0.03 -0.22,-0.01 -0.44,0 -0.65,0 -0.22,0.01 -0.43,0.03 -0.64,0.04 -0.23,0.01 -0.46,0.04 -0.69,0.08 -0.2,0.02 -0.4,0.06 -0.6,0.09 -0.23,0.04 -0.46,0.09 -0.69,0.14 -0.2,0.05 -0.4,0.1 -0.6,0.16 -0.22,0.06 -0.43,0.13 -0.64,0.2 -0.21,0.07 -0.41,0.14 -0.61,0.22 -0.2,0.08 -0.4,0.16 -0.59,0.25 -0.2,0.1 -0.42,0.19 -0.62,0.3 -0.17,0.09 -0.35,0.18 -0.52,0.28 -0.21,0.12 -0.42,0.25 -0.63,0.38 -0.15,0.1 -0.32,0.21 -0.47,0.3 -0.2,0.15 -0.4,0.29 -0.6,0.45 -0.14,0.11 -0.3,0.23 -0.44,0.35 -0.17,0.16 -0.36,0.32 -0.53,0.48 -0.15,0.14 -0.3,0.28 -0.44,0.43 -0.15,0.17 -0.32,0.34 -0.46,0.51 -0.15,0.17 -0.3,0.35 -0.44,0.53 -0.14,0.16 -0.25,0.33 -0.38,0.5 -0.15,0.21 -0.29,0.42 -0.42,0.62 -0.1,0.16 -0.21,0.33 -0.31,0.5 -0.13,0.23 -0.25,0.46 -0.37,0.69 -0.05,0.1 -0.11,0.19 -0.15,0.3 -6.5,13.8 -16.71,25.48 -29.54,33.79 -13.16,8.52 -28.45,13.02 -44.21,13.02 -15.75,0 -31.04,-4.5 -44.2,-13.02 -12.83,-8.32 -23.05,-19.99 -29.55,-33.79 -0.04,-0.11 -0.1,-0.2 -0.15,-0.29 -0.12,-0.24 -0.25,-0.48 -0.37,-0.71 -0.1,-0.17 -0.2,-0.33 -0.3,-0.5 -0.14,-0.21 -0.28,-0.43 -0.43,-0.62 -0.12,-0.17 -0.25,-0.33 -0.37,-0.5 -0.14,-0.18 -0.29,-0.35 -0.44,-0.53 -0.14,-0.17 -0.3,-0.34 -0.46,-0.5 -0.15,-0.15 -0.3,-0.3 -0.45,-0.44 -0.17,-0.17 -0.35,-0.33 -0.53,-0.48 -0.15,-0.12 -0.3,-0.25 -0.46,-0.37 -0.2,-0.15 -0.39,-0.29 -0.59,-0.43 -0.16,-0.11 -0.33,-0.22 -0.48,-0.33 -0.2,-0.12 -0.4,-0.25 -0.61,-0.37 -0.17,-0.1 -0.35,-0.19 -0.53,-0.29 -0.2,-0.1 -0.4,-0.19 -0.61,-0.29 -0.2,-0.09 -0.4,-0.17 -0.6,-0.25 -0.2,-0.08 -0.4,-0.15 -0.59,-0.22 -0.22,-0.07 -0.44,-0.14 -0.66,-0.2 -0.2,-0.06 -0.39,-0.11 -0.59,-0.16 -0.23,-0.05 -0.46,-0.1 -0.69,-0.14 -0.2,-0.03 -0.4,-0.07 -0.6,-0.09 -0.23,-0.03 -0.46,-0.06 -0.69,-0.08 -0.22,-0.01 -0.43,-0.03 -0.64,-0.03 -0.22,-0.01 -0.44,-0.01 -0.66,-0.01 -0.23,0 -0.46,0.01 -0.71,0.03 -0.2,0.01 -0.4,0.03 -0.6,0.05 -0.25,0.03 -0.51,0.07 -0.76,0.11 -0.19,0.03 -0.38,0.07 -0.57,0.11 -0.25,0.05 -0.51,0.12 -0.77,0.19 -0.11,0.03 -0.21,0.04 -0.31,0.08 -46.64,14.02 -90.02,39.3 -125.43,73.1 -0.04,0.04 -0.07,0.08 -0.11,0.12 -0.2,0.2 -0.4,0.4 -0.59,0.61 -0.12,0.13 -0.23,0.26 -0.35,0.39 -0.17,0.21 -0.33,0.42 -0.48,0.64 -0.12,0.15 -0.23,0.3 -0.34,0.46 -0.13,0.19 -0.25,0.39 -0.37,0.59 -0.12,0.19 -0.23,0.38 -0.34,0.56 -0.09,0.18 -0.17,0.36 -0.26,0.54 -0.11,0.22 -0.22,0.45 -0.32,0.66 -0.07,0.17 -0.12,0.34 -0.18,0.51 -0.09,0.24 -0.18,0.48 -0.27,0.74 -0.05,0.17 -0.09,0.34 -0.14,0.51 -0.07,0.24 -0.14,0.48 -0.18,0.74 -0.04,0.2 -0.07,0.39 -0.1,0.59 -0.04,0.23 -0.08,0.46 -0.11,0.69 -0.02,0.22 -0.04,0.45 -0.05,0.67 -0.01,0.2 -0.03,0.4 -0.04,0.61 0,0.25 0.01,0.5 0.02,0.75 0.01,0.18 0.01,0.35 0.01,0.55 0.02,0.25 0.06,0.51 0.09,0.77 0.02,0.17 0.04,0.35 0.07,0.53 0.04,0.24 0.1,0.48 0.16,0.72 0.04,0.19 0.09,0.39 0.14,0.58 0.06,0.21 0.13,0.42 0.2,0.62 0.08,0.22 0.14,0.45 0.23,0.66 0.07,0.18 0.15,0.35 0.23,0.53 0.1,0.24 0.21,0.48 0.34,0.73 0.07,0.15 0.17,0.3 0.25,0.46 0.14,0.24 0.28,0.48 0.43,0.73 0.03,0.04 0.05,0.09 0.08,0.14 8.89,13.36 13.6,28.94 13.6,45.06 0,44.92 -36.54,81.45 -81.47,81.45 -1.47,0 -3.01,-0.04 -4.59,-0.13 -0.04,0 -0.09,0 -0.14,0 -0.3,-0.01 -0.59,-0.01 -0.87,0 -0.17,0 -0.35,0 -0.51,0.01 -0.27,0.01 -0.53,0.04 -0.79,0.07 -0.2,0.03 -0.39,0.04 -0.58,0.08 -0.22,0.03 -0.43,0.08 -0.64,0.12 -0.23,0.05 -0.46,0.09 -0.7,0.16 -0.16,0.04 -0.31,0.09 -0.47,0.14 -0.27,0.08 -0.54,0.17 -0.8,0.27 -0.12,0.04 -0.24,0.1 -0.35,0.14 -0.29,0.12 -0.59,0.24 -0.86,0.38 -0.11,0.05 -0.2,0.11 -0.3,0.16 -0.29,0.15 -0.57,0.3 -0.85,0.46 -0.11,0.07 -0.2,0.14 -0.31,0.21 -0.25,0.17 -0.51,0.34 -0.75,0.53 -0.12,0.09 -0.23,0.19 -0.35,0.28 -0.21,0.18 -0.43,0.35 -0.64,0.53 -0.14,0.12 -0.26,0.26 -0.39,0.39 -0.17,0.18 -0.35,0.35 -0.53,0.53 -0.14,0.15 -0.26,0.3 -0.38,0.46 -0.15,0.18 -0.31,0.36 -0.45,0.56 -0.12,0.16 -0.22,0.33 -0.34,0.48 -0.14,0.2 -0.27,0.4 -0.4,0.61 -0.09,0.16 -0.17,0.32 -0.26,0.48 -0.13,0.24 -0.26,0.46 -0.38,0.71 -0.07,0.15 -0.13,0.3 -0.2,0.46 -0.11,0.26 -0.22,0.51 -0.32,0.79 -0.06,0.15 -0.09,0.3 -0.15,0.46 -0.09,0.27 -0.17,0.56 -0.25,0.85 -0.01,0.05 -0.03,0.1 -0.04,0.15 -5.47,23.32 -8.24,47.37 -8.24,71.49 0,24.13 2.77,48.19 8.24,71.5 0.01,0.04 0.02,0.08 0.03,0.12 0.05,0.2 0.12,0.42 0.17,0.62 0.06,0.19 0.11,0.38 0.18,0.57 0.07,0.2 0.14,0.38 0.22,0.57 0.08,0.2 0.16,0.4 0.25,0.6 0.08,0.17 0.16,0.33 0.24,0.49 0.11,0.21 0.22,0.42 0.34,0.63 0.08,0.14 0.16,0.27 0.25,0.42 0.14,0.22 0.28,0.44 0.43,0.66 0.08,0.11 0.15,0.22 0.24,0.34 0.17,0.22 0.35,0.45 0.53,0.66 0.07,0.09 0.14,0.17 0.22,0.27 0.22,0.24 0.45,0.46 0.68,0.69 0.05,0.06 0.11,0.12 0.16,0.17 0.3,0.28 0.61,0.53 0.92,0.79 0.01,0.01 0.02,0.02 0.04,0.02 0.3,0.24 0.61,0.46 0.92,0.66 0.14,0.09 0.27,0.17 0.41,0.25 0.2,0.13 0.4,0.25 0.61,0.36 0.16,0.09 0.33,0.15 0.5,0.25 0.19,0.09 0.38,0.17 0.58,0.27 0.17,0.07 0.35,0.14 0.53,0.2 0.2,0.07 0.4,0.14 0.61,0.21 0.17,0.06 0.35,0.11 0.52,0.15 0.23,0.07 0.46,0.12 0.7,0.18 0.16,0.03 0.31,0.07 0.46,0.1 0.3,0.05 0.6,0.1 0.9,0.13 0.1,0.01 0.2,0.03 0.3,0.04 0.43,0.04 0.85,0.07 1.27,0.07 0.28,0 0.56,-0.01 0.84,-0.04 1.54,-0.09 3.06,-0.13 4.52,-0.13 44.93,0 81.47,36.54 81.47,81.45 0,16.12 -4.7,31.71 -13.6,45.07 -0.03,0.04 -0.05,0.09 -0.07,0.14 -0.16,0.23 -0.3,0.48 -0.44,0.74 -0.09,0.15 -0.17,0.3 -0.25,0.45 -0.13,0.24 -0.24,0.48 -0.34,0.74 -0.08,0.18 -0.15,0.34 -0.22,0.51 -0.09,0.22 -0.16,0.45 -0.23,0.68 -0.07,0.2 -0.14,0.4 -0.2,0.61 -0.06,0.19 -0.09,0.39 -0.14,0.59 -0.06,0.24 -0.12,0.48 -0.16,0.71 -0.03,0.17 -0.05,0.37 -0.07,0.54 -0.04,0.25 -0.07,0.51 -0.09,0.77 -0.01,0.17 -0.01,0.36 -0.01,0.53 -0.01,0.25 -0.02,0.51 -0.02,0.75 0.01,0.2 0.02,0.41 0.04,0.61 0.01,0.22 0.02,0.46 0.05,0.69 0.02,0.22 0.07,0.46 0.11,0.69 0.03,0.19 0.05,0.39 0.09,0.59 0.06,0.25 0.13,0.48 0.18,0.74 0.05,0.17 0.09,0.35 0.14,0.51 0.07,0.25 0.17,0.5 0.26,0.74 0.07,0.16 0.13,0.33 0.19,0.49 0.09,0.24 0.2,0.46 0.32,0.68 0.09,0.17 0.17,0.35 0.26,0.52 0.11,0.2 0.22,0.39 0.34,0.58 0.12,0.2 0.23,0.4 0.36,0.59 0.11,0.15 0.22,0.31 0.34,0.46 0.15,0.21 0.31,0.42 0.48,0.63 0.11,0.13 0.23,0.25 0.35,0.39 0.18,0.2 0.38,0.42 0.58,0.61 0.04,0.04 0.07,0.08 0.11,0.11 35.42,33.81 78.78,59.09 125.43,73.11 0.14,0.04 0.29,0.08 0.43,0.12 0.15,0.03 0.29,0.07 0.44,0.11 0.38,0.09 0.74,0.16 1.11,0.21 0.11,0.02 0.22,0.02 0.32,0.04 0.3,0.03 0.59,0.06 0.88,0.08 0.14,0.01 0.27,0.01 0.4,0.01 0.11,0.01 0.22,0.02 0.33,0.02 0.17,0 0.33,-0.02 0.48,-0.02 0.14,-0.01 0.28,-0.01 0.43,-0.02 0.33,-0.03 0.66,-0.06 0.99,-0.11 0.07,-0.01 0.14,-0.01 0.21,-0.02 0.41,-0.07 0.8,-0.15 1.2,-0.25 0.09,-0.02 0.17,-0.05 0.26,-0.08 0.3,-0.09 0.6,-0.17 0.89,-0.27 0.14,-0.05 0.27,-0.1 0.4,-0.15 0.25,-0.11 0.48,-0.19 0.71,-0.3 0.15,-0.07 0.3,-0.13 0.44,-0.2 0.22,-0.11 0.44,-0.22 0.65,-0.35 0.14,-0.08 0.28,-0.16 0.42,-0.24 0.27,-0.15 0.53,-0.34 0.79,-0.53 0.14,-0.1 0.29,-0.2 0.43,-0.32 0.24,-0.17 0.46,-0.35 0.68,-0.54 0.12,-0.11 0.23,-0.22 0.35,-0.33 0.18,-0.18 0.36,-0.35 0.53,-0.53 0.11,-0.12 0.22,-0.23 0.33,-0.35 0.18,-0.2 0.36,-0.43 0.53,-0.64 0.08,-0.1 0.16,-0.2 0.24,-0.31 0.5,-0.68 0.94,-1.41 1.31,-2.19 0.01,-0.01 0.03,-0.05 0.04,-0.08 6.5,-13.79 16.71,-25.48 29.55,-33.79 13.16,-8.52 28.44,-13.03 44.2,-13.03 15.76,0 31.05,4.51 44.21,13.03 12.83,8.3 23.04,20 29.54,33.79 0.01,0.04 0.04,0.07 0.06,0.1 0.08,0.17 0.16,0.33 0.24,0.48 0.08,0.15 0.15,0.3 0.25,0.46s0.19,0.3 0.27,0.46c0.09,0.15 0.19,0.3 0.29,0.44 0.1,0.14 0.19,0.27 0.3,0.41 0.1,0.15 0.21,0.31 0.35,0.46 0.09,0.11 0.17,0.22 0.27,0.33 0.14,0.17 0.29,0.33 0.44,0.48 0.09,0.09 0.17,0.17 0.25,0.27 0.18,0.17 0.37,0.35 0.56,0.51 0.07,0.05 0.13,0.11 0.19,0.17 0.25,0.2 0.51,0.42 0.76,0.61 0.02,0.01 0.02,0.02 0.04,0.02 0.56,0.42 1.14,0.77 1.76,1.08 0.09,0.05 0.17,0.09 0.25,0.14 0.22,0.1 0.44,0.2 0.66,0.3 0.12,0.06 0.24,0.1 0.36,0.15 0.2,0.08 0.38,0.15 0.57,0.22 0.14,0.04 0.28,0.09 0.43,0.13 0.17,0.07 0.35,0.12 0.53,0.16 0.15,0.04 0.3,0.08 0.46,0.11 0.18,0.05 0.36,0.09 0.53,0.12 0.16,0.03 0.31,0.06 0.47,0.09 0.18,0.02 0.38,0.06 0.59,0.07 0.14,0.01 0.27,0.04 0.42,0.04 0.3,0.03 0.61,0.04 0.91,0.04 0.04,0 0.07,0 0.1,0l0,0 0.02,0c0.29,0 0.59,-0.01 0.88,-0.04 0.07,0 0.14,-0.01 0.19,-0.01 0.26,-0.02 0.51,-0.05 0.76,-0.09 0.06,-0.01 0.12,-0.01 0.15,-0.02 0.61,-0.09 1.23,-0.22 1.84,-0.4 0.02,-0.01 0.04,-0.02 0.07,-0.02 47.03,-14.13 90.69,-39.69 126.27,-73.91 0.02,-0.01 0.04,-0.03 0.05,-0.05 0.24,-0.23 0.47,-0.47 0.69,-0.72 0.08,-0.1 0.17,-0.18 0.25,-0.28 0.2,-0.24 0.39,-0.48 0.56,-0.74 0.08,-0.12 0.17,-0.22 0.26,-0.35 0.14,-0.21 0.25,-0.43 0.4,-0.64 0.1,-0.17 0.22,-0.34 0.31,-0.52 0.08,-0.15 0.15,-0.3 0.22,-0.45 0.12,-0.25 0.24,-0.49 0.36,-0.75 0.03,-0.08 0.06,-0.17 0.1,-0.25 0.12,-0.33 0.23,-0.65 0.35,-0.98 0.02,-0.07 0.03,-0.14 0.05,-0.19 0.11,-0.36 0.2,-0.71 0.27,-1.07 0.04,-0.15 0.05,-0.3 0.09,-0.46 0.04,-0.27 0.1,-0.54 0.13,-0.82 0.03,-0.31 0.05,-0.63 0.07,-0.95 0,-0.12 0.02,-0.22 0.02,-0.35 0,-0.39 -0.01,-0.79 -0.04,-1.18 0,-0.04 0,-0.08 0,-0.11 -0.02,-0.37 -0.08,-0.73 -0.14,-1.09 -0.01,-0.07 -0.01,-0.14 -0.02,-0.21 -0.06,-0.29 -0.13,-0.56 -0.2,-0.85 -0.04,-0.15 -0.06,-0.3 -0.1,-0.45 -0.06,-0.21 -0.13,-0.41 -0.2,-0.61 -0.08,-0.22 -0.14,-0.46 -0.22,-0.68 -0.05,-0.14 -0.14,-0.27 -0.19,-0.42 -0.12,-0.27 -0.24,-0.56 -0.38,-0.83 -0.05,-0.12 -0.12,-0.22 -0.17,-0.33 -0.15,-0.28 -0.32,-0.57 -0.49,-0.85 -0.02,-0.01 -0.02,-0.04 -0.04,-0.06 -8.6,-13.21 -13.16,-28.56 -13.16,-44.4 0,-44.92 36.55,-81.45 81.47,-81.45 1,0 2.08,0.02 3.27,0.07l0.02,0c0.07,0 0.12,0 0.17,0.01 0.07,0 0.12,0 0.17,0 0.14,0 0.27,0.01 0.41,0.01 0.43,0 0.85,-0.02 1.29,-0.07 0.09,-0.01 0.18,-0.03 0.27,-0.04 0.32,-0.04 0.64,-0.09 0.94,-0.14 0.15,-0.03 0.3,-0.06 0.46,-0.1 0.24,-0.05 0.48,-0.12 0.73,-0.17 0.16,-0.05 0.33,-0.1 0.5,-0.15 0.22,-0.07 0.42,-0.15 0.64,-0.22 0.18,-0.07 0.34,-0.13 0.52,-0.2 0.2,-0.09 0.4,-0.18 0.59,-0.28 0.16,-0.08 0.33,-0.15 0.48,-0.24 0.22,-0.12 0.45,-0.25 0.66,-0.39 0.12,-0.08 0.24,-0.14 0.36,-0.22 0.34,-0.21 0.66,-0.45 0.98,-0.69 0.06,-0.05 0.1,-0.1 0.15,-0.14 0.26,-0.2 0.52,-0.43 0.75,-0.66 0.09,-0.08 0.16,-0.15 0.24,-0.23 0.22,-0.21 0.42,-0.43 0.62,-0.65C816.04,588.82 816.12,588.72 816.2,588.62L816.2,588.62zM693.09,674.87c0,17.22 4.06,34.03 11.78,49.21 -28.24,25.19 -61.43,44.66 -97.04,56.92 -8.46,-13.79 -19.92,-25.55 -33.62,-34.43 -17.57,-11.37 -37.96,-17.38 -58.97,-17.38 -21.02,0 -41.4,6.01 -58.98,17.38 -13.7,8.88 -25.16,20.64 -33.63,34.43 -35.22,-12.13 -68.1,-31.31 -96.13,-56.12 8,-15.39 12.19,-32.45 12.19,-50.01 0,-58 -45.71,-105.54 -103,-108.49 -3.5,-17.98 -5.27,-36.35 -5.27,-54.8 0,-18.43 1.78,-36.82 5.27,-54.79 57.29,-2.96 103,-50.48 103,-108.5 0,-17.55 -4.19,-34.62 -12.19,-50 28.03,-24.8 60.91,-43.99 96.13,-56.12 8.47,13.79 19.93,25.55 33.63,34.42 17.57,11.39 37.96,17.39 58.98,17.39 21.01,0 41.4,-6.01 58.97,-17.39 13.7,-8.87 25.16,-20.63 33.62,-34.42 35.6,12.25 68.79,31.72 97.04,56.9 -7.72,15.19 -11.78,31.99 -11.78,49.22 0,57.56 45.01,104.81 101.67,108.41 3.5,18 5.3,36.41 5.3,54.87 0,18.47 -1.79,36.88 -5.3,54.88C738.1,570.07 693.09,617.31 693.09,674.87L693.09,674.87zM693.09,674.87" />
 </vector>
diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
new file mode 100644
index 00000000..73d5e641
--- /dev/null
+++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:drawable="@drawable/ic_shortcut_background"
+        android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp" />
+
+    <item
+        android:drawable="@drawable/ic_stat_name_black"
+        android:left="12dp"
+        android:top="12dp"
+        android:right="12dp"
+        android:bottom="12dp" />
+
+</layer-list>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
similarity index 82%
rename from V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml
rename to V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
index afc2118b..e486ba48 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_theme.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorSelected"/>
+    <solid android:color="@color/color_fab_orange"/>
     <corners android:radius="20dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml
index 50af166d..5b8ac8bd 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/colorUnselected"/>
+    <solid android:color="@color/color_fab_grey"/>
     <corners android:radius="20dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>
diff --git a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml
index a62b720b..1ce21f0a 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_shortcut_background.xml
@@ -2,6 +2,6 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/colorUnselected" />
+    <solid android:color="@color/colorBg" />
     <size android:width="44dp" android:height="44dp" />
 </shape>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index 3bb3aaa2..2bfe6128 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -91,7 +91,7 @@
                         android:clickable="true"
                         android:focusable="true"
                         android:nextFocusLeft="@+id/layout_test"
-                        android:src="@drawable/ic_stat_name_grey"
+                        android:src="@drawable/ic_stat_name"
                         app:layout_anchorGravity="bottom|right|end" />
 
                 </com.github.jorgecastilloprz.FABProgressCircle>
diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml
index 209489d2..84d65952 100644
--- a/V2rayNG/app/src/main/res/layout/widget_switch.xml
+++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml
@@ -8,8 +8,9 @@
         android:orientation="vertical">
 
     <ImageView
+            android:id="@+id/image_switch"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:padding="10dp"
-            android:src="@drawable/ic_stat_name_grey" />
+            android:src="@drawable/ic_stat_name" />
 </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml
index 82982116..b23a1aef 100644
--- a/V2rayNG/app/src/main/res/values-night/colors.xml
+++ b/V2rayNG/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="color_fab_grey">#424242</color>
     <color name="color_secondary">#BDBDBD</color>
     <color name="colorSelected">#FFFFFF</color>
     <color name="colorUnselected">#222222</color>
diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml
index 7dcdab0a..9daf3d36 100644
--- a/V2rayNG/app/src/main/res/values/colors.xml
+++ b/V2rayNG/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="colorPingRed">#FF0099</color>
     <color name="color_fab_orange">#f97910</color>
 
+    <color name="color_fab_grey">#EDEDED</color>
     <color name="color_secondary">#727272</color>
     <color name="colorSelected">#000000</color>
     <color name="colorUnselected">#FFFFFF</color>
diff --git a/V2rayNG/app/src/main/res/xml/shortcuts.xml b/V2rayNG/app/src/main/res/xml/shortcuts.xml
index 3e5f3656..9db1e36f 100644
--- a/V2rayNG/app/src/main/res/xml/shortcuts.xml
+++ b/V2rayNG/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_qu_switch_black_24dp"
+        android:icon="@drawable/ic_qu_switch_24dp"
         android:shortcutDisabledMessage="@string/app_widget_name"
         android:shortcutId="shortcuts_switch"
         android:shortcutLongLabel="@string/app_widget_name"
@@ -16,7 +16,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_qu_scan_black_24dp"
+        android:icon="@drawable/ic_qu_scan_24dp"
         android:shortcutDisabledMessage="@string/menu_item_import_config_qrcode"
         android:shortcutId="shortcuts_scan"
         android:shortcutLongLabel="@string/menu_item_import_config_qrcode"
@@ -30,7 +30,7 @@
     </shortcut>
     <shortcut
         android:enabled="true"
-        android:icon="@drawable/ic_qu_settings_black_24dp"
+        android:icon="@drawable/ic_qu_settings_24dp"
         android:shortcutDisabledMessage="@string/title_settings"
         android:shortcutId="shortcuts_settings"
         android:shortcutLongLabel="@string/title_settings"