Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-14 05:05:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed reverse sorting (closes #388)

Browse Source
This commit is contained in:
Jay 2020-05-11 23:18:41 -04:00
parent 8bee6fe9ae
commit f091a9bb51
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@ -332,7 +332,7 @@ class LibraryPresenter(
i1.chapterCount = -1 i1.chapterCount = -1
i2.chapterCount = -1 i2.chapterCount = -1
} }
val compare = when { when {
sortingMode == LibrarySort.DRAG_AND_DROP || useDnD -> sortingMode == LibrarySort.DRAG_AND_DROP || useDnD ->
sortCategory(i1, i2, lastReadManga) sortCategory(i1, i2, lastReadManga)
sortingMode == LibrarySort.ALPHA -> sortAlphabetical(i1, i2) sortingMode == LibrarySort.ALPHA -> sortAlphabetical(i1, i2)
@ -364,10 +364,6 @@ class LibraryPresenter(
} }
else -> 0 else -> 0
} }
if (compare == 0) {
if (ascending) sortAlphabetical(i1, i2)
else sortAlphabetical(i2, i1)
} else compare
} }
val comparator = if (ascending || useDnD) val comparator = if (ascending || useDnD)
@ -422,7 +418,7 @@ class LibraryPresenter(
} }
i1.chapterCount = -1 i1.chapterCount = -1
i2.chapterCount = -1 i2.chapterCount = -1
val compare = when { when {
category.mangaSort != null -> { category.mangaSort != null -> {
var sort = when (category.sortingMode()) { var sort = when (category.sortingMode()) {
LibrarySort.ALPHA -> sortAlphabetical(i1, i2) LibrarySort.ALPHA -> sortAlphabetical(i1, i2)
@ -465,10 +461,6 @@ class LibraryPresenter(
} }
else -> 0 else -> 0
} }
if (compare == 0) {
if (category.isAscending()) sortAlphabetical(i1, i2)
else sortAlphabetical(i2, i1)
} else compare
} else { } else {
val category = allCategories.find { it.id == i1.manga.category }?.order ?: -1 val category = allCategories.find { it.id == i1.manga.category }?.order ?: -1
val category2 = allCategories.find { it.id == i2.manga.category }?.order ?: -1 val category2 = allCategories.find { it.id == i2.manga.category }?.order ?: -1