From 3747e58e4eaeac95aeec72295f82afd109a63339 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 20 Mar 2025 10:24:38 +0800
Subject: [PATCH] Adjust dimen resources

---
 .../com/v2ray/ang/ui/PerAppProxyAdapter.kt    |  2 +-
 .../src/main/res/layout/activity_about.xml    | 86 +++++++++----------
 .../main/res/layout/activity_bypass_list.xml  |  6 +-
 .../app/src/main/res/layout/activity_main.xml | 13 ++-
 .../main/res/layout/activity_routing_edit.xml | 35 ++++----
 .../res/layout/activity_routing_setting.xml   | 10 +--
 .../layout/activity_server_custom_config.xml  | 12 +--
 .../res/layout/activity_server_hysteria2.xml  | 30 +++----
 .../layout/activity_server_shadowsocks.xml    | 14 +--
 .../main/res/layout/activity_server_socks.xml | 14 +--
 .../res/layout/activity_server_trojan.xml     | 10 +--
 .../main/res/layout/activity_server_vless.xml | 18 ++--
 .../main/res/layout/activity_server_vmess.xml | 14 +--
 .../res/layout/activity_server_wireguard.xml  | 30 +++----
 .../src/main/res/layout/activity_sub_edit.xml | 36 ++++----
 .../src/main/res/layout/activity_tasker.xml   |  4 +-
 .../res/layout/activity_user_asset_url.xml    | 12 +--
 .../main/res/layout/dialog_config_filter.xml  | 10 +--
 .../app/src/main/res/layout/item_qrcode.xml   |  4 +-
 .../res/layout/item_recycler_bypass_list.xml  | 12 +--
 .../main/res/layout/item_recycler_footer.xml  |  6 +-
 .../main/res/layout/item_recycler_logcat.xml  |  6 +-
 .../main/res/layout/item_recycler_main.xml    | 32 +++----
 .../layout/item_recycler_routing_setting.xml  | 34 ++++----
 .../res/layout/item_recycler_sub_setting.xml  | 32 +++----
 .../res/layout/item_recycler_user_asset.xml   | 18 ++--
 .../main/res/layout/layout_address_port.xml   | 12 +--
 .../src/main/res/layout/layout_progress.xml   |  2 +-
 .../app/src/main/res/layout/layout_tls.xml    | 32 +++----
 .../main/res/layout/layout_tls_hysteria2.xml  | 16 ++--
 .../src/main/res/layout/layout_transport.xml  | 20 ++---
 .../app/src/main/res/layout/nav_header.xml    |  6 +-
 .../app/src/main/res/layout/widget_switch.xml |  2 +-
 V2rayNG/app/src/main/res/values/dimens.xml    | 27 +++---
 34 files changed, 304 insertions(+), 313 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 deb585fe..0f150de3 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
@@ -35,7 +35,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.bypass_list_header_height) * 0
+                    ctx.resources.getDimensionPixelSize(R.dimen.view_height_dp64) * 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 15262fd6..4651bafe 100644
--- a/V2rayNG/app/src/main/res/layout/activity_about.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_about.xml
@@ -24,18 +24,18 @@
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_backup_24dp" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingStart="@dimen/padding_start">
+                    android:paddingStart="@dimen/padding_spacing_dp16">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -47,7 +47,7 @@
                         android:id="@+id/tv_backup_summary"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/layout_margin_top_height"
+                        android:layout_marginTop="@dimen/margin_spacing_dp16"
                         android:maxLines="4"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -58,23 +58,23 @@
             <LinearLayout
                 android:id="@+id/layout_share"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_share_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_configuration_share"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -82,23 +82,23 @@
             <LinearLayout
                 android:id="@+id/layout_restore"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_restore_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_configuration_restore"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -109,28 +109,28 @@
             android:layout_height="match_parent"
             android:gravity="top"
             android:orientation="vertical"
-            android:paddingTop="@dimen/padding_start">
+            android:paddingTop="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:id="@+id/layout_soure_ccode"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_source_code_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_source_code"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -138,23 +138,23 @@
             <LinearLayout
                 android:id="@+id/layout_oss_licenses"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/license_24px" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_oss_license"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -162,23 +162,23 @@
             <LinearLayout
                 android:id="@+id/layout_feedback"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_feedback_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_pref_feedback"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -187,23 +187,23 @@
             <LinearLayout
                 android:id="@+id/layout_tg_channel"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_telegram_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_tg_channel"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
