From b41c4cac47076b3e1a13b4d2b79b46591b52e550 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 13 Nov 2021 17:43:17 -0500 Subject: [PATCH] Cleanup filter sheet adapter --- .../browse/source/browse/SourceFilterSheet.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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 68a54df1b..4e3ab2a9b 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 @@ -8,7 +8,6 @@ import android.view.View import android.view.ViewGroup import androidx.core.view.isVisible import androidx.recyclerview.widget.ConcatAdapter -import androidx.recyclerview.widget.RecyclerView import com.google.android.material.chip.Chip import eu.davidea.flexibleadapter.FlexibleAdapter import eu.davidea.flexibleadapter.items.IFlexible @@ -102,8 +101,6 @@ class SourceFilterSheet( var onSavedSearchDeleteClicked: (Int, String) -> Unit = { _, _ -> } - val adapters = mutableListOf>() - private val savedSearchesAdapter = SavedSearchesAdapter(getSavedSearchesChips(searches)) // SY <-- @@ -118,13 +115,16 @@ class SourceFilterSheet( init { // SY --> - val mainSource = source?.getMainSource() - if (mainSource != null && controller != null) { - adapters += mainSource.getFilterHeader(controller) { dismissSheet?.invoke() } - } - adapters += savedSearchesAdapter - adapters += adapter - recycler.adapter = ConcatAdapter(adapters) + recycler.adapter = ConcatAdapter( + listOfNotNull( + controller?.let { + source?.getMainSource() + ?.getFilterHeader(it) { dismissSheet?.invoke() } + }, + savedSearchesAdapter, + adapter + ) + ) // SY <-- recycler.setHasFixedSize(true) (binding.root.getChildAt(1) as ViewGroup).addView(recycler)