From f091a9bb510438f6a817f009947cc49da3c733a6 Mon Sep 17 00:00:00 2001 From: Jay Date: Mon, 11 May 2020 23:18:41 -0400 Subject: [PATCH] Fixed reverse sorting (closes #388) --- .../kanade/tachiyomi/ui/library/LibraryPresenter.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt index 88f12ff3bf..a1148ca16a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt @@ -332,7 +332,7 @@ class LibraryPresenter( i1.chapterCount = -1 i2.chapterCount = -1 } - val compare = when { + when { sortingMode == LibrarySort.DRAG_AND_DROP || useDnD -> sortCategory(i1, i2, lastReadManga) sortingMode == LibrarySort.ALPHA -> sortAlphabetical(i1, i2) @@ -364,10 +364,6 @@ class LibraryPresenter( } else -> 0 } - if (compare == 0) { - if (ascending) sortAlphabetical(i1, i2) - else sortAlphabetical(i2, i1) - } else compare } val comparator = if (ascending || useDnD) @@ -422,7 +418,7 @@ class LibraryPresenter( } i1.chapterCount = -1 i2.chapterCount = -1 - val compare = when { + when { category.mangaSort != null -> { var sort = when (category.sortingMode()) { LibrarySort.ALPHA -> sortAlphabetical(i1, i2) @@ -465,10 +461,6 @@ class LibraryPresenter( } else -> 0 } - if (compare == 0) { - if (category.isAscending()) sortAlphabetical(i1, i2) - else sortAlphabetical(i2, i1) - } else compare } else { val category = allCategories.find { it.id == i1.manga.category }?.order ?: -1 val category2 = allCategories.find { it.id == i2.manga.category }?.order ?: -1