From 00768b985bb3988522e2dd8a65449deb6adf0896 Mon Sep 17 00:00:00 2001
From: AnGgIt86 <jarbull86@gmail.com>
Date: Sat, 28 Sep 2024 18:16:19 +0700
Subject: [PATCH] Optimize Config Layout

---
 .../layout/activity_server_shadowsocks.xml    | 130 +-----------------
 .../main/res/layout/activity_server_socks.xml |  49 +------
 .../res/layout/activity_server_trojan.xml     | 130 +-----------------
 .../main/res/layout/activity_server_vless.xml | 130 +-----------------
 .../main/res/layout/activity_server_vmess.xml | 130 +-----------------
 .../res/layout/activity_server_wireguard.xml  |  49 +------
 .../main/res/layout/layout_address_port.xml   |  54 ++++++++
 .../layout/{tls_layout.xml => layout_tls.xml} |   0
 app/src/main/res/layout/layout_transport.xml  |  84 +++++++++++
 9 files changed, 152 insertions(+), 604 deletions(-)
 create mode 100644 app/src/main/res/layout/layout_address_port.xml
 rename app/src/main/res/layout/{tls_layout.xml => layout_tls.xml} (100%)
 create mode 100644 app/src/main/res/layout/layout_transport.xml

diff --git a/app/src/main/res/layout/activity_server_shadowsocks.xml b/app/src/main/res/layout/activity_server_shadowsocks.xml
index 285d034f..6ab44773 100644
--- a/app/src/main/res/layout/activity_server_shadowsocks.xml
+++ b/app/src/main/res/layout/activity_server_shadowsocks.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
@@ -361,85 +314,8 @@
                                 android:layout_height="@dimen/edit_height"
                                 android:foreground="?android:selectableItemBackground" />
                         </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_network" />
-                            <Spinner
-                                android:entries="@array/networks"
-                                android:id="@+id/sp_network"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:id="@+id/sp_header_type_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_head_type" />
-                            <Spinner
-                                android:id="@+id/sp_header_type"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_request_host"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_request_host"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_request_host"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_path"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_path"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_path"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <include layout="@layout/tls_layout" />
+                        <include layout="@layout/layout_transport" />
+                        <include layout="@layout/layout_tls" />
                     </LinearLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_server_socks.xml b/app/src/main/res/layout/activity_server_socks.xml
index 91da2086..c604038b 100644
--- a/app/src/main/res/layout/activity_server_socks.xml
+++ b/app/src/main/res/layout/activity_server_socks.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_server_trojan.xml b/app/src/main/res/layout/activity_server_trojan.xml
index 4dfef91e..57786949 100644
--- a/app/src/main/res/layout/activity_server_trojan.xml
+++ b/app/src/main/res/layout/activity_server_trojan.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
@@ -341,85 +294,8 @@
                                     android:inputType="text" />
                             </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_network" />
-                            <Spinner
-                                android:entries="@array/networks"
-                                android:id="@+id/sp_network"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:id="@+id/sp_header_type_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_head_type" />
-                            <Spinner
-                                android:id="@+id/sp_header_type"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_request_host"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_request_host"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_request_host"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_path"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_path"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_path"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <include layout="@layout/tls_layout" />
+                        <include layout="@layout/layout_transport" />
+                        <include layout="@layout/layout_tls" />
                     </LinearLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_server_vless.xml b/app/src/main/res/layout/activity_server_vless.xml
index 75e83845..22fed0ea 100644
--- a/app/src/main/res/layout/activity_server_vless.xml
+++ b/app/src/main/res/layout/activity_server_vless.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
@@ -380,85 +333,8 @@
                                     android:inputType="text" />
                             </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_network" />
-                            <Spinner
-                                android:entries="@array/networks"
-                                android:id="@+id/sp_network"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:id="@+id/sp_header_type_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_head_type" />
-                            <Spinner
-                                android:id="@+id/sp_header_type"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_request_host"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_request_host"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_request_host"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_path"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_path"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_path"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <include layout="@layout/tls_layout" />
+                        <include layout="@layout/layout_transport" />
+                        <include layout="@layout/layout_tls" />
                     </LinearLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_server_vmess.xml b/app/src/main/res/layout/activity_server_vmess.xml
index 46425639..39ea668d 100644
--- a/app/src/main/res/layout/activity_server_vmess.xml
+++ b/app/src/main/res/layout/activity_server_vmess.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
@@ -379,85 +332,8 @@
                                 android:layout_height="@dimen/edit_height"
                                 android:foreground="?android:selectableItemBackground" />
                         </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_network" />
