From e851f40ff77f1c6d8d54797a42c3533afc8332ca Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 21 May 2025 18:08:12 +0800
Subject: [PATCH] Optimize live ui

---
 .../android/tv/ui/activity/LiveActivity.java  |  5 ++--
 .../leanback/res/layout/view_control_live.xml | 28 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 779b28b21..9dae69ea6 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -195,13 +195,12 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
         setScale(Setting.getLiveScale());
         ExoUtil.setSubtitleView(mBinding.exo);
         mPlayers.setTag(tag = UUID.randomUUID().toString());
-        findViewById(R.id.timeBar).setNextFocusUpId(R.id.action);
+        findViewById(R.id.timeBar).setNextFocusUpId(R.id.home);
         mBinding.control.invert.setActivated(Setting.isInvert());
         mBinding.control.across.setActivated(Setting.isAcross());
         mBinding.control.change.setActivated(Setting.isChange());
         mBinding.control.speed.setText(mPlayers.getSpeedText());
         mBinding.control.decode.setText(mPlayers.getDecodeText());
-        mBinding.control.home.setVisibility(LiveConfig.isOnly() ? View.GONE : View.VISIBLE);
     }
 
     private void setDecode() {
@@ -946,7 +945,7 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
 
     @Override
     public void onMenu() {
-        showControl(mBinding.control.action);
+        showControl(mBinding.control.home);
     }
 
     @Override
diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index e114bcf9c..3d02b328a 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -18,7 +18,7 @@
         android:orientation="horizontal">
 
         <TextView
-            android:id="@+id/action"
+            android:id="@+id/home"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
@@ -26,6 +26,18 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:nextFocusLeft="@id/change"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            tools:text="首頁" />
+
+        <TextView
+            android:id="@+id/action"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:background="@drawable/selector_text"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:text="@string/play"
             android:textColor="@color/white"
             android:textSize="14sp" />
@@ -80,18 +92,6 @@
             android:textSize="14sp"
             tools:text="預設" />
 
-        <TextView
-            android:id="@+id/home"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="12dp"
-            android:background="@drawable/selector_text"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            tools:text="首頁" />
-
         <TextView
             android:id="@+id/line"
             android:layout_width="wrap_content"
@@ -182,7 +182,7 @@
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:nextFocusRight="@id/action"
+            android:nextFocusRight="@id/home"
             android:text="@string/play_change"
             android:textColor="@color/text"
             android:textSize="14sp" />