From 8974f738413c5e3c0f04facd0bd3d95f433f0ec5 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 24 Mar 2025 14:43:07 +0800
Subject: [PATCH] Fix

https://github.com/2dust/v2rayNG/issues/4407
---
 .../com/v2ray/ang/ui/PerAppProxyAdapter.kt    |  3 +-
 .../src/main/res/layout/activity_about.xml    | 16 +++++-----
 .../main/res/layout/activity_bypass_list.xml  |  5 ++-
 .../app/src/main/res/layout/activity_main.xml |  7 +++--
 .../main/res/layout/activity_routing_edit.xml | 12 ++++---
 .../res/layout/activity_routing_setting.xml   |  2 ++
 .../layout/activity_server_custom_config.xml  |  2 +-
 .../res/layout/activity_server_hysteria2.xml  | 12 +++----
 .../layout/activity_server_shadowsocks.xml    |  6 ++--
 .../main/res/layout/activity_server_socks.xml |  4 +--
 .../res/layout/activity_server_trojan.xml     |  2 +-
 .../main/res/layout/activity_server_vless.xml |  8 +++--
 .../main/res/layout/activity_server_vmess.xml |  6 ++--
 .../res/layout/activity_server_wireguard.xml  | 12 +++----
 .../src/main/res/layout/activity_sub_edit.xml |  8 ++---
 .../src/main/res/layout/activity_tasker.xml   |  3 +-
 .../res/layout/activity_user_asset_url.xml    |  2 +-
 .../main/res/layout/dialog_config_filter.xml  |  6 ++--
 .../res/layout/item_recycler_bypass_list.xml  | 11 ++++---
 .../main/res/layout/item_recycler_footer.xml  |  5 ++-
 .../main/res/layout/item_recycler_main.xml    | 31 ++++++++++---------
 .../layout/item_recycler_routing_setting.xml  | 12 +++----
 .../res/layout/item_recycler_sub_setting.xml  | 12 +++----
 .../res/layout/item_recycler_user_asset.xml   |  2 +-
 .../main/res/layout/layout_address_port.xml   |  6 ++--
 .../app/src/main/res/layout/layout_tls.xml    | 24 +++++++++-----
 .../main/res/layout/layout_tls_hysteria2.xml  | 12 ++++---
 .../src/main/res/layout/layout_transport.xml  | 12 ++++---
 V2rayNG/app/src/main/res/values/dimens.xml    |  6 +---
 29 files changed, 135 insertions(+), 114 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt
index 0f150de3..1d02b3b1 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/PerAppProxyAdapter.kt
@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import com.v2ray.ang.R
 import com.v2ray.ang.databinding.ItemRecyclerBypassListBinding
 import com.v2ray.ang.dto.AppInfo
 
@@ -35,7 +34,7 @@ class PerAppProxyAdapter(val activity: BaseActivity, val apps: List<AppInfo>, bl
                 val view = View(ctx)
                 view.layoutParams = ViewGroup.LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
-                    ctx.resources.getDimensionPixelSize(R.dimen.view_height_dp64) * 0
+                    0
                 )
                 BaseViewHolder(view)
             }
diff --git a/V2rayNG/app/src/main/res/layout/activity_about.xml b/V2rayNG/app/src/main/res/layout/activity_about.xml
index 2fffa342..62053559 100644
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -58,7 +58,7 @@
             <LinearLayout
                 android:id="@+id/layout_share"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -82,7 +82,7 @@
             <LinearLayout
                 android:id="@+id/layout_restore"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -114,7 +114,7 @@
             <LinearLayout
                 android:id="@+id/layout_soure_ccode"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -138,7 +138,7 @@
             <LinearLayout
                 android:id="@+id/layout_oss_licenses"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -162,7 +162,7 @@
             <LinearLayout
                 android:id="@+id/layout_feedback"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -187,7 +187,7 @@
             <LinearLayout
                 android:id="@+id/layout_tg_channel"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -211,7 +211,7 @@
             <LinearLayout
                 android:id="@+id/layout_privacy_policy"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
@@ -234,7 +234,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp72"
+                android:layout_height="wrap_content"
                 android:gravity="center"
                 android:orientation="horizontal"
                 android:padding="@dimen/padding_spacing_dp16">
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..c89e57ba 100644
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -20,8 +20,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="@dimen/padding_spacing_dp16"
-        android:paddingEnd="@dimen/padding_spacing_dp16">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -30,7 +29,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp64"
+                android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <LinearLayout
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index c14f4b93..50c7d0e3 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,8 @@
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tab_group"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/view_height_dp64"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/padding_spacing_dp8"
                         app:tabIndicatorFullWidth="false"
                         app:tabMode="scrollable"
                         app:tabTextAppearance="@style/TabLayoutTextStyle" />
