From 52471f2ace653ec1c0ca353a8d68f89c01e9174f Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 21 Sep 2024 16:02:25 +0800
Subject: [PATCH] Optimize UI

---
 .../src/main/res/layout/activity_about.xml    | 20 +++++++++----------
 .../src/main/res/layout/activity_sub_edit.xml |  1 -
 .../src/main/res/layout/activity_tasker.xml   |  2 +-
 .../res/layout/activity_user_asset_url.xml    |  3 +--
 .../res/layout/item_recycler_bypass_list.xml  |  9 ++-------
 .../main/res/layout/item_recycler_footer.xml  |  2 +-
 .../layout/item_recycler_routing_setting.xml  |  7 +++----
 .../res/layout/item_recycler_sub_setting.xml  |  4 ++--
 .../src/main/res/layout/layout_progress.xml   |  2 +-
 .../app/src/main/res/layout/nav_header.xml    |  5 +----
 .../app/src/main/res/layout/tls_layout.xml    |  2 +-
 .../app/src/main/res/layout/widget_switch.xml |  2 +-
 V2rayNG/app/src/main/res/values/dimens.xml    |  3 ++-
 13 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/V2rayNG/app/src/main/res/layout/activity_about.xml b/V2rayNG/app/src/main/res/layout/activity_about.xml
index fd1ed4df..1118b07a 100644
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -23,7 +23,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -46,7 +46,7 @@
                         android:id="@+id/tv_backup_summary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/layout_margin_top_height"
                         android:maxLines="4"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -63,7 +63,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -87,7 +87,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -108,7 +108,7 @@
             android:layout_height="match_parent"
             android:gravity="top"
             android:orientation="vertical"
-            android:paddingTop="16dp">
+            android:paddingTop="@dimen/padding_start">
 
             <LinearLayout
                 android:id="@+id/layout_soure_ccode"
@@ -119,7 +119,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -143,7 +143,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -168,7 +168,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -192,7 +192,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <ImageView
                     android:layout_width="@dimen/png_height"
@@ -212,7 +212,7 @@
                 android:layout_height="@dimen/server_height"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:padding="@dimen/padding">
 
                 <TextView
                     android:id="@+id/tv_version"
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 19732a8e..0ea797c4 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -63,7 +63,6 @@
                     android:id="@+id/et_url"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:maxLines="10"
diff --git a/V2rayNG/app/src/main/res/layout/activity_tasker.xml b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
index 5c798c37..57202e33 100644
--- a/V2rayNG/app/src/main/res/layout/activity_tasker.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="10dp"
+    android:padding="@dimen/padding"
     tools:context=".ui.TaskerActivity">
 
     <RelativeLayout
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 15247c42..8aeb4d50 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
@@ -63,11 +63,10 @@
                     android:id="@+id/et_url"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
                     android:gravity="top"
                     android:inputType="textMultiLine"
                     android:maxLines="10"
-                    android:minLines="5"
+                    android:minLines="2"
                     android:scrollbars="vertical" />
 
             </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
index ea8e36f8..5a1540be 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
@@ -12,9 +12,7 @@
         android:layout_width="60dp"
         android:layout_height="60dp"
         android:paddingStart="@dimen/padding_start"
-        android:paddingLeft="10dp"
-        android:paddingEnd="@dimen/padding_end"
-        android:paddingRight="10dp" />
+        android:paddingEnd="@dimen/padding_end" />
 
     <LinearLayout
         android:layout_width="0dp"
@@ -44,9 +42,6 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:focusable="false"
-        android:paddingStart="@dimen/padding_start"
-        android:paddingLeft="2dp"
-        android:paddingEnd="@dimen/padding_end"
-        android:paddingRight="6dp" />
+        android:paddingStart="@dimen/padding_start"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
index 45f9cd94..6c4df973 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
@@ -12,7 +12,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="horizontal"
-        android:padding="5dp">
+        android:padding="@dimen/padding">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
index a42362db..c39642bf 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
@@ -44,7 +44,7 @@
                     android:id="@+id/domainIp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/layout_margin_spacing"
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -52,13 +52,12 @@
                     android:id="@+id/outboundTag"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/layout_margin_spacing"
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
             </LinearLayout>
 
-
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/sub_height"
@@ -88,7 +87,7 @@
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/padding_start"
+                    android:layout_marginTop="@dimen/layout_margin_top_height"
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.SwitchCompat
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
index e5d8e4c0..8bab7380 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
@@ -44,14 +44,14 @@
                     android:id="@+id/tv_url"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/layout_margin_spacing"
                     android:lines="1"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="@dimen/layout_margin_spacing"
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.SwitchCompat
diff --git a/V2rayNG/app/src/main/res/layout/layout_progress.xml b/V2rayNG/app/src/main/res/layout/layout_progress.xml
index 8c699420..8e431cad 100644
--- a/V2rayNG/app/src/main/res/layout/layout_progress.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_progress.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="16dp">
+    android:padding="@dimen/padding">
 
     <ProgressBar
         android:id="@+id/pb_waiting"
diff --git a/V2rayNG/app/src/main/res/layout/nav_header.xml b/V2rayNG/app/src/main/res/layout/nav_header.xml
index af481d4a..a4c672aa 100644
--- a/V2rayNG/app/src/main/res/layout/nav_header.xml
+++ b/V2rayNG/app/src/main/res/layout/nav_header.xml
@@ -5,10 +5,7 @@
     android:background="@drawable/nav_header_bg"
     android:gravity="center"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin">
+    android:padding="@dimen/activity_horizontal_margin">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/V2rayNG/app/src/main/res/layout/tls_layout.xml b/V2rayNG/app/src/main/res/layout/tls_layout.xml
index 2f29d782..cc18f121 100644
--- a/V2rayNG/app/src/main/res/layout/tls_layout.xml
+++ b/V2rayNG/app/src/main/res/layout/tls_layout.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/activity_horizontal_margin"
+    android:layout_marginTop="@dimen/layout_margin_top_height"
     android:orientation="vertical">
 
     <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml
index 71601cc6..bf0bfc71 100644
--- a/V2rayNG/app/src/main/res/layout/widget_switch.xml
+++ b/V2rayNG/app/src/main/res/layout/widget_switch.xml
@@ -18,7 +18,7 @@
             android:id="@+id/image_switch"
             android:layout_width="45dp"
             android:layout_height="45dp"
-            android:padding="12dp"
+            android:padding="@dimen/padding"
             app:srcCompat="@drawable/ic_stat_name" />
     </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml
index 58510db5..84a8a180 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -11,7 +11,8 @@
     <dimen name="connection_test_height">60dp</dimen>
     <dimen name="padding_start">16dp</dimen>
     <dimen name="padding_end">16dp</dimen>
-    <dimen name="cardview_margin">2dp</dimen>
+    <dimen name="padding">16dp</dimen>
+    <dimen name="cardview_margin">3dp</dimen>
 
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>