From 880965dc87d1add7087ce6f2fd567ccfef51745d Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 21 Apr 2023 11:49:26 +0800
Subject: [PATCH] [leanback] revert live control

---
 .../android/tv/ui/activity/LiveActivity.java  |   2 +
 .../leanback/res/layout/view_control_live.xml | 335 +++++++++---------
 .../leanback/res/values-zh-rCN/strings.xml    |   3 -
 .../leanback/res/values-zh-rTW/strings.xml    |   3 -
 app/src/leanback/res/values/strings.xml       |   3 -
 5 files changed, 168 insertions(+), 178 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 080beae61..da7fcbeeb 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
@@ -464,8 +464,10 @@ public class LiveActivity extends BaseActivity implements GroupPresenter.OnClick
     private void setInfo() {
         mChannel.loadLogo(mBinding.widget.logo);
         mBinding.widget.name.setText(mChannel.getName());
+        mBinding.control.name.setText(mChannel.getName());
         mBinding.widget.line.setText(mChannel.getLineText());
         mBinding.widget.number.setText(mChannel.getNumber());
+        mBinding.control.number.setText(mChannel.getNumber());
         mBinding.control.line.setText(mChannel.getLineText());
         mBinding.widget.line.setVisibility(mChannel.getLineVisible());
         mBinding.control.line.setVisibility(mChannel.getLineVisible());
diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index 7a7323888..18951a078 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -11,180 +11,177 @@
     android:paddingEnd="16dp"
     android:paddingBottom="8dp">
 
-    <HorizontalScrollView
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fillViewport="true"
-        android:scrollbars="none">
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/number"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:text="@string/play"
-                android:textColor="@color/grey_700"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/player"
-                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="EXO" />
-
-            <TextView
-                android:id="@+id/decode"
-                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/speed"
-                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"
-                android:visibility="gone"
-                tools:text="1.00"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/scale"
-                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/text"
-                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:tag="3"
-                android:text="@string/play_track_text"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/audio"
-                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:tag="1"
-                android:text="@string/play_track_audio"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/video"
-                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:tag="2"
-                android:text="@string/play_track_video"
-                android:textColor="@color/white"
-                android:textSize="14sp"
-                android:visibility="gone"
-                tools:visibility="visible" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="12dp"
-                android:text="@string/live_other"
-                android:textColor="@color/grey_700"
-                android:textSize="18sp" />
-
-            <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"
-                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"
-                android:visibility="gone"
-                tools:text="來源 1"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/invert"
-                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_invert"
-                android:textColor="@color/text"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/across"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@drawable/selector_text"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:text="@string/play_across"
-                android:textColor="@color/text"
-                android:textSize="14sp" />
-
-        </LinearLayout>
-    </HorizontalScrollView>
+            android:layout_marginEnd="12dp"
+            android:textColor="@color/grey_800"
+            android:textSize="18sp"
+            tools:text="005" />
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:layout_weight="1"
+            android:singleLine="true"
+            android:textColor="@color/grey_800"
+            android:textSize="18sp"
+            tools:text="民視" />
+
+        <TextView
+            android:id="@+id/player"
+            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="EXO" />
+
+        <TextView
+            android:id="@+id/decode"
+            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/speed"
+            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"
+            android:visibility="gone"
+            tools:text="1.00"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/scale"
+            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/text"
+            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:tag="3"
+            android:text="@string/play_track_text"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/audio"
+            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:tag="1"
+            android:text="@string/play_track_audio"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/video"
+            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:tag="2"
+            android:text="@string/play_track_video"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:visibility="gone"
+            tools:visibility="visible" />
+
+        <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"
+            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"
+            android:visibility="gone"
+            tools:text="來源 1"
+            tools:visibility="visible" />
+
+        <TextView
+            android:id="@+id/invert"
+            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_invert"
+            android:textColor="@color/text"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/across"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@drawable/selector_text"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:text="@string/play_across"
+            android:textColor="@color/text"
+            android:textSize="14sp" />
+
+    </LinearLayout>
 
     <com.fongmi.android.tv.ui.custom.CustomSeekView
         android:id="@+id/seek"
diff --git a/app/src/leanback/res/values-zh-rCN/strings.xml b/app/src/leanback/res/values-zh-rCN/strings.xml
index d4e815104..c031f9cb4 100644
--- a/app/src/leanback/res/values-zh-rCN/strings.xml
+++ b/app/src/leanback/res/values-zh-rCN/strings.xml
@@ -10,9 +10,6 @@
     <string name="home_history">最近观看</string>
     <string name="home_recommend">更新推荐</string>
 
-    <!-- Live -->
-    <string name="live_other">其他</string>
-
     <!-- Collect -->
     <string name="collect_result">“<xliff:g name="name">%s</xliff:g>”的搜索结果</string>
 
diff --git a/app/src/leanback/res/values-zh-rTW/strings.xml b/app/src/leanback/res/values-zh-rTW/strings.xml
index 3407095d6..403a145b2 100644
--- a/app/src/leanback/res/values-zh-rTW/strings.xml
+++ b/app/src/leanback/res/values-zh-rTW/strings.xml
@@ -10,9 +10,6 @@
     <string name="home_history">最近觀看</string>
     <string name="home_recommend">更新推薦</string>
 
-    <!-- Live -->
-    <string name="live_other">其他</string>
-
     <!-- Collect -->
     <string name="collect_result">「<xliff:g name="name">%s</xliff:g>」的搜尋結果</string>
 
diff --git a/app/src/leanback/res/values/strings.xml b/app/src/leanback/res/values/strings.xml
index 670038ae4..b091a85d3 100644
--- a/app/src/leanback/res/values/strings.xml
+++ b/app/src/leanback/res/values/strings.xml
@@ -10,9 +10,6 @@
     <string name="home_history">History</string>
     <string name="home_recommend">Recommend</string>
 
-    <!-- Live -->
-    <string name="live_other">Other</string>
-
     <!-- Collect -->
     <string name="collect_result">Search results for <xliff:g name="name">%s</xliff:g></string>