@@ -63,7 +64,7 @@
                     <LinearLayout
                         android:id="@+id/layout_test"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/view_height_dp64"
+                        android:layout_height="wrap_content"
                         android:background="@color/colorPrimary"
                         android:clickable="true"
                         android:focusable="true"
@@ -77,7 +78,7 @@
                             android:layout_height="wrap_content"
                             android:maxLines="2"
                             android:minLines="1"
-                            android:paddingStart="@dimen/padding_spacing_dp16"
+                            android:padding="@dimen/padding_spacing_dp16"
                             android:text="@string/connection_test_pending"
                             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
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 81d0c150..aaddc74d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
@@ -32,7 +32,7 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
             </LinearLayout>
 
@@ -118,7 +118,7 @@
                 <EditText
                     android:id="@+id/et_port"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
             </LinearLayout>
 
@@ -136,7 +136,7 @@
                 <EditText
                     android:id="@+id/et_protocol"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:hint="@string/routing_settings_protocol_tip"
                     android:inputType="text" />
             </LinearLayout>
@@ -155,7 +155,7 @@
                 <EditText
                     android:id="@+id/et_network"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:hint="@string/routing_settings_network_tip"
                     android:inputType="text" />
             </LinearLayout>
@@ -172,9 +172,11 @@
                     android:text="@string/routing_settings_outbound_tag" />
 
                 <Spinner
+                    android:layout_marginTop="@dimen/padding_spacing_dp8"
+                    android:layout_marginBottom="@dimen/padding_spacing_dp8"
                     android:id="@+id/sp_outbound_tag"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:entries="@array/outbound_tag" />
             </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 6b6dc077..6d536109 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -29,6 +29,8 @@
                     android:text="@string/routing_settings_domain_strategy" />
 
                 <Spinner
+                    android:layout_marginTop="@dimen/padding_spacing_dp8"
+                    android:layout_marginBottom="@dimen/padding_spacing_dp8"
                     android:id="@+id/sp_domain_strategy"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
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 5e3ef203..d6d587b8 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
@@ -52,7 +52,7 @@
             <EditText
                 android:id="@+id/et_remarks"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </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 2e80686c..86df50ef 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -47,7 +47,7 @@
             <EditText
                 android:id="@+id/et_obfs_password"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -66,7 +66,7 @@
             <EditText
                 android:id="@+id/et_port_hop"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -85,7 +85,7 @@
             <EditText
                 android:id="@+id/et_port_hop_interval"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="number" />
 
         </LinearLayout>
@@ -104,7 +104,7 @@
             <EditText
                 android:id="@+id/et_bandwidth_down"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -123,7 +123,7 @@
             <EditText
                 android:id="@+id/et_bandwidth_up"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </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 7dbd634f..666bef2b 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -46,9 +46,11 @@
                 android:text="@string/server_lab_security3" />
 
             <Spinner
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
+                android:layout_marginBottom="@dimen/padding_spacing_dp8"
                 android:id="@+id/sp_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:entries="@array/ss_securitys" />
         </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 427389c1..90c1b883 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
@@ -29,7 +29,7 @@
             <EditText
                 android:id="@+id/et_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -48,7 +48,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </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 8c3fd920..2159ec43 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </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 a1ceee4b..de04f4ee 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -45,9 +45,11 @@
                 android:text="@string/server_lab_flow" />
 
             <Spinner
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
+                android:layout_marginBottom="@dimen/padding_spacing_dp8"
                 android:id="@+id/sp_flow"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:entries="@array/flows" />
         </LinearLayout>
 
@@ -65,7 +67,7 @@
             <EditText
                 android:id="@+id/et_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text"
                 android:text="none" />
 
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 08634c95..0c95238e 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -45,9 +45,11 @@
                 android:text="@string/server_lab_security" />
 
             <Spinner
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
+                android:layout_marginBottom="@dimen/padding_spacing_dp8"
                 android:id="@+id/sp_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:entries="@array/securitys" />
         </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 329bc38b..5a18e623 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -48,7 +48,7 @@
             <EditText
                 android:id="@+id/et_public_key"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -67,7 +67,7 @@
             <EditText
                 android:id="@+id/et_preshared_key"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -91,7 +91,7 @@
                 <EditText
                     android:id="@+id/et_reserved1"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -111,7 +111,7 @@
             <EditText
                 android:id="@+id/et_local_address"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
         </LinearLayout>
 
@@ -129,7 +129,7 @@
             <EditText
                 android:id="@+id/et_local_mtu"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="number" />
 
         </LinearLayout>
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 d18664af..399297fd 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -44,7 +44,7 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -88,7 +88,7 @@
                 <EditText
                     android:id="@+id/et_filter"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -152,7 +152,7 @@
                 <EditText
                     android:id="@+id/et_pre_profile"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:hint="@string/sub_setting_pre_profile_tip"
                     android:inputType="text" />
 
