From 3adde57db90f277db24a15f5bf2f64995947339f Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Wed, 2 Jun 2021 17:46:33 -0400 Subject: [PATCH] Use the same chapter sort that the chapters use in the reader dialog --- .../ui/reader/chapter/ReaderChapterDialog.kt | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt index e0cc87fc0..278f3c018 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt @@ -7,10 +7,10 @@ import com.afollestad.materialdialogs.customview.customView import eu.davidea.flexibleadapter.FlexibleAdapter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Chapter -import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.databinding.ReaderChaptersDialogBinding import eu.kanade.tachiyomi.ui.reader.ReaderActivity import eu.kanade.tachiyomi.ui.reader.ReaderPresenter +import eu.kanade.tachiyomi.util.chapter.getChapterSort import eu.kanade.tachiyomi.util.lang.launchUI import eu.kanade.tachiyomi.util.system.dpToPx @@ -49,14 +49,8 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA private fun refreshList() { launchUI { - val chapters = with(presenter.getChapters(activity)) { - when (activity.presenter.manga?.sorting) { - Manga.CHAPTER_SORTING_SOURCE -> sortedBy { it.source_order } - Manga.CHAPTER_SORTING_NUMBER -> sortedByDescending { it.chapter_number } - Manga.CHAPTER_SORTING_UPLOAD_DATE -> sortedBy { it.date_upload } - else -> sortedBy { it.source_order } - } - } + val chapters = presenter.getChapters(activity) + .sortedWith(getChapterSort(presenter.manga!!)) adapter?.clear() adapter?.updateDataSet(chapters)