From fd9f912c187fffc7df2ac4c732294288ecd19568 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 22 Mar 2025 17:50:55 +0800
Subject: [PATCH] Optimize and improve theme

---
 V2rayNG/app/src/main/res/layout/activity_about.xml        | 3 +--
 V2rayNG/app/src/main/res/layout/activity_bypass_list.xml  | 1 -
 V2rayNG/app/src/main/res/layout/activity_logcat.xml       | 1 -
 V2rayNG/app/src/main/res/layout/activity_routing_edit.xml | 1 -
 .../app/src/main/res/layout/activity_routing_setting.xml  | 1 -
 .../src/main/res/layout/activity_server_custom_config.xml | 1 -
 .../app/src/main/res/layout/activity_server_hysteria2.xml | 1 -
 .../src/main/res/layout/activity_server_shadowsocks.xml   | 1 -
 V2rayNG/app/src/main/res/layout/activity_server_socks.xml | 1 -
 .../app/src/main/res/layout/activity_server_trojan.xml    | 1 -
 V2rayNG/app/src/main/res/layout/activity_server_vless.xml | 1 -
 V2rayNG/app/src/main/res/layout/activity_server_vmess.xml | 1 -
 .../app/src/main/res/layout/activity_server_wireguard.xml | 1 -
 V2rayNG/app/src/main/res/layout/activity_settings.xml     | 1 -
 V2rayNG/app/src/main/res/layout/activity_sub_edit.xml     | 1 -
 V2rayNG/app/src/main/res/layout/activity_sub_setting.xml  | 1 -
 V2rayNG/app/src/main/res/layout/activity_tasker.xml       | 1 -
 .../app/src/main/res/layout/activity_user_asset_url.xml   | 1 -
 .../app/src/main/res/layout/item_recycler_user_asset.xml  | 1 -
 V2rayNG/app/src/main/res/layout/widget_switch.xml         | 2 +-
 V2rayNG/app/src/main/res/menu/menu_drawer.xml             | 8 ++++----
 V2rayNG/app/src/main/res/values-night/themes.xml          | 3 ++-
 V2rayNG/app/src/main/res/values/themes.xml                | 3 ++-
 23 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/V2rayNG/app/src/main/res/layout/activity_about.xml b/V2rayNG/app/src/main/res/layout/activity_about.xml
index 4651bafe..7479371b 100644
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
     <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
diff --git a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
index 90455574..b535362d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
diff --git a/V2rayNG/app/src/main/res/layout/activity_logcat.xml b/V2rayNG/app/src/main/res/layout/activity_logcat.xml
index 7c38fd34..2cc76f53 100644
--- a/V2rayNG/app/src/main/res/layout/activity_logcat.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_logcat.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.LogcatActivity">
 
     <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
index 4124546d..3654aa0e 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:fitsSystemWindows="true"
     tools:context=".ui.SubSettingActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
index ec98e78b..6fc56338 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.RoutingSettingActivity">
 
     <androidx.core.widget.NestedScrollView
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
index 81811d65..94c7d9a5 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_custom_config.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerCustomConfigActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
index 6ad4ffc0..8bbec4ce 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
index ed4466e8..3bf09862 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
index 3f0c20e7..28d51ff9 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
index 8059d850..e41b7f47 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
index 47bae4ce..0d5238bf 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
index b541a67d..933af329 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
index 498d15a7..d210653c 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.ServerActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_settings.xml b/V2rayNG/app/src/main/res/layout/activity_settings.xml
index 618bc8c0..d42f4182 100644
--- a/V2rayNG/app/src/main/res/layout/activity_settings.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:orientation="vertical"
     tools:context=".ui.SettingsActivity">
 
diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
index aecaf02e..d30f6e11 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:fitsSystemWindows="true"
     tools:context=".ui.SubSettingActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml b/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml
index 1654701d..7379302b 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_setting.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.SubSettingActivity">
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
diff --git a/V2rayNG/app/src/main/res/layout/activity_tasker.xml b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
index c97811bf..817013f4 100644
--- a/V2rayNG/app/src/main/res/layout/activity_tasker.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:orientation="vertical"
     android:padding="@dimen/padding_spacing_dp16"
     tools:context=".ui.TaskerActivity">
diff --git a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
index 060b03be..b2ac45c5 100644
--- a/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_user_asset_url.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context=".ui.UserAssetUrlActivity">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
index cace74ca..4f7c2ca0 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
@@ -46,7 +46,6 @@
                     android:layout_height="wrap_content"
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textSize="12sp"
                     tools:text="1MB . 2020.01.01" />
 
 
diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml
index 50776f87..11312d5f 100644
--- a/V2rayNG/app/src/main/res/layout/widget_switch.xml
+++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml
@@ -27,5 +27,5 @@
         android:layout_height="wrap_content"
         android:text="@string/app_name"
         android:textColor="@android:color/white"
-        android:textSize="10sp" />
+        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/menu/menu_drawer.xml b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
index a2b17dd1..1e244034 100644
--- a/V2rayNG/app/src/main/res/menu/menu_drawer.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
@@ -8,10 +8,6 @@
             android:id="@+id/sub_setting"
             android:icon="@drawable/ic_subscriptions_24dp"
             android:title="@string/title_sub_setting" />
-        <item
-            android:id="@+id/settings"
-            android:icon="@drawable/ic_settings_24dp"
-            android:title="@string/title_settings" />
         <item
             android:id="@+id/per_app_proxy_settings"
             android:icon="@drawable/ic_per_apps_24dp"
@@ -20,6 +16,10 @@
             android:id="@+id/routing_setting"
             android:icon="@drawable/ic_routing_24dp"
             android:title="@string/routing_settings_title" />
+        <item
+            android:id="@+id/settings"
+            android:icon="@drawable/ic_settings_24dp"
+            android:title="@string/title_settings" />
     </group>
 
     <group android:id="@+id/group_id2">
diff --git a/V2rayNG/app/src/main/res/values-night/themes.xml b/V2rayNG/app/src/main/res/values-night/themes.xml
index 828ffe7c..f25399fa 100644
--- a/V2rayNG/app/src/main/res/values-night/themes.xml
+++ b/V2rayNG/app/src/main/res/values-night/themes.xml
@@ -5,8 +5,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="android:navigationBarColor">@color/colorPrimary</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="colorControlNormal">@color/colorAccent</item>
+        <item name="android:fitsSystemWindows">true</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/values/themes.xml b/V2rayNG/app/src/main/res/values/themes.xml
index d6558e07..1703fd0f 100644
--- a/V2rayNG/app/src/main/res/values/themes.xml
+++ b/V2rayNG/app/src/main/res/values/themes.xml
@@ -4,8 +4,9 @@
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:statusBarColor">@color/colorPrimary</item>
-        <item name="android:navigationBarColor">@color/colorPrimary</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="colorControlNormal">@color/colorAccent</item>
+        <item name="android:fitsSystemWindows">true</item>
     </style>
 
     <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">