@@ -211,33 +211,33 @@
             <LinearLayout
                 android:id="@+id/layout_privacy_policy"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:background="?attr/selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
                 android:gravity="center|start"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_privacy_24dp" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
                     android:text="@string/title_privacy_policy"
                     android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/server_height"
+                android:layout_height="@dimen/view_height_dp72"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:padding="@dimen/padding">
+                android:padding="@dimen/padding_spacing_dp16">
 
                 <TextView
                     android:id="@+id/tv_version"
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 5c23332d..73831704 100644
--- a/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
@@ -12,8 +12,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="@dimen/padding_start"
-        android:paddingEnd="@dimen/padding_end">
+        android:paddingStart="@dimen/padding_spacing_dp16"
+        android:paddingEnd="@dimen/padding_spacing_dp16">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -22,7 +22,7 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/bypass_list_header_height"
+                android:layout_height="@dimen/view_height_dp64"
                 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 71e1c527..d96c1518 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -47,7 +47,7 @@
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tab_group"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/bypass_list_header_height"
+                        android:layout_height="@dimen/view_height_dp64"
                         app:tabIndicatorFullWidth="false"
                         app:tabMode="scrollable"
                         app:tabTextAppearance="@style/TabLayoutTextStyle" />
@@ -63,7 +63,7 @@
                     <LinearLayout
                         android:id="@+id/layout_test"
                         android:layout_width="match_parent"
-                        android:layout_height="@dimen/connection_test_height"
+                        android:layout_height="@dimen/view_height_dp64"
                         android:background="@color/colorPrimary"
                         android:clickable="true"
                         android:focusable="true"
@@ -77,7 +77,7 @@
                             android:layout_height="wrap_content"
                             android:maxLines="2"
                             android:minLines="1"
-                            android:paddingStart="@dimen/padding_start"
+                            android:paddingStart="@dimen/padding_spacing_dp16"
                             android:text="@string/connection_test_pending"
                             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -89,7 +89,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|end"
-                    android:layout_marginBottom="12dp">
+                    android:layout_marginBottom="@dimen/margin_spacing_dp16">
 
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/fab"
@@ -98,10 +98,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentBottom="true"
                         android:layout_gravity="bottom|end"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginTop="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginBottom="16dp"
+                        android:layout_margin="@dimen/margin_spacing_dp16"
                         android:clickable="true"
                         android:focusable="true"
                         android:nextFocusLeft="@+id/layout_test"
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 5d8b768c..4124546d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_edit.xml
@@ -16,12 +16,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/layout_margin_top_height">
+            android:padding="@dimen/margin_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -32,14 +32,14 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <androidx.appcompat.widget.SwitchCompat
@@ -47,13 +47,14 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/routing_settings_locked"
+                    android:textColor="@color/colorAccent"
                     app:theme="@style/BrandedSwitch" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -66,7 +67,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -86,7 +87,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -106,7 +107,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -117,14 +118,14 @@
                 <EditText
                     android:id="@+id/et_port"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -135,7 +136,7 @@
                 <EditText
                     android:id="@+id/et_protocol"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:hint="@string/routing_settings_protocol_tip"
                     android:inputType="text" />
             </LinearLayout>
@@ -143,7 +144,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -154,7 +155,7 @@
                 <EditText
                     android:id="@+id/et_network"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:hint="@string/routing_settings_network_tip"
                     android:inputType="text" />
             </LinearLayout>
@@ -162,7 +163,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -173,7 +174,7 @@
                 <Spinner
                     android:id="@+id/sp_outbound_tag"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:entries="@array/outbound_tag" />
             </LinearLayout>
 
@@ -182,8 +183,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 3032d6ce..17038020 100644
--- a/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_routing_setting.xml
@@ -20,7 +20,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/layout_margin_top_height"
+                android:layout_margin="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -31,7 +31,7 @@
                 <Spinner
                     android:id="@+id/sp_domain_strategy"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:entries="@array/routing_domain_strategy" />
             </LinearLayout>
 
@@ -39,10 +39,10 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
-                android:layout_marginBottom="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
+                android:layout_marginBottom="@dimen/margin_spacing_dp16"
                 android:orientation="vertical"
-                android:paddingStart="@dimen/padding_start">
+                android:paddingStart="@dimen/padding_spacing_dp16">
 
                 <TextView
                     android:layout_width="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 40423b54..81811d65 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
