From 57ca396b468e4d223477755455fd0eb23c47b61c Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 2 Jun 2021 21:21:38 -0400
Subject: [PATCH] Load chapters in the dialog instantly

---
 .../tachiyomi/ui/reader/ReaderPresenter.kt    | 35 +++++++++----------
 .../ui/reader/chapter/ReaderChapterDialog.kt  | 23 +++++-------
 2 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index 63531cfa0..e1cf15657 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -35,7 +35,6 @@ import eu.kanade.tachiyomi.util.isLocal
 import eu.kanade.tachiyomi.util.lang.byteSize
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.takeBytes
-import eu.kanade.tachiyomi.util.lang.withIOContext
 import eu.kanade.tachiyomi.util.storage.DiskUtil
 import eu.kanade.tachiyomi.util.system.ImageUtil
 import eu.kanade.tachiyomi.util.updateCoverLastModified
@@ -307,25 +306,23 @@ class ReaderPresenter(
     }
 
     // SY -->
-    suspend fun getChapters(context: Context): List<ReaderChapterItem> {
-        return withIOContext {
-            val currentChapter = getCurrentChapter()
-            val decimalFormat = DecimalFormat(
-                "#.###",
-                DecimalFormatSymbols()
-                    .apply { decimalSeparator = '.' }
-            )
+    fun getChapters(context: Context): List<ReaderChapterItem> {
+        val currentChapter = getCurrentChapter()
+        val decimalFormat = DecimalFormat(
+            "#.###",
+            DecimalFormatSymbols()
+                .apply { decimalSeparator = '.' }
+        )
 
-            chapterList.map {
-                ReaderChapterItem(
-                    it.chapter,
-                    manga!!,
-                    it.chapter == currentChapter?.chapter,
-                    context,
-                    preferences.dateFormat(),
-                    decimalFormat
-                )
-            }
+        return chapterList.map {
+            ReaderChapterItem(
+                it.chapter,
+                manga!!,
+                it.chapter == currentChapter?.chapter,
+                context,
+                preferences.dateFormat(),
+                decimalFormat
+            )
         }
     }
     // SY <--
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 278f3c018..e7b50f712 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
@@ -11,7 +11,6 @@ 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
 
 class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterAdapter.OnBookmarkClickListener {
@@ -26,6 +25,7 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA
             .title(R.string.chapters)
             .customView(view = binding.root)
             .negativeButton(android.R.string.cancel)
+            .onDismiss { destroy() }
             .show {
                 adapter = ReaderChapterAdapter(this@ReaderChapterDialog)
                 binding.chapterRecycler.adapter = adapter
@@ -40,26 +40,21 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA
                 }
 
                 binding.chapterRecycler.layoutManager = LinearLayoutManager(context)
-                onDismiss {
-                    destroy()
-                }
                 refreshList()
             }
     }
 
     private fun refreshList() {
-        launchUI {
-            val chapters = presenter.getChapters(activity)
-                .sortedWith(getChapterSort(presenter.manga!!))
+        val chapters = presenter.getChapters(activity)
+            .sortedWith(getChapterSort(presenter.manga!!))
 
-            adapter?.clear()
-            adapter?.updateDataSet(chapters)
+        adapter?.clear()
+        adapter?.updateDataSet(chapters)
 
-            (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
-                adapter?.getGlobalPositionOf(chapters.find { it.isCurrent }) ?: 0,
-                (binding.chapterRecycler.height / 2).dpToPx
-            )
-        }
+        (binding.chapterRecycler.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(
+            adapter?.getGlobalPositionOf(chapters.find { it.isCurrent }) ?: 0,
+            (binding.chapterRecycler.height / 2).dpToPx
+        )
     }
 
     fun destroy() {