From 75b664bd8c4bb905bfb6266dea9f3698274b185e Mon Sep 17 00:00:00 2001
From: Harold <power0721@gmail.com>
Date: Tue, 15 Nov 2022 12:36:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfilter=E9=97=AA=E9=80=80=20fi?=
 =?UTF-8?q?lter=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/tvbox/osc/bean/MovieSort.java     |  5 ++++-
 .../github/tvbox/osc/ui/dialog/GridFilterDialog.java  | 11 +++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/github/tvbox/osc/bean/MovieSort.java b/app/src/main/java/com/github/tvbox/osc/bean/MovieSort.java
index 3711f858..7f878891 100644
--- a/app/src/main/java/com/github/tvbox/osc/bean/MovieSort.java
+++ b/app/src/main/java/com/github/tvbox/osc/bean/MovieSort.java
@@ -43,9 +43,12 @@ public class MovieSort implements Serializable {
         }
 
         public int filterSelectCount() {
+            if (filterSelect == null) {
+                return 0;
+            }
             int count = 0;
             for (String filter : filterSelect.values()) {
-                if (!filter.isEmpty()) {
+                if (filter != null && !filter.isEmpty()) {
                     count++;
                 }
             }
diff --git a/app/src/main/java/com/github/tvbox/osc/ui/dialog/GridFilterDialog.java b/app/src/main/java/com/github/tvbox/osc/ui/dialog/GridFilterDialog.java
index 7fcc7ba7..46ba65aa 100644
--- a/app/src/main/java/com/github/tvbox/osc/ui/dialog/GridFilterDialog.java
+++ b/app/src/main/java/com/github/tvbox/osc/ui/dialog/GridFilterDialog.java
@@ -67,9 +67,10 @@ public class GridFilterDialog extends BaseDialog {
 
                 @Override
                 public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
-                    if (sortData.filterSelect.get(key) == null || !sortData.filterSelect.get(key).equals(values.get(position))) {
+                    selectChange = true;
+                    String filterSelect = sortData.filterSelect.get(key);
+                    if (filterSelect == null || !filterSelect.equals(values.get(position))) {
                         sortData.filterSelect.put(key, keys.get(position));
-                        selectChange = true;
                         if (pre != null) {
                             TextView val = pre.findViewById(R.id.filterValue);
                             val.getPaint().setFakeBoldText(false);
@@ -79,6 +80,12 @@ public class GridFilterDialog extends BaseDialog {
                         val.getPaint().setFakeBoldText(true);
                         val.setTextColor(getContext().getResources().getColor(R.color.color_02F8E1));
                         pre = view;
+                    } else {
+                        sortData.filterSelect.remove(key);
+                        TextView val = pre.findViewById(R.id.filterValue);
+                        val.getPaint().setFakeBoldText(false);
+                        val.setTextColor(getContext().getResources().getColor(R.color.color_FFFFFF));
+                        pre = null;
                     }
                 }
             });