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

Fix crash in reader when rotating sometimes

Browse source
This commit is contained in:
Jays2Kings 2023-02-14 14:36:30 -05:00
parent 15a16048ae
commit 71e2a54d13
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -340,15 +340,16 @@ class PagerPageHolder(
ZoomType.Center -> center.also { it?.y = 0F } ZoomType.Center -> center.also { it?.y = 0F }
} }
val rootInsets = viewer.activity.window.decorView.rootWindowInsets
val topInsets = if (viewer.activity.isSplitScreen) { val topInsets = if (viewer.activity.isSplitScreen) {
0f 0f
} else { } else {
viewer.activity.window.decorView.rootWindowInsets.topCutoutInset().toFloat() rootInsets?.topCutoutInset()?.toFloat() ?: 0f
} }
val bottomInsets = if (viewer.activity.isSplitScreen) { val bottomInsets = if (viewer.activity.isSplitScreen) {
0f 0f
} else { } else {
viewer.activity.window.decorView.rootWindowInsets.bottomCutoutInset().toFloat() rootInsets?.bottomCutoutInset()?.toFloat() ?: 0f
} }
val targetScale = (height.toFloat() - topInsets - bottomInsets) / sHeight.toFloat() val targetScale = (height.toFloat() - topInsets - bottomInsets) / sHeight.toFloat()
animateScaleAndCenter(min(targetScale, minScale * 2), point)!! animateScaleAndCenter(min(targetScale, minScale * 2), point)!!
@ -570,8 +571,8 @@ class PagerPageHolder(
landscapeZoom = viewer.config.landscapeZoom, landscapeZoom = viewer.config.landscapeZoom,
insetInfo = InsetInfo( insetInfo = InsetInfo(
cutoutBehavior = viewer.config.cutoutBehavior, cutoutBehavior = viewer.config.cutoutBehavior,
topCutoutInset = viewer.activity.window.decorView.rootWindowInsets.topCutoutInset().toFloat(), topCutoutInset = viewer.activity.window.decorView.rootWindowInsets?.topCutoutInset()?.toFloat() ?: 0f,
bottomCutoutInset = viewer.activity.window.decorView.rootWindowInsets.bottomCutoutInset().toFloat(), bottomCutoutInset = viewer.activity.window.decorView.rootWindowInsets?.bottomCutoutInset()?.toFloat() ?: 0f,
scaleTypeIsFullFit = viewer.config.scaleTypeIsFullFit(), scaleTypeIsFullFit = viewer.config.scaleTypeIsFullFit(),
isFullscreen = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && isFullscreen = Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
viewer.config.isFullscreen && !viewer.activity.isInMultiWindowMode, viewer.config.isFullscreen && !viewer.activity.isInMultiWindowMode,