From 5ceda0b6bf585be0fa39c36672bc81760c01df7e Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 8 Sep 2023 01:53:04 +0800
Subject: [PATCH] Clean code

---
 app/build.gradle                              |  4 +--
 .../res/layout/activity_setting_player.xml    | 32 +++++++++----------
 .../res/layout/fragment_setting_player.xml    | 32 +++++++++----------
 3 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 48d434b9a..eab75c48b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,12 +21,12 @@ android {
         leanback {
             dimension "mode"
             versionCode 205
-            versionName "20230905"
+            versionName "20230908"
         }
         mobile {
             dimension "mode"
             versionCode 205
-            versionName "20230905"
+            versionName "20230908"
         }
         java {
             dimension "api"
diff --git a/app/src/leanback/res/layout/activity_setting_player.xml b/app/src/leanback/res/layout/activity_setting_player.xml
index 073fb419d..ebbe32e6d 100644
--- a/app/src/leanback/res/layout/activity_setting_player.xml
+++ b/app/src/leanback/res/layout/activity_setting_player.xml
@@ -46,7 +46,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/flag"
+            android:id="@+id/subtitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -59,23 +59,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_flag"
+                android:text="@string/setting_player_subtitle"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/flagText"
+                android:id="@+id/subtitleText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="自動" />
+                tools:text="16" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/subtitle"
+            android:id="@+id/flag"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -88,23 +88,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_subtitle"
+                android:text="@string/setting_player_flag"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/subtitleText"
+                android:id="@+id/flagText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="16" />
+                tools:text="自動" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/http"
+            android:id="@+id/tunnel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -117,23 +117,23 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_http"
+                android:text="@string/setting_player_tunnel"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/httpText"
+                android:id="@+id/tunnelText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="OkHttp" />
+                tools:text="關" />
 
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/tunnel"
+            android:id="@+id/http"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -146,18 +146,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="16dp"
-                android:text="@string/setting_player_tunnel"
+                android:text="@string/setting_player_http"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
 
             <TextView
-                android:id="@+id/tunnelText"
+                android:id="@+id/httpText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="end"
                 android:textColor="@color/white"
                 android:textSize="18sp"
-                tools:text="關" />
+                tools:text="OkHttp" />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/mobile/res/layout/fragment_setting_player.xml b/app/src/mobile/res/layout/fragment_setting_player.xml
index 922cb6b0a..b71a8a256 100644
--- a/app/src/mobile/res/layout/fragment_setting_player.xml
+++ b/app/src/mobile/res/layout/fragment_setting_player.xml
@@ -69,7 +69,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/flag"
+                android:id="@+id/subtitle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -80,12 +80,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/setting_player_flag"
+                    android:text="@string/setting_player_subtitle"
                     android:textColor="@color/white"
                     android:textSize="16sp" />
 
                 <TextView
-                    android:id="@+id/flagText"
+                    android:id="@+id/subtitleText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="middle"
@@ -93,12 +93,12 @@
                     android:singleLine="true"
                     android:textColor="@color/white"
                     android:textSize="16sp"
-                    tools:text="自動" />
+                    tools:text="16" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/subtitle"
+                android:id="@+id/flag"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -109,12 +109,12 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/setting_player_subtitle"
+                    android:text="@string/setting_player_flag"
                     android:textColor="@color/white"
                     android:textSize="16sp" />
 
                 <TextView
-                    android:id="@+id/subtitleText"
+                    android:id="@+id/flagText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="middle"
@@ -122,12 +122,12 @@
                     android:singleLine="true"
                     android:textColor="@color/white"
                     android:textSize="16sp"
-                    tools:text="16" />
+                    tools:text="自動" />
 
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/http"
+                android:id="@+id/background"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -138,18 +138,18 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/setting_player_http"
+                    android:text="@string/setting_player_background"
                     android:textColor="@color/white"
                     android:textSize="16sp" />
 
                 <TextView
-                    android:id="@+id/httpText"
+                    android:id="@+id/backgroundText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="end"
                     android:textColor="@color/white"
                     android:textSize="16sp"
-                    tools:text="OkHttp" />
+                    tools:text="畫中畫" />
 
             </LinearLayout>
 
@@ -181,7 +181,7 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/background"
+                android:id="@+id/http"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -192,18 +192,18 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/setting_player_background"
+                    android:text="@string/setting_player_http"
                     android:textColor="@color/white"
                     android:textSize="16sp" />
 
                 <TextView
-                    android:id="@+id/backgroundText"
+                    android:id="@+id/httpText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="end"
                     android:textColor="@color/white"
                     android:textSize="16sp"
-                    tools:text="畫中畫" />
+                    tools:text="OkHttp" />
 
             </LinearLayout>
         </LinearLayout>