From 3601bf9a47c5eae2b24ddf2096d55e2c7ac8f185 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Mon, 12 Sep 2022 18:00:32 +0800
Subject: [PATCH] Clean code

---
 .../java/com/fongmi/android/tv/ui/activity/VodActivity.java    | 3 ++-
 app/src/leanback/res/layout/adapter_config.xml                 | 2 --
 app/src/leanback/res/layout/adapter_part.xml                   | 2 ++
 app/src/leanback/res/layout/adapter_search_history.xml         | 2 --
 app/src/leanback/res/layout/adapter_search_word.xml            | 2 --
 app/src/leanback/res/layout/adapter_site.xml                   | 2 --
 app/src/leanback/res/layout/adapter_vod.xml                    | 2 --
 7 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
index 34f60affb..5a7cbba02 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/VodActivity.java
@@ -26,6 +26,7 @@ import com.fongmi.android.tv.databinding.ActivityVodBinding;
 import com.fongmi.android.tv.ui.fragment.VodFragment;
 import com.fongmi.android.tv.ui.presenter.TypePresenter;
 import com.fongmi.android.tv.utils.ResUtil;
+import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -145,7 +146,7 @@ public class VodActivity extends BaseActivity {
         @Override
         public Fragment getItem(int position) {
             Class type = mResult.getTypes().get(position);
-            List<Filter> filter = mResult.getFilters().get(type.getTypeId());
+            String filter = new Gson().toJson(mResult.getFilters().get(type.getTypeId()));
             return VodFragment.newInstance(type.getTypeId(), filter, type.getTypeFlag().equals("1"));
         }
 
diff --git a/app/src/leanback/res/layout/adapter_config.xml b/app/src/leanback/res/layout/adapter_config.xml
index 5c0941d1e..215387ba1 100644
--- a/app/src/leanback/res/layout/adapter_config.xml
+++ b/app/src/leanback/res/layout/adapter_config.xml
@@ -15,8 +15,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="18sp"
diff --git a/app/src/leanback/res/layout/adapter_part.xml b/app/src/leanback/res/layout/adapter_part.xml
index ff072bbda..a16ef744a 100644
--- a/app/src/leanback/res/layout/adapter_part.xml
+++ b/app/src/leanback/res/layout/adapter_part.xml
@@ -5,10 +5,12 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/selector_item"
+    android:ellipsize="marquee"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
     android:nextFocusUp="@id/group"
+    android:singleLine="true"
     android:textColor="@color/white"
     android:textSize="16sp"
     tools:text="分詞" />
\ No newline at end of file
diff --git a/app/src/leanback/res/layout/adapter_search_history.xml b/app/src/leanback/res/layout/adapter_search_history.xml
index 5c1663f19..5116149b1 100644
--- a/app/src/leanback/res/layout/adapter_search_history.xml
+++ b/app/src/leanback/res/layout/adapter_search_history.xml
@@ -8,8 +8,6 @@
     android:ellipsize="marquee"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:marqueeRepeatLimit="marquee_forever"
-    android:scrollHorizontally="true"
     android:singleLine="true"
     android:textColor="@color/white"
     android:textSize="16sp"
diff --git a/app/src/leanback/res/layout/adapter_search_word.xml b/app/src/leanback/res/layout/adapter_search_word.xml
index 15b456142..47e894dec 100644
--- a/app/src/leanback/res/layout/adapter_search_word.xml
+++ b/app/src/leanback/res/layout/adapter_search_word.xml
@@ -8,8 +8,6 @@
     android:ellipsize="marquee"
     android:focusable="true"
     android:focusableInTouchMode="true"
-    android:marqueeRepeatLimit="marquee_forever"
-    android:scrollHorizontally="true"
     android:singleLine="true"
     android:textColor="@color/white"
     android:textSize="16sp"
diff --git a/app/src/leanback/res/layout/adapter_site.xml b/app/src/leanback/res/layout/adapter_site.xml
index e0618a7cf..5a71019ed 100644
--- a/app/src/leanback/res/layout/adapter_site.xml
+++ b/app/src/leanback/res/layout/adapter_site.xml
@@ -15,8 +15,6 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="18sp"
diff --git a/app/src/leanback/res/layout/adapter_vod.xml b/app/src/leanback/res/layout/adapter_vod.xml
index 038e4ceac..c346e0650 100644
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
@@ -80,9 +80,7 @@
         android:background="@drawable/shape_vod_name"
         android:ellipsize="marquee"
         android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
         android:padding="6dp"
-        android:scrollHorizontally="true"
         android:singleLine="true"
         android:textColor="@color/white"
         android:textSize="16sp"