From 33430bff8debf1c0bf0adde023f652e4551860ac Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 21 Apr 2024 16:31:34 +0800
Subject: [PATCH] Adjust UI

---
 .../com/v2ray/ang/receiver/WidgetProvider.kt  | 22 +++++--------------
 .../main/res/drawable-night/ic_scan_24dp.xml  | 17 ++++----------
 .../src/main/res/drawable/ic_play_24dp.xml    |  2 +-
 .../src/main/res/drawable/ic_qu_scan_24dp.xml | 17 ++++----------
 .../main/res/drawable/ic_qu_switch_24dp.xml   |  5 +----
 .../res/drawable/ic_rounded_corner_active.xml |  6 -----
 .../res/drawable/ic_rounded_corner_grey.xml   |  6 -----
 .../src/main/res/drawable/ic_scan_24dp.xml    | 17 ++++----------
 .../main/res/drawable/ic_select_all_24dp.xml  |  4 ++--
 .../src/main/res/drawable/ic_stop_24dp.xml    |  2 +-
 .../app/src/main/res/layout/widget_switch.xml |  4 ++--
 .../app/src/main/res/values-night/colors.xml  |  1 -
 V2rayNG/app/src/main/res/values/colors.xml    |  1 -
 13 files changed, 24 insertions(+), 80 deletions(-)
 delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
 delete mode 100644 V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml

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 42856ecf..46b4d078 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
@@ -8,8 +8,8 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.widget.RemoteViews
-import com.v2ray.ang.R
 import com.v2ray.ang.AppConfig
+import com.v2ray.ang.R
 import com.v2ray.ang.service.V2RayServiceManager
 import com.v2ray.ang.util.Utils
 
@@ -38,23 +38,11 @@ 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_active
-            )
+            remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name)
+            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.color.color_fab_orange)
         } 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",
