From 46f0e26dd32b43d6905ba30cc7c3760e667bf402 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Fri, 29 Aug 2025 18:11:38 +0700 Subject: [PATCH] fix(merged-reader): Fix chapter list's download badge in Reader (#1117) * Fix chapter list's download badge in Reader * improve --- .../eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 32e32ff8f..33fe5becc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -428,12 +428,19 @@ class ReaderViewModel @JvmOverloads constructor( // SY --> fun getChapters(): List { + // KMK --> + val manga = manga ?: return emptyList() + val mangaList = state.value.mergedManga?.takeIf { it.isNotEmpty() } ?: mapOf(manga.id to manga) + // KMK <-- + val currentChapter = getCurrentChapter() return chapterList.map { ReaderChapterItem( chapter = it.chapter.toDomainChapter()!!, - manga = manga!!, + // KMK --> + manga = mangaList[it.chapter.manga_id] ?: manga, + // KMK <-- isCurrent = it.chapter.id == currentChapter?.chapter?.id, dateFormat = UiPreferences.dateFormat(uiPreferences.dateFormat().get()), )