Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Jobobby04 2022-08-13 15:46:27 -04:00
parent af070a3f0a
commit 655126eaa2
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListController.kt
View File

@ -474,8 +474,8 @@ class MigrationListController(bundle: Bundle? = null) :
} }
private fun MenuItem.setIconTint(enabled: Boolean, color: Int) { private fun MenuItem.setIconTint(enabled: Boolean, color: Int) {
icon.mutate() icon?.mutate()
icon.setTint(color) icon?.setTint(color)
isEnabled = enabled isEnabled = enabled
} }

12
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderTransitionView.kt
View File

@ -53,10 +53,8 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At
if (prevChapter != null) { if (prevChapter != null) {
binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START
val isPrevDownloaded = downloadManager.isChapterDownloaded( val isPrevDownloaded = downloadManager.isChapterDownloaded(
prevChapter.name, prevChapter,
prevChapter.scanlator, manga
manga.title,
manga.source,
) )
val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader
binding.upperText.text = buildSpannedString { binding.upperText.text = buildSpannedString {
@ -90,10 +88,8 @@ class ReaderTransitionView @JvmOverloads constructor(context: Context, attrs: At
binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START binding.upperText.textAlignment = TEXT_ALIGNMENT_TEXT_START
val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader val isCurrentDownloaded = transition.from.pageLoader is DownloadPageLoader
val isNextDownloaded = downloadManager.isChapterDownloaded( val isNextDownloaded = downloadManager.isChapterDownloaded(
nextChapter.name, nextChapter,
nextChapter.scanlator, manga
manga.title,
manga.source,
) )
binding.upperText.text = buildSpannedString { binding.upperText.text = buildSpannedString {
bold { append(context.getString(R.string.transition_finished)) } bold { append(context.getString(R.string.transition_finished)) }

7
app/src/main/java/exh/EXHMigrations.kt
View File

@ -37,6 +37,7 @@ import eu.kanade.tachiyomi.ui.library.setting.SortModeSetting
import eu.kanade.tachiyomi.ui.reader.setting.OrientationType import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
import eu.kanade.tachiyomi.util.preference.minusAssign import eu.kanade.tachiyomi.util.preference.minusAssign
import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.DeviceUtil
import eu.kanade.tachiyomi.util.system.logcat
import exh.eh.EHentaiUpdateWorker import exh.eh.EHentaiUpdateWorker
import exh.log.xLogE import exh.log.xLogE
import exh.log.xLogW import exh.log.xLogW
@ -314,14 +315,14 @@ object EXHMigrations {
val newSortingMode = when (oldSortingMode) { val newSortingMode = when (oldSortingMode) {
0 -> SortModeSetting.ALPHABETICAL 0 -> SortModeSetting.ALPHABETICAL
1 -> SortModeSetting.LAST_READ 1 -> SortModeSetting.LAST_READ
2 -> SortModeSetting.LAST_MANGA_UPDATE 2 -> SortModeSetting.LAST_CHECKED
3 -> SortModeSetting.UNREAD_COUNT 3 -> SortModeSetting.UNREAD
4 -> SortModeSetting.TOTAL_CHAPTERS 4 -> SortModeSetting.TOTAL_CHAPTERS
6 -> SortModeSetting.LATEST_CHAPTER 6 -> SortModeSetting.LATEST_CHAPTER
7 -> SortModeSetting.DRAG_AND_DROP 7 -> SortModeSetting.DRAG_AND_DROP
8 -> SortModeSetting.DATE_ADDED 8 -> SortModeSetting.DATE_ADDED
9 -> SortModeSetting.TAG_LIST 9 -> SortModeSetting.TAG_LIST
10 -> SortModeSetting.CHAPTER_FETCH_DATE 10 -> SortModeSetting.DATE_FETCHED
else -> SortModeSetting.ALPHABETICAL else -> SortModeSetting.ALPHABETICAL
} }