@@ -14,7 +14,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_spacing"
+            android:layout_margin="@dimen/margin_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_spacing"
+            android:layout_margin="@dimen/margin_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -41,7 +41,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/layout_margin_spacing"
+            android:layout_margin="@dimen/margin_spacing_dp8"
             android:orientation="vertical">
 
             <TextView
@@ -52,7 +52,7 @@
             <EditText
                 android:id="@+id/et_remarks"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -65,7 +65,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/layout_margin_spacing"
+                android:layout_margin="@dimen/margin_spacing_dp8"
                 android:text="@string/server_lab_content"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
 
@@ -73,7 +73,7 @@
                 android:id="@+id/editor"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:gravity="top|start" />
         </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 a0228555..6ad4ffc0 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_hysteria2.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -47,7 +47,7 @@
             <EditText
                 android:id="@+id/et_obfs_password"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -55,7 +55,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -66,7 +66,7 @@
             <EditText
                 android:id="@+id/et_port_hop"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -74,7 +74,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -85,7 +85,7 @@
             <EditText
                 android:id="@+id/et_port_hop_interval"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="number" />
 
         </LinearLayout>
@@ -93,7 +93,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -104,7 +104,7 @@
             <EditText
                 android:id="@+id/et_bandwidth_down"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -112,7 +112,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -123,7 +123,7 @@
             <EditText
                 android:id="@+id/et_bandwidth_up"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -133,8 +133,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 83dbfc96..ed4466e8 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_shadowsocks.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -37,7 +37,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -48,7 +48,7 @@
             <Spinner
                 android:id="@+id/sp_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:entries="@array/ss_securitys" />
         </LinearLayout>
 
@@ -59,8 +59,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 42f62a3f..3f0c20e7 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_socks.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -29,7 +29,7 @@
             <EditText
                 android:id="@+id/et_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -37,7 +37,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -48,7 +48,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -56,8 +56,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 b98753d0..8059d850 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_trojan.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -40,8 +40,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 c7bf624b..47bae4ce 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vless.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -47,14 +47,14 @@
             <Spinner
                 android:id="@+id/sp_flow"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:entries="@array/flows" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -65,7 +65,7 @@
             <EditText
                 android:id="@+id/et_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text"
                 android:text="none" />
 
@@ -78,8 +78,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 413127e4..b541a67d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -47,7 +47,7 @@
             <Spinner
                 android:id="@+id/sp_security"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:entries="@array/securitys" />
         </LinearLayout>
 
@@ -58,8 +58,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 93bc43f7..498d15a7 100644
--- a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
@@ -10,14 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <include layout="@layout/layout_address_port" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -28,7 +28,7 @@
             <EditText
                 android:id="@+id/et_id"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -36,7 +36,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -48,14 +48,14 @@
             <EditText
                 android:id="@+id/et_public_key"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -67,7 +67,7 @@
             <EditText
                 android:id="@+id/et_preshared_key"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
 
         </LinearLayout>
@@ -75,7 +75,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -91,7 +91,7 @@
                 <EditText
                     android:id="@+id/et_reserved1"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -100,7 +100,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -111,14 +111,14 @@
             <EditText
                 android:id="@+id/et_local_address"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -129,7 +129,7 @@
             <EditText
                 android:id="@+id/et_local_mtu"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="number" />
 
         </LinearLayout>
@@ -137,8 +137,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 504c1e07..aecaf02e 100644
--- a/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/layout_margin_top_height">
+            android:padding="@dimen/margin_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -33,7 +33,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -44,7 +44,7 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -52,7 +52,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -77,7 +77,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -88,7 +88,7 @@
                 <EditText
                     android:id="@+id/et_filter"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -96,7 +96,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="horizontal">
 
                 <TextView
@@ -109,8 +109,8 @@
                     android:id="@+id/chk_enable"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
-                    android:paddingEnd="@dimen/padding_end"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
+                    android:paddingEnd="@dimen/padding_spacing_dp16"
                     app:theme="@style/BrandedSwitch" />
 
             </LinearLayout>
@@ -118,7 +118,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="horizontal">
 
                 <TextView
@@ -132,8 +132,8 @@
                     android:id="@+id/auto_update_check"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="@dimen/padding_start"
