From 03407a784fa5fad2405971039cf5dea94a2d45e9 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 23 Dec 2023 23:22:43 -0500 Subject: [PATCH] Build fixes --- .../main/java/eu/kanade/presentation/browse/FeedScreen.kt | 2 +- .../ui/reader/viewer/webtoon/WebtoonPageHolder.kt | 8 +++++++- app/src/main/java/exh/EXHMigrations.kt | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index 27035bcae..06bd90a55 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -92,7 +92,7 @@ fun FeedScreen( refreshing = true onRefresh() }, - enabled = !state.isLoadingItems, + enabled = { !state.isLoadingItems }, ) { ScrollbarLazyColumn( contentPadding = contentPadding + topSmallPaddingValues, diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt index 59b99d59d..c3b09c7f0 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt @@ -232,7 +232,13 @@ class WebtoonPageHolder( } private fun rotateDualPage(imageStream: BufferedInputStream): InputStream { - val isDoublePage = ImageUtil.isWideImage(imageStream) + val isDoublePage = ImageUtil.isWideImage( + imageStream, + // SY --> + page?.zip4jFile, + page?.zip4jEntry, + // SY <-- + ) return if (isDoublePage) { val rotation = if (viewer.config.dualPageRotateToFitInvert) -90f else 90f ImageUtil.rotateImage(imageStream, rotation) diff --git a/app/src/main/java/exh/EXHMigrations.kt b/app/src/main/java/exh/EXHMigrations.kt index c06a48a75..c49260fc9 100644 --- a/app/src/main/java/exh/EXHMigrations.kt +++ b/app/src/main/java/exh/EXHMigrations.kt @@ -490,9 +490,6 @@ object EXHMigrations { } } if (oldVersion under 40) { - if (backupPreferences.numberOfBackups().get() == 1) { - backupPreferences.numberOfBackups().set(2) - } if (backupPreferences.backupInterval().get() == 0) { backupPreferences.backupInterval().set(12) BackupCreateJob.setupTask(context)