@@ -172,7 +172,7 @@
                 <EditText
                     android:id="@+id/et_next_profile"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:hint="@string/sub_setting_pre_profile_tip"
                     android:inputType="text" />
 
diff --git a/V2rayNG/app/src/main/res/layout/activity_tasker.xml b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
index c97811bf..56a1276d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_tasker.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
@@ -10,7 +10,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_height_dp64">
+        android:layout_height="wrap_content"
+        android:padding="@dimen/padding_spacing_dp8">
 
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/switch_start_service"
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 b180b870..e1b55173 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
@@ -43,7 +43,7 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/view_height_dp48"
+                    android:layout_height="wrap_content"
                     android:inputType="text" />
 
             </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
index e6d5dbc2..96f4e4bf 100644
--- a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
+++ b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
@@ -16,9 +16,11 @@
             android:orientation="vertical">
 
             <Spinner
+                android:layout_marginTop="@dimen/padding_spacing_dp8"
+                android:layout_marginBottom="@dimen/padding_spacing_dp8"
                 android:id="@+id/sp_subscriptionId"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48" />
+                android:layout_height="wrap_content" />
         </LinearLayout>
 
 
@@ -36,7 +38,7 @@
             <EditText
                 android:id="@+id/et_keyword"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
         </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 bd6e447f..bb1dda3b 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
@@ -5,17 +5,18 @@
     android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
+    android:padding="@dimen/padding_spacing_dp8"
     android:gravity="center_vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
-        android:layout_width="@dimen/view_height_dp72"
-        android:layout_height="@dimen/view_height_dp72"
-        android:padding="@dimen/padding_spacing_dp16" />
+        android:layout_width="@dimen/view_height_dp48"
+        android:layout_height="@dimen/view_height_dp48"
+        android:padding="@dimen/padding_spacing_dp8" />
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="@dimen/view_height_dp72"
+        android:layout_height="wrap_content"
         android:layout_weight="1.0"
         android:gravity="center"
         android:orientation="vertical">
@@ -42,6 +43,6 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:focusable="false"
-        android:paddingEnd="@dimen/padding_spacing_dp16"/>
+        android:padding="@dimen/padding_spacing_dp8"  />
 
 </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 03245c76..c350ba58 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
@@ -8,7 +8,7 @@
     <LinearLayout
         android:id="@+id/layout_edit"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_height_dp48"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="horizontal"
@@ -18,8 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center|left"
-            android:orientation="vertical"
-            android:paddingBottom="@dimen/padding_spacing_dp16">
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
index cb808776..6be7f595 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -10,19 +10,22 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_height_dp72"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
         android:nextFocusRight="@+id/layout_share"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/padding_spacing_dp8"
+        android:paddingEnd="@dimen/padding_spacing_dp8"
+        android:paddingStart="@dimen/padding_spacing_dp4"
+        android:paddingBottom="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:id="@+id/layout_indicator"
             android:layout_width="6dp"
-            android:layout_marginStart="4dp"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:orientation="vertical" />
@@ -32,7 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -63,14 +66,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingEnd="@dimen/padding_spacing_dp8"
+            android:paddingStart="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:paddingTop="4dp"
-                android:paddingEnd="@dimen/padding_spacing_dp16">
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/tv_subscription"
@@ -104,7 +107,7 @@
                 <LinearLayout
                     android:id="@+id/layout_share"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/view_height_dp72"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
@@ -123,7 +126,7 @@
                 <LinearLayout
                     android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/view_height_dp72"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
@@ -141,7 +144,7 @@
                 <LinearLayout
                     android:id="@+id/layout_remove"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/view_height_dp72"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
@@ -160,10 +163,8 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:orientation="vertical"
-                android:paddingBottom="4dp"
-                android:paddingEnd="@dimen/padding_spacing_dp16">
+                android:layout_gravity="end"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/tv_type"
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 86a4fe46..e104ef97 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
@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_height_dp90"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
@@ -17,15 +17,14 @@
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/padding_spacing_dp8"
-        android:paddingBottom="@dimen/padding_spacing_dp8">
+        android:padding="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -68,11 +67,10 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/view_height_dp90"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16"
-            android:paddingEnd="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:id="@+id/layout_edit"
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 5e4e68c4..aa8d9812 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
@@ -9,7 +9,7 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/view_height_dp90"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
@@ -17,15 +17,14 @@
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/padding_spacing_dp8"
-        android:paddingBottom="@dimen/padding_spacing_dp8">
+        android:padding="@dimen/padding_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <TextView
                 android:id="@+id/tv_name"
