From 0e3a88fa4135d27097f81bc4b70d3e13c3067da9 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 18 Aug 2022 17:02:52 +0800
Subject: [PATCH] Clean code

---
 .../android/tv/ui/presenter/HistoryPresenter.java    |  1 -
 app/src/leanback/res/drawable/ic_keyboard_back.xml   |  6 +++---
 app/src/leanback/res/drawable/ic_keyboard_left.xml   |  6 +++---
 app/src/leanback/res/drawable/ic_keyboard_right.xml  |  6 +++---
 app/src/leanback/res/drawable/ic_keyboard_space.xml  | 12 ++++++------
 app/src/leanback/res/drawable/ic_voice.xml           |  2 +-
 app/src/leanback/res/layout/adapter_vod.xml          |  4 ++--
 app/src/main/res/drawable/ic_delete.xml              |  4 ++--
 app/src/main/res/drawable/ic_filter_off.xml          |  2 +-
 app/src/main/res/drawable/ic_filter_off_small.xml    |  2 +-
 app/src/main/res/drawable/ic_filter_on.xml           |  2 +-
 app/src/main/res/drawable/ic_filter_on_small.xml     |  2 +-
 app/src/main/res/drawable/ic_forward.xml             |  2 +-
 app/src/main/res/drawable/ic_pause.xml               |  2 +-
 app/src/main/res/drawable/ic_play.xml                |  2 +-
 app/src/main/res/drawable/ic_rewind.xml              |  2 +-
 app/src/main/res/drawable/ic_search_off.xml          |  2 +-
 app/src/main/res/drawable/ic_search_on.xml           |  2 +-
 18 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
index ccfdafd36..56ab8b163 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/HistoryPresenter.java
@@ -67,7 +67,6 @@ public class HistoryPresenter extends Presenter {
         holder.binding.name.setText(item.getVodName());
         holder.binding.site.setText(ApiConfig.getSiteName(item.getSiteKey()));
         holder.binding.remark.setText(ResUtil.getString(R.string.vod_last, item.getVodRemarks()));
-        holder.binding.name.setVisibility(delete ? View.GONE : View.VISIBLE);
         holder.binding.site.setVisibility(delete ? View.GONE : View.VISIBLE);
         holder.binding.remark.setVisibility(delete ? View.GONE : View.VISIBLE);
         holder.binding.delete.setVisibility(!delete ? View.GONE : View.VISIBLE);
diff --git a/app/src/leanback/res/drawable/ic_keyboard_back.xml b/app/src/leanback/res/drawable/ic_keyboard_back.xml
index a74d3d46e..645e3fa97 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_back.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_back.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
diff --git a/app/src/leanback/res/drawable/ic_keyboard_left.xml b/app/src/leanback/res/drawable/ic_keyboard_left.xml
index 6f0d1562d..22558233b 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_left.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_left.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
diff --git a/app/src/leanback/res/drawable/ic_keyboard_right.xml b/app/src/leanback/res/drawable/ic_keyboard_right.xml
index 53b1f665b..944ccdb8a 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_right.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_right.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:tint="#FFFFFF"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/white"
     android:viewportWidth="48"
     android:viewportHeight="48">
     <path
diff --git a/app/src/leanback/res/drawable/ic_keyboard_space.xml b/app/src/leanback/res/drawable/ic_keyboard_space.xml
index d2aa30a99..b740ef05b 100644
--- a/app/src/leanback/res/drawable/ic_keyboard_space.xml
+++ b/app/src/leanback/res/drawable/ic_keyboard_space.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="48dp"
+    android:height="48dp"
+    android:tint="@color/white"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M18,9v4H6V9H4v6h16V9z" />
+        android:pathData="M8,30V18H11V27H37V18H40V30Z" />
 </vector>
diff --git a/app/src/leanback/res/drawable/ic_voice.xml b/app/src/leanback/res/drawable/ic_voice.xml
index e10455752..a484594f6 100644
--- a/app/src/leanback/res/drawable/ic_voice.xml
+++ b/app/src/leanback/res/drawable/ic_voice.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/leanback/res/layout/adapter_vod.xml b/app/src/leanback/res/layout/adapter_vod.xml
index 4eb7640fd..8ba046efb 100644
--- a/app/src/leanback/res/layout/adapter_vod.xml
+++ b/app/src/leanback/res/layout/adapter_vod.xml
@@ -18,8 +18,8 @@
         android:id="@+id/delete"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@color/white_30"
+        android:layout_centerInParent="true"
+        android:background="@drawable/shape_item_activated"
         android:scaleType="center"
         android:src="@drawable/ic_delete"
         android:visibility="gone"
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 03f8add1d..7f7cf3544 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="64dp"
     android:height="64dp"
-    android:tint="@color/red_500"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V9c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v10zM18,4h-2.5l-0.71,-0.71c-0.18,-0.18 -0.44,-0.29 -0.7,-0.29H9.91c-0.26,0 -0.52,0.11 -0.7,0.29L8.5,4H6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" />
+        android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_filter_off.xml b/app/src/main/res/drawable/ic_filter_off.xml
index e7ed29c64..f78f8393a 100644
--- a/app/src/main/res/drawable/ic_filter_off.xml
+++ b/app/src/main/res/drawable/ic_filter_off.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_filter_off_small.xml b/app/src/main/res/drawable/ic_filter_off_small.xml
index 427c3333b..809304495 100644
--- a/app/src/main/res/drawable/ic_filter_off_small.xml
+++ b/app/src/main/res/drawable/ic_filter_off_small.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_filter_on.xml b/app/src/main/res/drawable/ic_filter_on.xml
index 75eb369db..047655021 100644
--- a/app/src/main/res/drawable/ic_filter_on.xml
+++ b/app/src/main/res/drawable/ic_filter_on.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_filter_on_small.xml b/app/src/main/res/drawable/ic_filter_on_small.xml
index 73844f358..eaff72db5 100644
--- a/app/src/main/res/drawable/ic_filter_on_small.xml
+++ b/app/src/main/res/drawable/ic_filter_on_small.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="18dp"
     android:height="18dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml
index bbd3cae70..1715efdee 100644
--- a/app/src/main/res/drawable/ic_forward.xml
+++ b/app/src/main/res/drawable/ic_forward.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_pause.xml
index feb8b5396..0a6c16784 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_pause.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
index 66707059c..3ac4b3c1e 100644
--- a/app/src/main/res/drawable/ic_play.xml
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_rewind.xml b/app/src/main/res/drawable/ic_rewind.xml
index 1c7effff9..b895c2547 100644
--- a/app/src/main/res/drawable/ic_rewind.xml
+++ b/app/src/main/res/drawable/ic_rewind.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_search_off.xml b/app/src/main/res/drawable/ic_search_off.xml
index 828a1767a..2863f6a0e 100644
--- a/app/src/main/res/drawable/ic_search_off.xml
+++ b/app/src/main/res/drawable/ic_search_off.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_search_on.xml b/app/src/main/res/drawable/ic_search_on.xml
index 748fb87da..d9cd13fa2 100644
--- a/app/src/main/res/drawable/ic_search_on.xml
+++ b/app/src/main/res/drawable/ic_search_on.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:tint="@color/white"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path