From 5e4f67da3c61254a82d4da43acb99b24b9c41109 Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 4 Aug 2021 14:15:24 +0300
Subject: [PATCH] Fix Bakkin chapter URLs (#8394)

---
 .../eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt   | 2 +-
 .../java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt   | 5 ++---
 .../eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt     | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt
index ad93787df..66b9388f4 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinGenerator.kt
@@ -8,7 +8,7 @@ class BakkinGenerator : ThemeSourceGenerator {
 
     override val themeClass = "BakkinReaderX"
 
-    override val baseVersionCode = 2
+    override val baseVersionCode = 3
 
     override val sources = listOf(
         SingleLang("Bakkin", "https://bakkin.moe/reader/", "en"),
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
index 8370699cb..feb3b8a92 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinJSON.kt
@@ -9,9 +9,8 @@ internal data class Series(
     val thumb: String?,
     val volumes: List<Volume>
 ) : Iterable<Chapter> {
-    override fun iterator() = volumes.flatMap {
-        // Prepend the volume name to the chapter name
-        it.map { ch -> ch.copy(name = "$it - $ch") }
+    override fun iterator() = volumes.flatMap { vol ->
+        vol.map { it.copy("$dir/${vol.dir}/${it.dir}", "$vol - $it") }
     }.iterator()
 
     val cover: String
diff --git a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
index 7c84dac9b..4e3499ba4 100644
--- a/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
+++ b/multisrc/src/main/java/eu/kanade/tachiyomi/multisrc/bakkin/BakkinReaderX.kt
@@ -118,7 +118,8 @@ abstract class BakkinReaderX(
     override fun setupPreferenceScreen(screen: PreferenceScreen) {
         ListPreference(screen.context).apply {
             key = "quality"
-            summary = "Image quality: %s"
+            summary = "%s"
+            title = "Image quality"
             entries = arrayOf("Original", "Compressed")
             entryValues = arrayOf("?fullsize", "")
             setDefaultValue("")