-                    android:paddingEnd="@dimen/padding_end"
+                    android:paddingStart="@dimen/padding_spacing_dp16"
+                    android:paddingEnd="@dimen/padding_spacing_dp16"
                     app:theme="@style/BrandedSwitch" />
 
             </LinearLayout>
@@ -141,7 +141,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -152,7 +152,7 @@
                 <EditText
                     android:id="@+id/et_pre_profile"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:hint="@string/sub_setting_pre_profile_tip"
                     android:inputType="text" />
 
@@ -161,7 +161,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -172,7 +172,7 @@
                 <EditText
                     android:id="@+id/et_next_profile"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:hint="@string/sub_setting_pre_profile_tip"
                     android:inputType="text" />
 
@@ -182,8 +182,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </LinearLayout>
diff --git a/V2rayNG/app/src/main/res/layout/activity_tasker.xml b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
index 6fb211b1..c97811bf 100644
--- a/V2rayNG/app/src/main/res/layout/activity_tasker.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_tasker.xml
@@ -5,12 +5,12 @@
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
     android:orientation="vertical"
-    android:padding="@dimen/padding"
+    android:padding="@dimen/padding_spacing_dp16"
     tools:context=".ui.TaskerActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bypass_list_header_height">
+        android:layout_height="@dimen/view_height_dp64">
 
         <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 d46391c0..060b03be 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
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="@dimen/layout_margin_top_height">
+            android:padding="@dimen/margin_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -32,7 +32,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -43,7 +43,7 @@
                 <EditText
                     android:id="@+id/et_remarks"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/edit_height"
+                    android:layout_height="@dimen/view_height_dp48"
                     android:inputType="text" />
 
             </LinearLayout>
@@ -51,7 +51,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_top_height"
+                android:layout_marginTop="@dimen/margin_spacing_dp16"
                 android:orientation="vertical">
 
                 <TextView
@@ -78,8 +78,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
-            android:layout_marginBottom="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical" />
 
     </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 1c043f4f..4b9b97ac 100644
--- a/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
+++ b/V2rayNG/app/src/main/res/layout/dialog_config_filter.xml
@@ -7,25 +7,25 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="@dimen/layout_margin_top_height">
+        android:padding="@dimen/margin_spacing_dp16">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <Spinner
                 android:id="@+id/sp_subscriptionId"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height" />
+                android:layout_height="@dimen/view_height_dp48" />
         </LinearLayout>
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/layout_margin_top_height"
+            android:layout_marginTop="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -36,7 +36,7 @@
             <EditText
                 android:id="@+id/et_keyword"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 android:inputType="text" />
         </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/layout/item_qrcode.xml b/V2rayNG/app/src/main/res/layout/item_qrcode.xml
index d5997b3f..d3ea9075 100644
--- a/V2rayNG/app/src/main/res/layout/item_qrcode.xml
+++ b/V2rayNG/app/src/main/res/layout/item_qrcode.xml
@@ -9,8 +9,8 @@
 
     <ImageView
         android:id="@+id/iv_qcode"
-        android:layout_width="330dp"
-        android:layout_height="330dp"
+        android:layout_width="336dp"
+        android:layout_height="336dp"
         android:scaleType="fitXY"
         app:srcCompat="@drawable/ic_fab_check" />
 </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 fee1de30..b2d62b6f 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
@@ -9,13 +9,13 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
-        android:layout_width="@dimen/server_height"
-        android:layout_height="@dimen/server_height"
-        android:padding="@dimen/padding" />
+        android:layout_width="@dimen/view_height_dp72"
+        android:layout_height="@dimen/view_height_dp72"
+        android:padding="@dimen/padding_spacing_dp16" />
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_height="@dimen/server_height"
+        android:layout_height="@dimen/view_height_dp72"
         android:layout_weight="1.0"
         android:gravity="center"
         android:orientation="vertical">
@@ -32,7 +32,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="3"
-            android:paddingTop="@dimen/layout_margin_spacing"
+            android:paddingTop="@dimen/margin_spacing_dp8"
             android:textAppearance="@style/TextAppearance.AppCompat.Small" />
     </LinearLayout>
 
@@ -42,6 +42,6 @@
         android:layout_height="wrap_content"
         android:clickable="false"
         android:focusable="false"
-        android:padding="@dimen/padding"/>
+        android:padding="@dimen/padding_spacing_dp16"/>
 
 </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 6c4df973..e02cdc43 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_footer.xml
