From a2e1b766c778fdd633c5daa1bd67e04feb35df9d Mon Sep 17 00:00:00 2001 From: ziro Date: Mon, 12 Feb 2024 07:42:56 +0700 Subject: [PATCH] revert: Revert cutout integration for Android 9 or below --- .../tachiyomi/ui/reader/viewer/ReaderPageImageView.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index 05edc46eb6..d85972a092 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -190,14 +190,15 @@ open class ReaderPageImageView @JvmOverloads constructor( config.insetInfo.scaleTypeIsFullFit && topInsets + bottomInsets > 0, ) if ((config.insetInfo.cutoutBehavior != CutoutBehaviour.IGNORE || !config.insetInfo.scaleTypeIsFullFit) && + android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q && config.insetInfo.isFullscreen ) { - val insets = config.insetInfo.insets?.let { WindowInsetsCompat.toWindowInsetsCompat(it) } + val insets: WindowInsets? = config.insetInfo.insets setExtraSpace( 0f, - insets?.displayCutout?.boundingRects?.get(1)?.height()?.toFloat() ?: 0f, + insets?.displayCutout?.boundingRectTop?.height()?.toFloat() ?: 0f, 0f, - insets?.displayCutout?.boundingRects?.get(3)?.height()?.toFloat() ?: 0f, + insets?.displayCutout?.boundingRectBottom?.height()?.toFloat() ?: 0f, ) } }