From 1713dd4ea0394a34ee98f8f743686e48ec66316d Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 17 May 2020 20:52:51 -0400
Subject: [PATCH] Made saved searches always available

Replace filtersheet with saved searches version if no filters are avalible
---
 .../ui/browse/source/browse/BrowseSourceController.kt    | 7 ++++++-
 .../ui/browse/source/browse/SourceFilterSheet.kt         | 9 +++++++++
 app/src/main/res/layout/source_filter_sheet.xml          | 4 ++++
 app/src/main/res/values/strings_extra.xml                | 1 +
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
index 5a4821f8c..8fd33aaf5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
@@ -164,10 +164,15 @@ open class BrowseSourceController(bundle: Bundle) :
     }
 
     open fun initFilterSheet() {
-        if (presenter.sourceFilters.isEmpty() || mode == Mode.RECOMMENDS) {
+        if (mode == Mode.RECOMMENDS) {
             return
         }
 
+        if (presenter.sourceFilters.isEmpty()) {
+            filterSheet?.hideFilterButton()
+            binding.fabFilter.text = activity!!.getString(R.string.eh_saved_searches)
+        }
+
         filterSheet = SourceFilterSheet(
             activity!!,
             onFilterClicked = {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
index b29223653..5a92f90aa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
@@ -14,6 +14,7 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.view.gone
 import eu.kanade.tachiyomi.util.view.inflate
 import eu.kanade.tachiyomi.widget.SimpleNavigationView
 import exh.EXHSavedSearch
@@ -66,6 +67,10 @@ class SourceFilterSheet(
         filterNavView.setSavedSearches(searches)
     }
 
+    fun hideFilterButton() {
+        filterNavView.hideFilterButton()
+    }
+
     class FilterNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) :
         SimpleNavigationView(context, attrs) {
 
@@ -126,6 +131,10 @@ class SourceFilterSheet(
             }
         }
 
+        fun hideFilterButton() {
+            filter_btn.gone()
+        }
+
         companion object {
             const val MAX_SAVED_SEARCHES = 500 // if you want more than this, fuck you, i guess
         }
diff --git a/app/src/main/res/layout/source_filter_sheet.xml b/app/src/main/res/layout/source_filter_sheet.xml
index ba1e72c22..fc6cbc2c2 100644
--- a/app/src/main/res/layout/source_filter_sheet.xml
+++ b/app/src/main/res/layout/source_filter_sheet.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -46,6 +47,7 @@
             android:tint="?attr/colorAccent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/filter_btn"
+            tools:layout_constraintEnd_toStartf="parent"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintStart_toEndOf="@+id/reset_btn"
             app:layout_constraintTop_toTopOf="parent"
@@ -58,6 +60,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/action_filter"
+            android:visibility="gone"
+            tools:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/strings_extra.xml b/app/src/main/res/values/strings_extra.xml
index 6fad334e0..98d12de4d 100644
--- a/app/src/main/res/values/strings_extra.xml
+++ b/app/src/main/res/values/strings_extra.xml
@@ -98,6 +98,7 @@
     <string name="eh_force_sync_reset_title">Are you sure?</string>
     <string name="eh_force_sync_reset_message">Resetting the sync state can cause your next sync to be extremely slow.</string>
     <string name="eh_show_update_statistics_dialog">Collecting statistics…</string>
+    <string name="eh_saved_searches">Saved Searches</string>
 
     <!-- AZ -->
     <string name="az_recommends">See Recommendations</string>