From 44bb8de84f75c0fab813482e9826cf78560842d8 Mon Sep 17 00:00:00 2001
From: Jay <jays2kings@gmail.com>
Date: Sat, 2 May 2020 11:47:07 -0400
Subject: [PATCH] Filters sheet can be hidden while active now

---
 .../kanade/tachiyomi/ui/library/LibraryController.kt  |  4 ++--
 .../tachiyomi/ui/library/filter/FilterBottomSheet.kt  | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
index 3c181fb353..144fc2b660 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
@@ -151,10 +151,10 @@ class LibraryController(
         override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
             super.onScrolled(recyclerView, dx, dy)
             val order = getCategoryOrder()
-            if (filter_bottom_sheet.canHide()) {
+            if (filter_bottom_sheet.sheetBehavior?.state != BottomSheetBehavior.STATE_HIDDEN) {
                 scrollDistance += abs(dy)
                 if (scrollDistance > scrollDistanceTilHidden) {
-                    filter_bottom_sheet.hideIfPossible()
+                    filter_bottom_sheet.sheetBehavior?.state = BottomSheetBehavior.STATE_HIDDEN
                     scrollDistance = 0f
                 }
             } else scrollDistance = 0f
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
index e7cd4143e8..7f83ea39e2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/filter/FilterBottomSheet.kt
@@ -103,7 +103,6 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
         }
 
         val activeFilters = hasActiveFiltersFromPref()
-        sheetBehavior?.isHideable = !activeFilters
         if (activeFilters && sheetBehavior?.state == BottomSheetBehavior.STATE_HIDDEN &&
             sheetBehavior?.skipCollapsed == false)
             sheetBehavior?.state = BottomSheetBehavior.STATE_COLLAPSED
@@ -285,21 +284,12 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
             filterItems.remove(trackers!!)
         }
         val hasFilters = hasActiveFilters()
-        sheetBehavior?.isHideable = !hasFilters
         if (hasFilters && clearButton.parent == null)
             filter_layout.addView(clearButton, 0)
         else if (!hasFilters && clearButton.parent != null)
             filter_layout.removeView(clearButton)
     }
 
-    fun hideIfPossible() {
-        if (!hasActiveFilters() && sheetBehavior?.isHideable == true)
-            sheetBehavior?.state = BottomSheetBehavior.STATE_HIDDEN
-    }
-
-    fun canHide(): Boolean = sheetBehavior?.isHideable == true && sheetBehavior?.state !=
-        BottomSheetBehavior.STATE_HIDDEN
-
     private fun clearFilters() {
         preferences.filterDownloaded().set(0)
         preferences.filterUnread().set(0)
@@ -318,7 +308,6 @@ class FilterBottomSheet @JvmOverloads constructor(context: Context, attrs: Attri
             filterItems.remove(trackers!!)
         reSortViews()
         onGroupClicked(ACTION_FILTER)
-        sheetBehavior?.isHideable = true
     }
 
     private fun reSortViews() {