From c7b2c2abac73aa1280eb9b74622eb9596a480bb3 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 15 Feb 2024 11:02:38 +0800
Subject: [PATCH] Fix layout

---
 app/src/leanback/res/layout/activity_home.xml       |  8 ++++----
 app/src/leanback/res/layout/activity_setting.xml    |  2 +-
 .../leanback/res/layout/activity_setting_custom.xml | 13 +++++--------
 .../leanback/res/layout/activity_setting_danmu.xml  |  6 ------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/src/leanback/res/layout/activity_home.xml b/app/src/leanback/res/layout/activity_home.xml
index 231a7aadc..9ea2e3727 100644
--- a/app/src/leanback/res/layout/activity_home.xml
+++ b/app/src/leanback/res/layout/activity_home.xml
@@ -17,18 +17,18 @@
         android:paddingBottom="8dp">
 
         <LinearLayout
-            android:layout_gravity="start"
-            android:orientation="horizontal"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:layout_gravity="start"
+            android:orientation="horizontal">
 
             <com.fongmi.android.tv.ui.custom.CustomTitleView
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:singleLine="true"
                 android:layout_marginRight="6dp"
                 android:focusable="false"
+                android:singleLine="true"
                 android:text="@string/app_name"
                 android:textColor="@color/white"
                 android:textSize="24dp" />
diff --git a/app/src/leanback/res/layout/activity_setting.xml b/app/src/leanback/res/layout/activity_setting.xml
index b9a215a20..8426f316b 100644
--- a/app/src/leanback/res/layout/activity_setting.xml
+++ b/app/src/leanback/res/layout/activity_setting.xml
@@ -271,8 +271,8 @@
                 android:id="@+id/custom"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
diff --git a/app/src/leanback/res/layout/activity_setting_custom.xml b/app/src/leanback/res/layout/activity_setting_custom.xml
index 26d8a4f6e..6ff0796f7 100644
--- a/app/src/leanback/res/layout/activity_setting_custom.xml
+++ b/app/src/leanback/res/layout/activity_setting_custom.xml
@@ -16,15 +16,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:orientation="horizontal">
 
             <LinearLayout
                 android:id="@+id/quality"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -90,8 +89,8 @@
                 android:id="@+id/episode"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -157,8 +156,8 @@
                 android:id="@+id/displayTime"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -224,8 +223,8 @@
                 android:id="@+id/displayDuration"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -291,8 +290,8 @@
                 android:id="@+id/fullscreenMenuKey"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
                 android:layout_marginEnd="16dp"
+                android:layout_weight="1"
                 android:background="@drawable/selector_item"
                 android:focusable="true"
                 android:focusableInTouchMode="true"
@@ -345,8 +344,6 @@
                     tools:text="開啟" />
 
             </LinearLayout>
-
         </LinearLayout>
-
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/activity_setting_danmu.xml b/app/src/leanback/res/layout/activity_setting_danmu.xml
index 5a67842d1..e9d3bb5f8 100644
--- a/app/src/leanback/res/layout/activity_setting_danmu.xml
+++ b/app/src/leanback/res/layout/activity_setting_danmu.xml
@@ -17,7 +17,6 @@
             android:id="@+id/danmuLoad"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:background="@drawable/selector_item"
             android:focusable="true"
             android:focusableInTouchMode="true"
@@ -184,10 +183,5 @@
                 android:textSize="18sp" />
 
         </LinearLayout>
-
-
-
-
-
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file