@@ -8,18 +8,18 @@
     <LinearLayout
         android:id="@+id/layout_edit"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/server_height"
+        android:layout_height="@dimen/view_height_dp48"
         android:layout_gravity="center"
         android:gravity="center"
         android:orientation="horizontal"
-        android:padding="@dimen/padding">
+        android:padding="@dimen/padding_spacing_dp16">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center|left"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/layout_margin_top_height">
+            android:paddingBottom="@dimen/margin_spacing_dp16">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml b/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
index fb1b6827..a6cfadec 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_logcat.xml
@@ -11,9 +11,9 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_margin_spacing"
-        android:paddingTop="@dimen/layout_margin_spacing"
-        android:paddingBottom="@dimen/layout_margin_spacing">
+        android:layout_margin="@dimen/margin_spacing_dp8"
+        android:paddingTop="@dimen/margin_spacing_dp8"
+        android:paddingBottom="@dimen/margin_spacing_dp8">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/log_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 e3d26b66..026b8bd6 100644
--- a/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+++ b/V2rayNG/app/src/main/res/layout/item_recycler_main.xml
@@ -10,9 +10,9 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/server_height"
+        android:layout_height="@dimen/view_height_dp72"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/layout_margin_spacing"
+        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start">
+            android:paddingStart="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -75,7 +75,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:paddingTop="4dp"
-                android:paddingEnd="@dimen/padding_end">
+                android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <TextView
                     android:id="@+id/tv_subscription"
@@ -109,18 +109,18 @@
                 <LinearLayout
                     android:id="@+id/layout_share"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="@dimen/view_height_dp72"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center"
                     android:nextFocusLeft="@+id/info_container"
                     android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
+                    android:padding="@dimen/margin_spacing_dp8">
 
                     <ImageView
                         android:layout_width="wrap_content"
-                        android:layout_height="@dimen/png_height"
+                        android:layout_height="@dimen/image_size_dp24"
                         app:srcCompat="@drawable/ic_share_24dp" />
 
                 </LinearLayout>
@@ -128,17 +128,17 @@
                 <LinearLayout
                     android:id="@+id/layout_edit"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="@dimen/view_height_dp72"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
+                    android:padding="@dimen/margin_spacing_dp8">
 
                     <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
+                        android:layout_width="@dimen/image_size_dp24"
+                        android:layout_height="@dimen/image_size_dp24"
                         app:srcCompat="@drawable/ic_edit_24dp" />
 
                 </LinearLayout>
@@ -146,17 +146,17 @@
                 <LinearLayout
                     android:id="@+id/layout_remove"
                     android:layout_width="wrap_content"
-                    android:layout_height="@dimen/server_height"
+                    android:layout_height="@dimen/view_height_dp72"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:clickable="true"
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
+                    android:padding="@dimen/margin_spacing_dp8">
 
                     <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
+                        android:layout_width="@dimen/image_size_dp24"
+                        android:layout_height="@dimen/image_size_dp24"
                         app:srcCompat="@drawable/ic_delete_24dp" />
 
                 </LinearLayout>
@@ -168,7 +168,7 @@
                 android:layout_gravity="right"
                 android:orientation="vertical"
                 android:paddingBottom="4dp"
-                android:paddingEnd="@dimen/padding_end">
+                android:paddingEnd="@dimen/padding_spacing_dp16">
 
                 <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 71976d0f..4f823e60 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,24 +9,24 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sub_height"
+        android:layout_height="@dimen/view_height_dp90"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/layout_margin_spacing"
+        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/layout_margin_spacing"
-        android:paddingBottom="@dimen/layout_margin_spacing">
+        android:paddingTop="@dimen/margin_spacing_dp8"
+        android:paddingBottom="@dimen/margin_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start">
+            android:paddingStart="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -41,10 +41,10 @@
 
                 <ImageView
                     android:id="@+id/img_locked"
-                    android:layout_width="@dimen/padding"
-                    android:layout_height="@dimen/padding"
+                    android:layout_width="@dimen/padding_spacing_dp16"
+                    android:layout_height="@dimen/padding_spacing_dp16"
                     android:layout_gravity="center"
-                    android:layout_marginStart="@dimen/padding_start"
+                    android:layout_marginStart="@dimen/padding_spacing_dp16"
                     app:srcCompat="@drawable/ic_lock_24dp" />
 
             </LinearLayout>
