From a643189fb904ec633b7f2d2947cc7791d7f449ef Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Thu, 15 Feb 2024 15:23:57 +0800
Subject: [PATCH] Clean code

---
 .../fongmi/android/tv/ui/dialog/SiteDialog.java  | 16 ++++------------
 .../{ic_site_none.xml => ic_site_cancel.xml}     |  0
 .../{ic_site_all.xml => ic_site_select.xml}      |  0
 app/src/leanback/res/layout/dialog_site.xml      | 16 ++++++++--------
 4 files changed, 12 insertions(+), 20 deletions(-)
 rename app/src/leanback/res/drawable/{ic_site_none.xml => ic_site_cancel.xml} (100%)
 rename app/src/leanback/res/drawable/{ic_site_all.xml => ic_site_select.xml} (100%)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java
index 99d7e0d51..9c2a180e7 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/SiteDialog.java
@@ -79,9 +79,9 @@ public class SiteDialog implements SiteAdapter.OnClickListener {
     }
 
     private void initEvent() {
-        binding.all.setOnClickListener(this::setAll);
-        binding.none.setOnClickListener(this::setNone);
         binding.mode.setOnClickListener(this::setMode);
+        binding.select.setOnClickListener(v -> adapter.selectAll());
+        binding.cancel.setOnClickListener(v -> adapter.cancelAll());
         binding.search.setOnClickListener(v -> setType(v.isActivated() ? 0 : 1));
         binding.change.setOnClickListener(v -> setType(v.isActivated() ? 0 : 2));
     }
@@ -115,19 +115,11 @@ public class SiteDialog implements SiteAdapter.OnClickListener {
     private void setType(int type) {
         binding.search.setActivated(type == 1);
         binding.change.setActivated(type == 2);
+        binding.select.setClickable(type > 0);
+        binding.cancel.setClickable(type > 0);
         adapter.setType(this.type = type);
     }
 
-    private void setAll(View view) {
-        if (type == 0) return;
-        adapter.selectAll();
-    }
-
-    private void setNone(View view) {
-        if (type == 0) return;
-        adapter.cancelAll();
-    }
-
     private void setMode(View view) {
         Setting.putSiteMode(Math.abs(Setting.getSiteMode() - 1));
         initView();
diff --git a/app/src/leanback/res/drawable/ic_site_none.xml b/app/src/leanback/res/drawable/ic_site_cancel.xml
similarity index 100%
rename from app/src/leanback/res/drawable/ic_site_none.xml
rename to app/src/leanback/res/drawable/ic_site_cancel.xml
diff --git a/app/src/leanback/res/drawable/ic_site_all.xml b/app/src/leanback/res/drawable/ic_site_select.xml
similarity index 100%
rename from app/src/leanback/res/drawable/ic_site_all.xml
rename to app/src/leanback/res/drawable/ic_site_select.xml
diff --git a/app/src/leanback/res/layout/dialog_site.xml b/app/src/leanback/res/layout/dialog_site.xml
index e5d3508e6..74cf92c78 100644
--- a/app/src/leanback/res/layout/dialog_site.xml
+++ b/app/src/leanback/res/layout/dialog_site.xml
@@ -47,13 +47,13 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:nextFocusUp="@id/search"
-            android:nextFocusDown="@id/all"
+            android:nextFocusDown="@id/select"
             android:padding="8dp"
             android:src="@drawable/ic_site_change"
             app:tint="@color/text" />
 
         <ImageView
-            android:id="@+id/all"
+            android:id="@+id/select"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginTop="16dp"
@@ -61,22 +61,22 @@
             android:focusable="true"
             android:focusableInTouchMode="true"
             android:nextFocusUp="@id/change"
-            android:nextFocusDown="@id/none"
+            android:nextFocusDown="@id/cancel"
             android:padding="8dp"
-            android:src="@drawable/ic_site_all" />
+            android:src="@drawable/ic_site_select" />
 
         <ImageView
-            android:id="@+id/none"
+            android:id="@+id/cancel"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_marginTop="16dp"
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:nextFocusUp="@id/all"
+            android:nextFocusUp="@id/select"
             android:nextFocusDown="@id/mode"
             android:padding="8dp"
-            android:src="@drawable/ic_site_none" />
+            android:src="@drawable/ic_site_cancel" />
 
         <ImageView
             android:id="@+id/mode"
@@ -86,7 +86,7 @@
             android:background="@drawable/selector_text"
             android:focusable="true"
             android:focusableInTouchMode="true"
-            android:nextFocusUp="@id/none"
+            android:nextFocusUp="@id/cancel"
             android:nextFocusDown="@id/mode"
             android:padding="8dp"
             tools:src="@drawable/ic_site_list" />