null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: Bounding rects compat

Browse source
This commit is contained in:
ziro 2024-02-05 11:37:06 +07:00
parent 296c9eae67
commit 0f705dcc6b
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
View file

@ -16,6 +16,7 @@ import androidx.annotation.AttrRes
import androidx.annotation.CallSuper import androidx.annotation.CallSuper
import androidx.annotation.StyleRes import androidx.annotation.StyleRes
import androidx.appcompat.widget.AppCompatImageView import androidx.appcompat.widget.AppCompatImageView
import androidx.core.view.WindowInsetsCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
import coil.dispose import coil.dispose
import coil.imageLoader import coil.imageLoader
@ -25,7 +26,6 @@ import com.davemorrissey.labs.subscaleview.ImageSource
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.SCALE_TYPE_CENTER_INSIDE
import com.github.chrisbanes.photoview.PhotoView import com.github.chrisbanes.photoview.PhotoView
import dev.yokai.domain.ui.settings.ReaderPreferences
import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour import dev.yokai.domain.ui.settings.ReaderPreferences.CutoutBehaviour
import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerConfig
import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonSubsamplingImageView import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonSubsamplingImageView
@ -190,15 +190,14 @@ open class ReaderPageImageView @JvmOverloads constructor(
config.insetInfo.scaleTypeIsFullFit && topInsets + bottomInsets > 0, config.insetInfo.scaleTypeIsFullFit && topInsets + bottomInsets > 0,
) )
if ((config.insetInfo.cutoutBehavior != CutoutBehaviour.IGNORE || !config.insetInfo.scaleTypeIsFullFit) && if ((config.insetInfo.cutoutBehavior != CutoutBehaviour.IGNORE || !config.insetInfo.scaleTypeIsFullFit) &&
android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q &&
config.insetInfo.isFullscreen config.insetInfo.isFullscreen
) { ) {
val insets: WindowInsets? = config.insetInfo.insets val insets = config.insetInfo.insets?.let { WindowInsetsCompat.toWindowInsetsCompat(it) }
setExtraSpace( setExtraSpace(
0f, 0f,
insets?.displayCutout?.boundingRectTop?.height()?.toFloat() ?: 0f, insets?.displayCutout?.boundingRects?.get(1)?.height()?.toFloat() ?: 0f,
0f, 0f,
insets?.displayCutout?.boundingRectBottom?.height()?.toFloat() ?: 0f, insets?.displayCutout?.boundingRects?.get(3)?.height()?.toFloat() ?: 0f,
) )
} }
} }