From 58c9f75b91c80c8a44189732340cb9a1b2136a5b Mon Sep 17 00:00:00 2001 From: Koitharu Date: Fri, 20 May 2022 12:14:14 +0300 Subject: [PATCH] Fix tags order in filter --- .../org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt index 1fbf4b70e..5ea361168 100644 --- a/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt +++ b/app/src/main/java/org/koitharu/kotatsu/list/ui/filter/FilterCoordinator.kt @@ -1,6 +1,7 @@ package org.koitharu.kotatsu.list.ui.filter import androidx.annotation.WorkerThread +import androidx.lifecycle.LiveData import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart import kotlinx.coroutines.Dispatchers @@ -28,7 +29,7 @@ class FilterCoordinator( } private var availableTagsDeferred = loadTagsAsync() - val items = getItemsFlow() + val items: LiveData> = getItemsFlow() .asLiveDataDistinct(coroutineScope.coroutineContext + Dispatchers.Default) init { @@ -105,7 +106,7 @@ class FilterCoordinator( query: String, ): List { val sortOrders = repository.sortOrders.sortedBy { it.ordinal } - val tags = mergeTags(state.tags, allTags.tags).sortedBy { it.title } + val tags = mergeTags(state.tags, allTags.tags).toList() val list = ArrayList(tags.size + sortOrders.size + 3) if (query.isEmpty()) { if (sortOrders.isNotEmpty()) {