@@ -53,7 +53,7 @@
                 android:id="@+id/domainIp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:layout_marginTop="@dimen/margin_spacing_dp8"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -61,7 +61,7 @@
                 android:id="@+id/outboundTag"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:layout_marginTop="@dimen/margin_spacing_dp8"
                 android:lines="1"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -69,11 +69,11 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/sub_height"
+            android:layout_height="@dimen/view_height_dp90"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start"
-            android:paddingEnd="@dimen/padding_end">
+            android:paddingStart="@dimen/padding_spacing_dp16"
+            android:paddingEnd="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:id="@+id/layout_edit"
@@ -85,18 +85,18 @@
                 android:gravity="center"
                 android:nextFocusLeft="@+id/info_container"
                 android:orientation="vertical"
-                android:padding="@dimen/layout_margin_spacing">
+                android:padding="@dimen/margin_spacing_dp8">
 
                 <ImageView
-                    android:layout_width="@dimen/png_height"
-                    android:layout_height="@dimen/png_height"
+                    android:layout_width="@dimen/image_size_dp24"
+                    android:layout_height="@dimen/image_size_dp24"
                     app:srcCompat="@drawable/ic_edit_24dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:layout_marginTop="@dimen/margin_spacing_dp8"
                 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 a2e335be..1afa5634 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,24 +9,24 @@
     <LinearLayout
         android:id="@+id/info_container"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sub_height"
+        android:layout_height="@dimen/view_height_dp90"
         android:layout_gravity="center"
-        android:layout_margin="@dimen/layout_margin_spacing"
+        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
         android:gravity="center"
         android:nextFocusRight="@+id/layout_edit"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/layout_margin_spacing"
-        android:paddingBottom="@dimen/layout_margin_spacing">
+        android:paddingTop="@dimen/margin_spacing_dp8"
+        android:paddingBottom="@dimen/margin_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start">
+            android:paddingStart="@dimen/padding_spacing_dp16">
 
             <TextView
                 android:id="@+id/tv_name"
@@ -38,7 +38,7 @@
                 android:id="@+id/tv_url"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:layout_marginTop="@dimen/margin_spacing_dp8"
                 android:lines="2"
                 android:textAppearance="@style/TextAppearance.AppCompat.Small" />
 
@@ -46,11 +46,11 @@
 
         <LinearLayout
             android:layout_width="wrap_content"
-            android:layout_height="@dimen/sub_height"
+            android:layout_height="@dimen/view_height_dp90"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start"
-            android:paddingEnd="@dimen/padding_end">
+            android:paddingStart="@dimen/padding_spacing_dp16"
+            android:paddingEnd="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -67,11 +67,11 @@
                     android:focusable="true"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
+                    android:padding="@dimen/margin_spacing_dp8">
 
                     <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
+                        android:layout_width="@dimen/image_size_dp24"
+                        android:layout_height="@dimen/image_size_dp24"
                         app:srcCompat="@drawable/ic_share_24dp" />
 
                 </LinearLayout>
@@ -86,11 +86,11 @@
                     android:gravity="center"
                     android:nextFocusLeft="@+id/info_container"
                     android:orientation="vertical"
-                    android:padding="@dimen/layout_margin_spacing">
+                    android:padding="@dimen/margin_spacing_dp8">
 
                     <ImageView
-                        android:layout_width="@dimen/png_height"
-                        android:layout_height="@dimen/png_height"
+                        android:layout_width="@dimen/image_size_dp24"
+                        android:layout_height="@dimen/image_size_dp24"
                         app:srcCompat="@drawable/ic_edit_24dp" />
 
                 </LinearLayout>
@@ -99,7 +99,7 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/layout_margin_spacing"
+                android:layout_marginTop="@dimen/margin_spacing_dp8"
                 android:orientation="horizontal">
 
                 <androidx.appcompat.widget.SwitchCompat
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 1fe9deb2..cace74ca 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
@@ -8,18 +8,18 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/layout_margin_spacing"
+        android:layout_margin="@dimen/margin_spacing_dp8"
         android:background="?attr/selectableItemBackground"
         android:gravity="center"
         android:orientation="horizontal"
-        android:padding="@dimen/nav_header_vertical_spacing">
+        android:padding="@dimen/margin_spacing_dp8">
 
         <LinearLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="vertical"