-                R.drawable.ic_rounded_corner_grey
-            )
+            remoteViews.setInt(R.id.image_switch, "setImageResource", R.drawable.ic_stat_name_black)
+            remoteViews.setInt(R.id.layout_switch, "setBackgroundResource", R.color.color_fab_grey)
         }
 
         for (appWidgetId in appWidgetIds) {
diff --git a/V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml b/V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml
index a31063ba..9e260e7d 100644
--- a/V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable-night/ic_scan_24dp.xml
@@ -1,19 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
 
     <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="#000000"
-        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="#000000"
-        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" />
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M181.333333 384a32 32 0 0 1-64 0v-111.146667a155.52 155.52 0 0 1 155.52-155.52H384a32 32 0 0 1 0 64h-111.146667a91.52 91.52 0 0 0-91.52 91.52V384zM640 181.333333a32 32 0 0 1 0-64h111.146667a155.52 155.52 0 0 1 155.52 155.52V384a32 32 0 0 1-64 0v-111.146667a91.52 91.52 0 0 0-91.52-91.52H640zM842.666667 640a32 32 0 0 1 64 0v111.146667a155.52 155.52 0 0 1-155.52 155.52H640a32 32 0 0 1 0-64h111.146667a91.52 91.52 0 0 0 91.52-91.52V640zM384 842.666667a32 32 0 0 1 0 64h-111.146667a155.52 155.52 0 0 1-155.52-155.52V640a32 32 0 0 1 64 0v111.146667a91.52 91.52 0 0 0 91.52 91.52H384z m-192-298.666667a32 32 0 0 1 0-64h640a32 32 0 0 1 0 64H192z" />
 </vector>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml
index 935408fb..a3bc803f 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_play_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="#424242"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M213.333333 789.461333V234.538667C213.333333 168.533333 285.013333 127.530667 341.930667 160.981333l471.68 277.461334c56.106667 32.981333 56.106667 114.133333 0 147.114666L341.930667 863.018667C285.056 896.469333 213.333333 855.466667 213.333333 789.461333z" />
 </vector>
diff --git a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
index ae86efb1..f7cc6c32 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
@@ -1,19 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
 
     <path
-        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="@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="@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" />
+        android:fillColor="#FF000000"
+        android:pathData="M181.333333 384a32 32 0 0 1-64 0v-111.146667a155.52 155.52 0 0 1 155.52-155.52H384a32 32 0 0 1 0 64h-111.146667a91.52 91.52 0 0 0-91.52 91.52V384zM640 181.333333a32 32 0 0 1 0-64h111.146667a155.52 155.52 0 0 1 155.52 155.52V384a32 32 0 0 1-64 0v-111.146667a91.52 91.52 0 0 0-91.52-91.52H640zM842.666667 640a32 32 0 0 1 64 0v111.146667a155.52 155.52 0 0 1-155.52 155.52H640a32 32 0 0 1 0-64h111.146667a91.52 91.52 0 0 0 91.52-91.52V640zM384 842.666667a32 32 0 0 1 0 64h-111.146667a155.52 155.52 0 0 1-155.52-155.52V640a32 32 0 0 1 64 0v111.146667a91.52 91.52 0 0 0 91.52 91.52H384z m-192-298.666667a32 32 0 0 1 0-64h640a32 32 0 0 1 0 64H192z" />
 </vector>
\ No newline at end of file
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
index 6b52da8c..e05b5401 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
@@ -3,11 +3,8 @@
     android:height="24dp"
     android:viewportHeight="1024"
     android:viewportWidth="1024">
-    <path
-        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="@color/colorText"
+        android:fillColor="#FF000000"
         android:pathData="M742.4 691.2c-12.8-12.8-25.6-12.8-38.4 0-51.2 51.2-115.2 83.2-185.6 83.2-128 0-230.4-89.6-256-204.8l44.8 0C320 569.6 332.8 550.4 320 537.6L243.2 428.8c-6.4-12.8-25.6-12.8-32 0L134.4 537.6c-12.8 12.8 0 32 19.2 32l51.2 0C224 716.8 358.4 832 512 832c89.6 0 166.4-32 230.4-96C748.8 723.2 748.8 704 742.4 691.2L742.4 691.2zM281.6 332.8c12.8 12.8 25.6 12.8 38.4 0C371.2 275.2 441.6 249.6 512 249.6c128 0 230.4 89.6 256 204.8l-44.8 0c-19.2 0-25.6 19.2-19.2 32l76.8 108.8c6.4 12.8 25.6 12.8 32 0l76.8-108.8c12.8-12.8 0-32-19.2-32l-51.2 0C800 307.2 665.6 192 512 192 422.4 192 345.6 230.4 281.6 288 275.2 300.8 275.2 320 281.6 332.8L281.6 332.8zM627.2 556.8c0 25.6-25.6 51.2-51.2 51.2l-128 0c-25.6 0-51.2-25.6-51.2-51.2L396.8 473.6c0-25.6 25.6-51.2 51.2-51.2l128 0c25.6 0 51.2 25.6 51.2 51.2L627.2 556.8 627.2 556.8zM627.2 556.8" />
 </vector>
diff --git a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml b/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
deleted file mode 100644
index e486ba48..00000000
--- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_active.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <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
deleted file mode 100644
index 066b5720..00000000
--- a/V2rayNG/app/src/main/res/drawable/ic_rounded_corner_grey.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_switch_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_scan_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml
index 5068d6e5..f7cc6c32 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_scan_24dp.xml
@@ -1,19 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
 
     <path
-        android:fillColor="#050505"
-        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        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: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" />
+        android:fillColor="#FF000000"
+        android:pathData="M181.333333 384a32 32 0 0 1-64 0v-111.146667a155.52 155.52 0 0 1 155.52-155.52H384a32 32 0 0 1 0 64h-111.146667a91.52 91.52 0 0 0-91.52 91.52V384zM640 181.333333a32 32 0 0 1 0-64h111.146667a155.52 155.52 0 0 1 155.52 155.52V384a32 32 0 0 1-64 0v-111.146667a91.52 91.52 0 0 0-91.52-91.52H640zM842.666667 640a32 32 0 0 1 64 0v111.146667a155.52 155.52 0 0 1-155.52 155.52H640a32 32 0 0 1 0-64h111.146667a91.52 91.52 0 0 0 91.52-91.52V640zM384 842.666667a32 32 0 0 1 0 64h-111.146667a155.52 155.52 0 0 1-155.52-155.52V640a32 32 0 0 1 64 0v111.146667a91.52 91.52 0 0 0 91.52 91.52H384z m-192-298.666667a32 32 0 0 1 0-64h640a32 32 0 0 1 0 64H192z" />
 </vector>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml
index 966290fb..f923b7e8 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_select_all_24dp.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
     android:height="24dp"
-    android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:width="24dp">
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#000000"
         android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
diff --git a/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml
index b827ebf9..d3fbe696 100644
--- a/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml
+++ b/V2rayNG/app/src/main/res/drawable/ic_stop_24dp.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <path
-        android:fillColor="#424242"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M256 192h512c35.392 0 64 28.608 64 64v512c0 35.392-28.608 64-64 64H256c-35.392 0-64-28.608-64-64V256c0-35.392 28.608-64 64-64z" />
 </vector>
diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml
index 4d44882e..32c608aa 100644
--- a/V2rayNG/app/src/main/res/layout/widget_switch.xml
+++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml
@@ -10,8 +10,8 @@
 
     <ImageView
             android:id="@+id/image_switch"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="64dp"
+            android:layout_height="64dp"
             android:padding="10dp"
             app:srcCompat="@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 210d238d..39e1a38a 100644
--- a/V2rayNG/app/src/main/res/values-night/colors.xml
+++ b/V2rayNG/app/src/main/res/values-night/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="color_fab_orange">#f97910</color>
-    <color name="color_switch_fab_grey">#424242</color>
     <color name="color_fab_grey">#646464</color>
     <color name="color_secondary">#BDBDBD</color>
     <color name="colorSelected">#FFFFFF</color>
diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml
index 7a5054da..3d53c1e5 100644
--- a/V2rayNG/app/src/main/res/values/colors.xml
+++ b/V2rayNG/app/src/main/res/values/colors.xml
@@ -5,7 +5,6 @@
     <color name="colorConfigType">#f97910</color>
 
     <color name="color_fab_orange">#f97910</color>
-    <color name="color_switch_fab_grey">#CDCDCD</color>
     <color name="color_fab_grey">#9C9C9C</color>
     <color name="color_secondary">#727272</color>
     <color name="colorSelected">#000000</color>