From d013634f1b8336c62f54138c467f3c4cba66f0c5 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Mon, 13 Mar 2023 15:12:51 -0400
Subject: [PATCH] Fixed  #1511

---
 .../ui/library/display/LibraryDisplayView.kt   | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
index bc706e4c95..63a87c24d4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/display/LibraryDisplayView.kt
@@ -46,18 +46,16 @@ class LibraryDisplayView @JvmOverloads constructor(context: Context, attrs: Attr
 
         binding.reorderFiltersButton.setOnClickListener {
             val recycler = RecyclerView(context)
-            var filterOrder = preferences.filterOrder().get()
-            if (filterOrder.count() != 6) {
-                filterOrder = FilterBottomSheet.Filters.DEFAULT_ORDER
+            val filterOrder = preferences.filterOrder().get().toMutableList()
+            FilterBottomSheet.Filters.values().forEach {
+                if (it.value !in filterOrder) {
+                    filterOrder.add(it.value)
+                }
             }
             val adapter = FlexibleAdapter(
-                filterOrder.toCharArray().map {
-                    if (FilterBottomSheet.Filters.filterOf(it) != null) {
-                        ManageFilterItem(it)
-                    } else {
-                        null
-                    }
-                }.filterNotNull(),
+                filterOrder.mapNotNull { char ->
+                    FilterBottomSheet.Filters.filterOf(char)?.let { ManageFilterItem(char) }
+                },
                 this,
                 true,
             )