-            android:paddingStart="@dimen/padding_start">
+            android:paddingStart="@dimen/padding_spacing_dp16">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -61,11 +61,11 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:focusable="true"
-            android:padding="@dimen/nav_header_vertical_spacing">
+            android:padding="@dimen/margin_spacing_dp8">
 
             <ImageView
-                android:layout_width="@dimen/png_height"
-                android:layout_height="@dimen/png_height"
+                android:layout_width="@dimen/image_size_dp24"
+                android:layout_height="@dimen/image_size_dp24"
                 app:srcCompat="@drawable/ic_edit_24dp" />
         </LinearLayout>
 
@@ -76,11 +76,11 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:clickable="true"
             android:focusable="true"
-            android:padding="@dimen/nav_header_vertical_spacing">
+            android:padding="@dimen/margin_spacing_dp8">
 
             <ImageView
-                android:layout_width="@dimen/png_height"
-                android:layout_height="@dimen/png_height"
+                android:layout_width="@dimen/image_size_dp24"
+                android:layout_height="@dimen/image_size_dp24"
                 app:srcCompat="@drawable/ic_delete_24dp" />
         </LinearLayout>
     </LinearLayout>
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 66c46609..b34c8b5f 100644
--- a/V2rayNG/app/src/main/res/layout/layout_address_port.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_address_port.xml
@@ -19,7 +19,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -30,7 +30,7 @@
         <EditText
             android:id="@+id/et_remarks"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text" />
 
     </LinearLayout>
@@ -38,7 +38,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -49,7 +49,7 @@
         <EditText
             android:id="@+id/et_address"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text" />
 
     </LinearLayout>
@@ -57,7 +57,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -68,7 +68,7 @@
         <EditText
             android:id="@+id/et_port"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="number" />
     </LinearLayout>
 
diff --git a/V2rayNG/app/src/main/res/layout/layout_progress.xml b/V2rayNG/app/src/main/res/layout/layout_progress.xml
index 8e431cad..2f994ab0 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="@dimen/padding">
+    android:padding="@dimen/padding_spacing_dp16">
 
     <ProgressBar
         android:id="@+id/pb_waiting"
diff --git a/V2rayNG/app/src/main/res/layout/layout_tls.xml b/V2rayNG/app/src/main/res/layout/layout_tls.xml
index 1c0c5589..affb1b40 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/layout_margin_top_height"
+    android:layout_marginTop="@dimen/margin_spacing_dp16"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lay_stream_security"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
 
         android:orientation="vertical">
 
@@ -21,7 +21,7 @@
         <Spinner
             android:id="@+id/sp_stream_security"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/streamsecurityxs"
             android:nextFocusDown="@+id/et_sni" />
 
@@ -31,7 +31,7 @@
         android:id="@+id/lay_sni"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -42,7 +42,7 @@
         <EditText
             android:id="@+id/et_sni"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -53,7 +53,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin">
+        android:layout_marginBottom="@dimen/margin_spacing_dp16">
 
         <TextView
             android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
         <Spinner
             android:id="@+id/sp_stream_fingerprint"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/streamsecurity_utls"
             android:nextFocusDown="@+id/sp_stream_alpn" />
 
@@ -74,7 +74,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin">
+        android:layout_marginBottom="@dimen/margin_spacing_dp16">
 
         <TextView
             android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
         <Spinner
             android:id="@+id/sp_stream_alpn"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/streamsecurity_alpn"
             android:nextFocusDown="@+id/sp_allow_insecure" />
 
@@ -104,7 +104,7 @@
         <Spinner
             android:id="@+id/sp_allow_insecure"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/allowinsecures" />
     </LinearLayout>
 
@@ -112,7 +112,7 @@
         android:id="@+id/lay_public_key"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -123,7 +123,7 @@
         <EditText
             android:id="@+id/et_public_key"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -133,7 +133,7 @@
         android:id="@+id/lay_short_id"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -144,7 +144,7 @@
         <EditText
             android:id="@+id/et_short_id"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -154,7 +154,7 @@
         android:id="@+id/lay_spider_x"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -165,7 +165,7 @@
         <EditText
             android:id="@+id/et_spider_x"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             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 3180f666..6814af4e 100644
--- a/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_tls_hysteria2.xml
@@ -2,14 +2,14 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/layout_margin_top_height"
+    android:layout_marginTop="@dimen/margin_spacing_dp16"
     android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/lay_stream_security"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
 
         android:orientation="vertical">
 