-                            <Spinner
-                                android:entries="@array/networks"
-                                android:id="@+id/sp_network"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:id="@+id/sp_header_type_title"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/server_lab_head_type" />
-                            <Spinner
-                                android:id="@+id/sp_header_type"
-                                android:background="@drawable/uwu_bg_spinner"
-                                android:focusable="true"
-                                android:clickable="true"
-                                android:layout_width="match_parent"
-                                android:layout_height="@dimen/edit_height"
-                                android:foreground="?android:selectableItemBackground" />
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_request_host"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_request_host"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_request_host"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:id="@+id/tv_path"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_path"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_path"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <include layout="@layout/tls_layout" />
+                        <include layout="@layout/layout_transport" />
+                        <include layout="@layout/layout_tls" />
                     </LinearLayout>
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_server_wireguard.xml b/app/src/main/res/layout/activity_server_wireguard.xml
index 9f2a58d6..71575cce 100644
--- a/app/src/main/res/layout/activity_server_wireguard.xml
+++ b/app/src/main/res/layout/activity_server_wireguard.xml
@@ -275,54 +275,7 @@
                         android:paddingEnd="16.0dip"
                         android:layout_marginStart="16.0dip"
                         android:layout_marginEnd="16.0dip">
-                        <LinearLayout
-                            android:orientation="vertical"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="16.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_remarks"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_remarks"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
-                        <LinearLayout
-                            android:orientation="horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8.0dip"
-                            android:layout_marginBottom="8.0dip">
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="200.0dip"
-                                android:layout_height="wrap_content"
-                                android:layout_marginRight="10.0dip"
-                                android:hint="@string/server_lab_address3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_address"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="text" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                            <com.google.android.material.textfield.TextInputLayout
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:hint="@string/server_lab_port3"
-                                style="@style/Outline_TextInputLayout">
-                                <com.google.android.material.textfield.TextInputEditText
-                                    android:id="@+id/et_port"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:inputType="number" />
-                            </com.google.android.material.textfield.TextInputLayout>
-                        </LinearLayout>
+                        <include layout="@layout/layout_address_port" />
                         <LinearLayout
                             android:orientation="vertical"
                             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_address_port.xml b/app/src/main/res/layout/layout_address_port.xml
new file mode 100644
index 00000000..8046ff44
--- /dev/null
+++ b/app/src/main/res/layout/layout_address_port.xml
@@ -0,0 +1,54 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16.0dip"
+        android:layout_marginBottom="8.0dip">
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_lab_remarks"
+            style="@style/Outline_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_remarks"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8.0dip"
+        android:layout_marginBottom="8.0dip">
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="200.0dip"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10.0dip"
+            android:hint="@string/server_lab_address3"
+            style="@style/Outline_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_address"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_lab_port3"
+            style="@style/Outline_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_port"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="number" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tls_layout.xml b/app/src/main/res/layout/layout_tls.xml
similarity index 100%
rename from app/src/main/res/layout/tls_layout.xml
rename to app/src/main/res/layout/layout_tls.xml
diff --git a/app/src/main/res/layout/layout_transport.xml b/app/src/main/res/layout/layout_transport.xml
new file mode 100644
index 00000000..a058a461
--- /dev/null
+++ b/app/src/main/res/layout/layout_transport.xml
@@ -0,0 +1,84 @@
+<?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="wrap_content"
+    android:orientation="vertical">
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8.0dip"
+        android:layout_marginBottom="8.0dip">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_network" />
+        <Spinner
+            android:entries="@array/networks"
+            android:id="@+id/sp_network"
+            android:background="@drawable/uwu_bg_spinner"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edit_height"
+            android:foreground="?android:selectableItemBackground" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8.0dip"
+        android:layout_marginBottom="8.0dip">
+        <TextView
+            android:id="@+id/sp_header_type_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_lab_head_type" />
+        <Spinner
+            android:id="@+id/sp_header_type"
+            android:background="@drawable/uwu_bg_spinner"
+            android:focusable="true"
+            android:clickable="true"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/edit_height"
+            android:foreground="?android:selectableItemBackground" />
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8.0dip"
+        android:layout_marginBottom="8.0dip">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/tv_request_host"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_lab_request_host"
+            style="@style/Outline_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_request_host"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8.0dip"
+        android:layout_marginBottom="8.0dip">
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/tv_path"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/server_lab_path"
+            style="@style/Outline_TextInputLayout">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/et_path"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file