From b322ecd34afce6913b3d0608ddfd266951359939 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Mon, 12 Apr 2021 17:28:14 -0400
Subject: [PATCH] Fully expand source filter sheet on show (closes #4455)

(cherry picked from commit 99b46096a46ce4a56f4461d7ad7c7a24b0cf510b)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/SourceFilterSheet.kt
---
 .../browse/source/browse/SourceFilterSheet.kt | 36 ++++++++++++++++---
 .../main/res/drawable/ic_drag_pill_24dp.xml   |  9 -----
 .../main/res/layout/reader_chapters_sheet.xml | 16 ++-------
 .../main/res/layout/source_filter_sheet.xml   | 14 --------
 4 files changed, 34 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_drag_pill_24dp.xml

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 5829dec9d..79a644a88 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
@@ -9,6 +9,7 @@ import android.view.ViewGroup
 import androidx.core.view.isVisible
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.chip.Chip
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.items.IFlexible
@@ -37,10 +38,17 @@ class SourceFilterSheet(
     // EXH <--
 ) : BaseBottomSheetDialog(activity) {
 
-    private var filterNavView: FilterNavigationView
+    private var filterNavView: FilterNavigationView = FilterNavigationView(
+        activity,
+        // SY -->
+        searches = searches,
+        source = source,
+        controller = controller
+        // SY <--
+    )
+    private val sheetBehavior: BottomSheetBehavior<*>
 
     init {
-        filterNavView = FilterNavigationView(activity /* SY --> */, searches = searches, source = source, controller = controller/* SY <-- */)
         filterNavView.onFilterClicked = {
             onFilterClicked()
             this.dismiss()
@@ -56,6 +64,13 @@ class SourceFilterSheet(
         // EXH <--
 
         setContentView(filterNavView)
+
+        sheetBehavior = BottomSheetBehavior.from(filterNavView.parent as ViewGroup)
+    }
+
+    override fun show() {
+        super.show()
+        sheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
     }
 
     fun setFilters(items: List<IFlexible<*>>) {
@@ -72,7 +87,15 @@ class SourceFilterSheet(
     }
     // SY <--
 
-    class FilterNavigationView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null /* SY --> */, searches: List<EXHSavedSearch> = emptyList(), source: CatalogueSource? = null, controller: BaseController<*>? = null/* SY <-- */) :
+    class FilterNavigationView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        // SY -->
+        searches: List<EXHSavedSearch> = emptyList(),
+        source: CatalogueSource? = null,
+        controller: BaseController<*>? = null
+        // SY <--
+    ) :
         SimpleNavigationView(context, attrs) {
 
         var onFilterClicked = {}
@@ -91,8 +114,13 @@ class SourceFilterSheet(
         // SY <--
 
         val adapter: FlexibleAdapter<IFlexible<*>> = FlexibleAdapter<IFlexible<*>>(null)
+            .setDisplayHeadersAtStartUp(true)
 
-        private val binding = SourceFilterSheetBinding.inflate(LayoutInflater.from(context), null, false)
+        private val binding = SourceFilterSheetBinding.inflate(
+            LayoutInflater.from(context),
+            null,
+            false
+        )
 
         init {
             // SY -->
diff --git a/app/src/main/res/drawable/ic_drag_pill_24dp.xml b/app/src/main/res/drawable/ic_drag_pill_24dp.xml
deleted file mode 100644
index da568f0df..000000000
--- a/app/src/main/res/drawable/ic_drag_pill_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M22.15,13.85H1.85A1.86,1.86,0,0,1,0,12H0a1.86,1.86,0,0,1,1.85-1.85H22.15A1.86,1.86,0,0,1,24,12h0A1.86,1.86,0,0,1,22.15,13.85Z" />
-</vector>
diff --git a/app/src/main/res/layout/reader_chapters_sheet.xml b/app/src/main/res/layout/reader_chapters_sheet.xml
index dfc181d4f..90537a7af 100644
--- a/app/src/main/res/layout/reader_chapters_sheet.xml
+++ b/app/src/main/res/layout/reader_chapters_sheet.xml
@@ -15,18 +15,6 @@
         android:clickable="true"
         android:focusable="true">
 
-        <ImageView
-            android:id="@+id/pill"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:contentDescription="@string/action_sort_drag_and_drop"
-            android:src="@drawable/ic_drag_pill_24dp"
-            android:tint="?attr/colorOnSurface"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <ImageButton
             android:id="@+id/webview_button"
             android:layout_width="wrap_content"
@@ -34,11 +22,11 @@
             android:background="?selectableItemBackgroundBorderless"
             android:contentDescription="@string/action_open_in_web_view"
             android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-            android:tint="?attr/colorOnBackground"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_public_24dp" />
+            app:srcCompat="@drawable/ic_public_24dp"
+            app:tint="?attr/colorOnBackground" />
 
         <eu.kanade.tachiyomi.ui.reader.ReaderSeekBar
             android:id="@+id/page_seekbar"
diff --git a/app/src/main/res/layout/source_filter_sheet.xml b/app/src/main/res/layout/source_filter_sheet.xml
index 5190e0c2a..f85457f88 100644
--- a/app/src/main/res/layout/source_filter_sheet.xml
+++ b/app/src/main/res/layout/source_filter_sheet.xml
@@ -1,7 +1,6 @@
 <?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">
@@ -15,19 +14,6 @@
         android:paddingStart="?attr/listPreferredItemPaddingStart"
         android:paddingEnd="?attr/listPreferredItemPaddingEnd">
 
-        <ImageView
-            android:id="@+id/pull_up_bar"
-            android:layout_width="wrap_content"
-            android:layout_height="24dp"
-            android:alpha="0.5"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_drag_pill_24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="?attr/colorOnSurface"
-            tools:ignore="ContentDescription" />
-
         <Button
             android:id="@+id/reset_btn"
             style="@style/Theme.Widget.Button"