@@ -45,11 +44,10 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/view_height_dp90"
+            android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16"
-            android:paddingEnd="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:layout_width="wrap_content"
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 24d908b4..61cd2a67 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
@@ -18,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_spacing_dp16">
+            android:padding="@dimen/padding_spacing_dp8">
 
             <LinearLayout
                 android:layout_width="wrap_content"
diff --git a/V2rayNG/app/src/main/res/layout/layout_address_port.xml b/V2rayNG/app/src/main/res/layout/layout_address_port.xml
index 14b53edb..1c0111ca 100644
--- a/V2rayNG/app/src/main/res/layout/layout_address_port.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_address_port.xml
@@ -30,7 +30,7 @@
         <EditText
             android:id="@+id/et_remarks"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text" />
 
     </LinearLayout>
@@ -49,7 +49,7 @@
         <EditText
             android:id="@+id/et_address"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text" />
 
     </LinearLayout>
@@ -68,7 +68,7 @@
         <EditText
             android:id="@+id/et_port"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="number" />
     </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/layout/layout_tls.xml b/V2rayNG/app/src/main/res/layout/layout_tls.xml
index 469c4b57..cef7a236 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls.xml
@@ -19,9 +19,11 @@
             android:text="@string/server_lab_stream_security" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_stream_security"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/streamsecurityxs"
             android:nextFocusDown="@+id/et_sni" />
 
@@ -42,7 +44,7 @@
         <EditText
             android:id="@+id/et_sni"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -61,9 +63,11 @@
             android:text="@string/server_lab_stream_fingerprint" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_stream_fingerprint"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/streamsecurity_utls"
             android:nextFocusDown="@+id/sp_stream_alpn" />
 
@@ -82,9 +86,11 @@
             android:text="@string/server_lab_stream_alpn" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_stream_alpn"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/streamsecurity_alpn"
             android:nextFocusDown="@+id/sp_allow_insecure" />
 
@@ -102,9 +108,11 @@
             android:text="@string/server_lab_allow_insecure" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_allow_insecure"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/allowinsecures" />
     </LinearLayout>
 
@@ -123,7 +131,7 @@
         <EditText
             android:id="@+id/et_public_key"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -144,7 +152,7 @@
         <EditText
             android:id="@+id/et_short_id"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -165,7 +173,7 @@
         <EditText
             android:id="@+id/et_spider_x"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
diff --git a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
index 329fcec2..a184d49a 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
@@ -19,9 +19,11 @@
             android:text="@string/server_lab_stream_security" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_stream_security"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/streamsecuritys"
             android:nextFocusDown="@+id/et_sni" />
 
@@ -42,7 +44,7 @@
         <EditText
             android:id="@+id/et_sni"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -61,9 +63,11 @@
             android:text="@string/server_lab_allow_insecure" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_allow_insecure"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/allowinsecures" />
 
 
@@ -81,7 +85,7 @@
             <EditText
                 android:id="@+id/et_pinsha256"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/view_height_dp48"
+                android:layout_height="wrap_content"
                 android:inputType="text" />
 
         </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/layout_transport.xml b/V2rayNG/app/src/main/res/layout/layout_transport.xml
index 309d9d15..0d9c9ae7 100644
--- a/V2rayNG/app/src/main/res/layout/layout_transport.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_transport.xml
@@ -29,9 +29,11 @@
             android:text="@string/server_lab_network" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_network"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:entries="@array/networks" />
     </LinearLayout>
 
@@ -48,9 +50,11 @@
             android:text="@string/server_lab_head_type" />
 
         <Spinner
+            android:layout_marginTop="@dimen/padding_spacing_dp8"
+            android:layout_marginBottom="@dimen/padding_spacing_dp8"
             android:id="@+id/sp_header_type"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48" />
+            android:layout_height="wrap_content" />
     </LinearLayout>
 
     <LinearLayout
@@ -68,7 +72,7 @@
         <EditText
             android:id="@+id/et_request_host"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text" />
     </LinearLayout>
 
@@ -88,7 +92,7 @@
         <EditText
             android:id="@+id/et_path"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/view_height_dp48"
+            android:layout_height="wrap_content"
             android:inputType="text" />
     </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/values/dimens.xml b/V2rayNG/app/src/main/res/values/dimens.xml
index 08a979bc..f68f7021 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <dimen name="padding_spacing_dp4">4dp</dimen>
     <dimen name="padding_spacing_dp8">8dp</dimen>
     <dimen name="padding_spacing_dp16">16dp</dimen>
-
     <dimen name="image_size_dp24">24dp</dimen>
-
     <dimen name="view_height_dp48">48dp</dimen>
-    <dimen name="view_height_dp64">64dp</dimen>
-    <dimen name="view_height_dp72">72dp</dimen>
-    <dimen name="view_height_dp90">90dp</dimen>
     <dimen name="view_height_dp160">160dp</dimen>
 </resources>