@@ -21,7 +21,7 @@
         <Spinner
             android:id="@+id/sp_stream_security"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/streamsecuritys"
             android:nextFocusDown="@+id/et_sni" />
 
@@ -31,7 +31,7 @@
         android:id="@+id/lay_sni"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_horizontal_margin"
+        android:layout_marginBottom="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -42,7 +42,7 @@
         <EditText
             android:id="@+id/et_sni"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text"
             android:nextFocusDown="@+id/sp_stream_fingerprint" />
 
@@ -63,14 +63,14 @@
         <Spinner
             android:id="@+id/sp_allow_insecure"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/allowinsecures" />
 
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/activity_horizontal_margin"
+            android:layout_marginBottom="@dimen/margin_spacing_dp16"
             android:orientation="vertical">
 
             <TextView
@@ -81,7 +81,7 @@
             <EditText
                 android:id="@+id/et_pinsha256"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/edit_height"
+                android:layout_height="@dimen/view_height_dp48"
                 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 bda1e11c..12136d59 100644
--- a/V2rayNG/app/src/main/res/layout/layout_transport.xml
+++ b/V2rayNG/app/src/main/res/layout/layout_transport.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -20,7 +20,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -31,14 +31,14 @@
         <Spinner
             android:id="@+id/sp_network"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:entries="@array/networks" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -50,13 +50,13 @@
         <Spinner
             android:id="@+id/sp_header_type"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height" />
+            android:layout_height="@dimen/view_height_dp48" />
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -68,7 +68,7 @@
         <EditText
             android:id="@+id/et_request_host"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text" />
     </LinearLayout>
 
@@ -76,7 +76,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
@@ -88,7 +88,7 @@
         <EditText
             android:id="@+id/et_path"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/edit_height"
+            android:layout_height="@dimen/view_height_dp48"
             android:inputType="text" />
     </LinearLayout>
 
@@ -96,7 +96,7 @@
         android:id="@+id/layout_extra"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/layout_margin_top_height"
+        android:layout_marginTop="@dimen/margin_spacing_dp16"
         android:orientation="vertical">
 
         <TextView
diff --git a/V2rayNG/app/src/main/res/layout/nav_header.xml b/V2rayNG/app/src/main/res/layout/nav_header.xml
index a4c672aa..3886858b 100644
--- a/V2rayNG/app/src/main/res/layout/nav_header.xml
+++ b/V2rayNG/app/src/main/res/layout/nav_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
+    android:layout_height="@dimen/view_height_dp160"
     android:background="@drawable/nav_header_bg"
     android:gravity="center"
     android:orientation="vertical"
-    android:padding="@dimen/activity_horizontal_margin">
+    android:padding="@dimen/margin_spacing_dp16">
 
     <TextView
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         android:layout_gravity="center"
         android:fontFamily="@font/montserrat_thin"
         android:gravity="center"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
+        android:paddingTop="@dimen/margin_spacing_dp8"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
diff --git a/V2rayNG/app/src/main/res/layout/widget_switch.xml b/V2rayNG/app/src/main/res/layout/widget_switch.xml
index bf0bfc71..50776f87 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="@dimen/padding"
+            android:padding="@dimen/padding_spacing_dp16"
             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 313fa475..4a4a33b4 100644
--- a/V2rayNG/app/src/main/res/values/dimens.xml
+++ b/V2rayNG/app/src/main/res/values/dimens.xml
@@ -1,21 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="bypass_list_header_height">64dp</dimen>
-    <dimen name="layout_margin_top_height">16dp</dimen>
-    <dimen name="layout_margin_right_height">16dp</dimen>
-    <dimen name="layout_margin_spacing">8dp</dimen>
-    <dimen name="edit_height">50dp</dimen>
-    <dimen name="png_height">24dp</dimen>
-    <dimen name="server_height">72dp</dimen>
-    <dimen name="sub_height">90dp</dimen>
-    <dimen name="connection_test_height">60dp</dimen>
-    <dimen name="padding_start">16dp</dimen>
-    <dimen name="padding_end">16dp</dimen>
-    <dimen name="padding">16dp</dimen>
-    <dimen name="cardview_margin">3dp</dimen>
+    <dimen name="margin_spacing_dp8">8dp</dimen>
+    <dimen name="margin_spacing_dp16">16dp</dimen>
+    <dimen name="padding_spacing_dp16">16dp</dimen>
 
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-    <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">160dp</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>