From 0b8f461bcd44c489a8b0df4361f2bdb5a2f805a9 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Fri, 17 Nov 2023 18:43:30 +0800
Subject: [PATCH] Clean code

---
 .../android/tv/ui/activity/LiveActivity.java  |  2 -
 app/src/leanback/res/layout/activity_live.xml |  2 +-
 .../leanback/res/layout/view_control_live.xml | 50 ++++++-------------
 app/src/mobile/res/layout/activity_live.xml   |  2 +-
 4 files changed, 17 insertions(+), 39 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 1655ad202..436f67b2e 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
@@ -544,10 +544,8 @@ 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/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index 43b1d7e93..58271b9dc 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -64,7 +64,7 @@
 
         <com.fongmi.android.tv.ui.custom.CustomLiveListView
             android:id="@+id/group"
-            android:layout_width="140dp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_group" />
diff --git a/app/src/leanback/res/layout/view_control_live.xml b/app/src/leanback/res/layout/view_control_live.xml
index 4562cf928..a175fbb40 100644
--- a/app/src/leanback/res/layout/view_control_live.xml
+++ b/app/src/leanback/res/layout/view_control_live.xml
@@ -17,26 +17,6 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <TextView
-            android:id="@+id/number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            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"
@@ -89,74 +69,74 @@
             tools:text="預設" />
 
         <TextView
-            android:id="@+id/text"
+            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:tag="3"
-            android:text="@string/play_track_text"
             android:textColor="@color/white"
             android:textSize="14sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            tools:text="首頁" />
 
         <TextView
-            android:id="@+id/audio"
+            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:tag="1"
-            android:text="@string/play_track_audio"
             android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="gone"
+            tools:text="來源 1"
             tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/video"
+            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="2"
-            android:text="@string/play_track_video"
+            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/home"
+            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"
-            tools:text="首頁" />
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/line"
+            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:text="來源 1"
             tools:visibility="visible" />
 
         <TextView
diff --git a/app/src/mobile/res/layout/activity_live.xml b/app/src/mobile/res/layout/activity_live.xml
index f28ef55e7..44a9582fc 100644
--- a/app/src/mobile/res/layout/activity_live.xml
+++ b/app/src/mobile/res/layout/activity_live.xml
@@ -62,7 +62,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/group"
-            android:layout_width="140dp"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
             android:clipChildren="false"
             android:clipToPadding="false"