From 9d1144296c0acbd0bb75bfa670a4639ff27d4b79 Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Sun, 24 Apr 2022 03:43:31 -0400 Subject: [PATCH] Minor updates to pagerpageholder --- .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 6 ------ .../tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt | 5 +++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 0e9db7d013..5da2af4ba7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -78,7 +78,6 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.VerticalPagerViewer import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.storage.getUriCompat -import eu.kanade.tachiyomi.util.system.GLUtil import eu.kanade.tachiyomi.util.system.contextCompatColor import eu.kanade.tachiyomi.util.system.dpToPx import eu.kanade.tachiyomi.util.system.getBottomGestureInsets @@ -139,11 +138,6 @@ class ReaderActivity : BaseRxActivity() { */ private val preferences by injectLazy() - /** - * The maximum bitmap size supported by the device. - */ - val maxBitmapSize by lazy { GLUtil.maxTextureSize } - /** * Viewer used to display the pages (pager, webtoon, ...). */ diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt index d3c75332c7..9a2b4d4610 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt @@ -36,6 +36,7 @@ import eu.kanade.tachiyomi.ui.reader.viewer.ReaderProgressBar import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.Companion.CUTOUT_IGNORE import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.Companion.CUTOUT_START_EXTENDED import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig.ZoomType +import eu.kanade.tachiyomi.util.system.GLUtil import eu.kanade.tachiyomi.util.system.ImageUtil import eu.kanade.tachiyomi.util.system.ThemeUtil import eu.kanade.tachiyomi.util.system.bottomCutoutInset @@ -631,13 +632,13 @@ class PagerPageHolder( val config = viewer.config subsamplingImageView = SubsamplingScaleImageView(context).apply { - setMaxTileSize(viewer.activity.maxBitmapSize) + setMaxTileSize(GLUtil.maxTextureSize) setDoubleTapZoomStyle(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER) setDoubleTapZoomDuration(config.doubleTapAnimDuration) setPanLimit(SubsamplingScaleImageView.PAN_LIMIT_INSIDE) setMinimumScaleType(config.imageScaleType) - setMinimumDpi(1) setMinimumTileDpi(180) + setMinimumDpi(1) setCropBorders(config.imageCropBorders) val topInsets = viewer.activity.window.decorView.rootWindowInsets.topCutoutInset().toFloat() val bottomInsets = viewer.activity.window.decorView.rootWindowInsets.bottomCutoutInset().toFloat()