null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 02:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: More "Comparison method violates its general contract!" prevention

Browse source
This commit is contained in:
Ahmad Ansori Palembani 2025-06-02 09:43:26 +07:00
parent cedf532ded
commit d31cebfdfd
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View file

@ -637,6 +637,9 @@ class LibraryPresenter(
* @param itemList the map to sort. * @param itemList the map to sort.
*/ */
private fun List<LibraryItem>.applySort(): List<LibraryItem> { private fun List<LibraryItem>.applySort(): List<LibraryItem> {
// Making sure `allCategories` is stable for `.sort()`Add commentMore actions
val categoryOrderMap = allCategories.associate { it.id to it.order }
val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 -> val sortFn: (LibraryItem, LibraryItem) -> Int = { i1, i2 ->
if (i1.header.category.id == i2.header.category.id) { if (i1.header.category.id == i2.header.category.id) {
val category = i1.header.category val category = i1.header.category
@ -663,12 +666,8 @@ class LibraryPresenter(
LibrarySort.DateAdded -> i2.manga.date_added.compareTo(i1.manga.date_added) LibrarySort.DateAdded -> i2.manga.date_added.compareTo(i1.manga.date_added)
LibrarySort.DragAndDrop -> { LibrarySort.DragAndDrop -> {
if (category.isDynamic) { if (category.isDynamic) {
val category1 = val category1 = categoryOrderMap[i1.manga.category] ?: 0
allCategories.find { i1.manga.category == it.id }?.order val category2 = categoryOrderMap[i2.manga.category] ?: 0
?: 0
val category2 =
allCategories.find { i2.manga.category == it.id }?.order
?: 0
category1.compareTo(category2) category1.compareTo(category2)
} else { } else {
sortAlphabetical(i1, i2) sortAlphabetical(i1, i2)