Use same chapter sorting logic in manga and reader views

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ChapterLoadStrategy.kt

@@ -1,46 +0,0 @@
-package eu.kanade.tachiyomi.ui.reader
-
-import eu.kanade.tachiyomi.data.database.models.Chapter
-
-/**
- * Load strategy using the source order. This is the default ordering.
- */
-class ChapterLoadBySource {
-    fun get(allChapters: List<Chapter>): List<Chapter> {
-        return allChapters.sortedByDescending { it.source_order }
-    }
-}
-
-/**
- * Load strategy using unique chapter numbers with same scanlator preference.
- */
-class ChapterLoadByNumber {
-    fun get(allChapters: List<Chapter>, selectedChapter: Chapter): List<Chapter> {
-        val chapters = mutableListOf<Chapter>()
-        val chaptersByNumber = allChapters.groupBy { it.chapter_number }
-
-        for ((number, chaptersForNumber) in chaptersByNumber) {
-            val preferredChapter = when {
-                // Make sure the selected chapter is always present
-                number == selectedChapter.chapter_number -> selectedChapter
-                // If there is only one chapter for this number, use it
-                chaptersForNumber.size == 1 -> chaptersForNumber.first()
-                // Prefer a chapter of the same scanlator as the selected
-                else ->
-                    chaptersForNumber.find { it.scanlator == selectedChapter.scanlator }
-                        ?: chaptersForNumber.first()
-            }
-            chapters.add(preferredChapter)
-        }
-        return chapters.sortedBy { it.chapter_number }
-    }
-}
-
-/**
- * Load strategy using the chapter upload date. This ordering ignores scanlators
- */
-class ChapterLoadByUploadDate {
-    fun get(allChapters: List<Chapter>): List<Chapter> {
-        return allChapters.sortedBy { it.date_upload }
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt

@@ -23,6 +23,7 @@ import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
 import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
 import eu.kanade.tachiyomi.ui.reader.setting.ReadingModeType
+import eu.kanade.tachiyomi.util.chapter.getChapterSort
 import eu.kanade.tachiyomi.util.isLocal
 import eu.kanade.tachiyomi.util.lang.byteSize
 import eu.kanade.tachiyomi.util.lang.launchIO
@@ -123,12 +124,9 @@ class ReaderPresenter(
             else -> dbChapters
         }
 
-        when (manga.sorting) {
-            Manga.CHAPTER_SORTING_SOURCE -> ChapterLoadBySource().get(chaptersForReader)
-            Manga.CHAPTER_SORTING_NUMBER -> ChapterLoadByNumber().get(chaptersForReader, selectedChapter)
-            Manga.CHAPTER_SORTING_UPLOAD_DATE -> ChapterLoadByUploadDate().get(chaptersForReader)
-            else -> error("Unknown sorting method")
-        }.map(::ReaderChapter)
+        chaptersForReader
+            .sortedWith(getChapterSort(manga))
+            .map(::ReaderChapter)
     }
 
     private var hasTrackers: Boolean = false