From 8d876f2d029641ad8ceeae4d996ae66bd870b29c Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 17 Aug 2022 18:27:18 +0800
Subject: [PATCH] Clean code

---
 .../tv/ui/presenter/SitePresenter.java        |  7 +++---
 .../java/com/fongmi/android/tv/bean/Site.java | 24 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java
index 62e07f0b7..89d842b49 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/SitePresenter.java
@@ -6,7 +6,6 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.leanback.widget.Presenter;
 
-import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.bean.Site;
 import com.fongmi.android.tv.databinding.AdapterSiteBinding;
 
@@ -36,12 +35,12 @@ public class SitePresenter extends Presenter {
     public void onBindViewHolder(Presenter.ViewHolder viewHolder, Object object) {
         Site item = (Site) object;
         ViewHolder holder = (ViewHolder) viewHolder;
+        holder.binding.text.setText(item.getActivatedName());
+        holder.binding.filter.setImageResource(item.getFilterIcon());
+        holder.binding.search.setImageResource(item.getSearchIcon());
         holder.binding.text.setOnClickListener(v -> mListener.onTextClick(item));
         holder.binding.search.setOnClickListener(v -> mListener.onSearchClick(item));
         holder.binding.filter.setOnClickListener(v -> mListener.onFilterClick(item));
-        holder.binding.text.setText((item.isActivated() ? "√ " : "").concat(item.getName()));
-        holder.binding.filter.setImageResource(item.isFilterable() ? R.drawable.ic_filter_on : R.drawable.ic_filter_off);
-        holder.binding.search.setImageResource(item.isSearchable() ? R.drawable.ic_search_on : R.drawable.ic_search_off);
     }
 
     @Override
diff --git a/app/src/main/java/com/fongmi/android/tv/bean/Site.java b/app/src/main/java/com/fongmi/android/tv/bean/Site.java
index 9739dfce3..3b3f89114 100644
--- a/app/src/main/java/com/fongmi/android/tv/bean/Site.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Site.java
@@ -2,6 +2,7 @@ package com.fongmi.android.tv.bean;
 
 import android.text.TextUtils;
 
+import com.fongmi.android.tv.R;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.annotations.SerializedName;
@@ -23,8 +24,6 @@ public class Site {
     private String playerUrl;
     @SerializedName("searchable")
     private Integer searchable;
-    @SerializedName("quickSearch")
-    private Integer quickSearch;
     @SerializedName("filterable")
     private Integer filterable;
     @SerializedName("ext")
@@ -76,14 +75,6 @@ public class Site {
         this.searchable = searchable ? 1 : 0;
     }
 
-    public boolean isQuickSearch() {
-        return quickSearch == null || quickSearch == 1;
-    }
-
-    public void setQuickSearch(boolean quickSearch) {
-        this.quickSearch = quickSearch ? 1 : 0;
-    }
-
     public boolean isFilterable() {
         return filterable == null || filterable == 1;
     }
@@ -104,7 +95,6 @@ public class Site {
         return categories == null ? Collections.emptyList() : categories;
     }
 
-
     public boolean isActivated() {
         return activated;
     }
@@ -117,6 +107,18 @@ public class Site {
         this.activated = item.equals(this);
     }
 
+    public String getActivatedName() {
+        return (isActivated() ? "√ " : "").concat(getName());
+    }
+
+    public int getSearchIcon() {
+        return isSearchable() ? R.drawable.ic_search_on : R.drawable.ic_search_off;
+    }
+
+    public int getFilterIcon() {
+        return isFilterable() ? R.drawable.ic_filter_on : R.drawable.ic_filter_off;
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;