From 655126eaa2f26562c3b0ee0810ebe43e75a66cc8 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 13 Aug 2022 15:46:27 -0400 Subject: [PATCH] Fixes --- .../advanced/process/MigrationListController.kt | 4 ++-- .../ui/reader/viewer/ReaderTransitionView.kt | 12 ++++-------- app/src/main/java/exh/EXHMigrations.kt | 7 ++++--- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt index e8250df0b..5d013128b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt @@ -474,8 +474,8 @@ class MigrationListController(bundle: Bundle? = null) : } private fun MenuItem.setIconTint(enabled: Boolean, color: Int) { - icon.mutate() - icon.setTint(color) + icon?.mutate() + icon?.setTint(color) isEnabled = enabled } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt index c46a1fa9c..bdd6712bf 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt @@ -53,10 +53,8 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At if (prevChapter != null) { binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START val isPrevDownloaded = downloadManager.isChapterDownloaded( - prevChapter.name, - prevChapter.scanlator, - manga.title, - manga.source, + prevChapter, + manga ) val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader binding.upperText.text = buildSpannedString { @@ -90,10 +88,8 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader val isNextDownloaded = downloadManager.isChapterDownloaded( - nextChapter.name, - nextChapter.scanlator, - manga.title, - manga.source, + nextChapter, + manga ) binding.upperText.text = buildSpannedString { bold { append(context.getString(R.string.transition_finished)) } diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index fcf49c066..fcdeca203 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -37,6 +37,7 @@ import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.util.preference.minusAssign import eu.kanade.tachiyomi.util.system.DeviceUtil +import eu.kanade.tachiyomi.util.system.logcat import exh.eh.EHentaiUpdateWorker import exh.log.xLogE import exh.log.xLogW @@ -314,14 +315,14 @@ object EXHMigrations { val newSortingMode = when (oldSortingMode) { 0 -> SortModeSetting.ALPHABETICAL 1 -> SortModeSetting.LAST_READ - 2 -> SortModeSetting.LAST_MANGA_UPDATE - 3 -> SortModeSetting.UNREAD_COUNT + 2 -> SortModeSetting.LAST_CHECKED + 3 -> SortModeSetting.UNREAD 4 -> SortModeSetting.TOTAL_CHAPTERS 6 -> SortModeSetting.LATEST_CHAPTER 7 -> SortModeSetting.DRAG_AND_DROP 8 -> SortModeSetting.DATE_ADDED 9 -> SortModeSetting.TAG_LIST - 10 -> SortModeSetting.CHAPTER_FETCH_DATE + 10 -> SortModeSetting.DATE_FETCHED else -> SortModeSetting.ALPHABETICAL }