Restore config

This commit is contained in:
tarsin committed 2022-12-13 21:18:11 +08:00
1 parent 58fbdcfcdd
commit 5f19fa0f1f
2 files changed
+18 -2

No files matched your search

@@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.ui.reader.viewer.pager
import android.annotation.SuppressLint
import android.content.Context
import android.graphics.drawable.Animatable
import android.graphics.drawable.Drawable
import android.view.Gravity
import android.view.LayoutInflater
@@ -155,7 +156,16 @@ class PagerPageHolder(
private fun setImage(drawable: Drawable) {
progressIndicator.setProgress(0)
errorLayout?.root?.isVisible = false
setImage(drawable, Config(10))
setImage(drawable,
Config(
zoomDuration = viewer.config.doubleTapAnimDuration,
minimumScaleType = viewer.config.imageScaleType,
cropBorders = viewer.config.imageCropBorders,
zoomStartPosition = viewer.config.imageZoomType,
landscapeZoom = viewer.config.landscapeZoom,
),)
if (drawable !is Animatable)
pageBackground = background
}
/**
@@ -11,6 +11,7 @@ import android.widget.FrameLayout
import androidx.core.view.isVisible
import androidx.core.view.updateLayoutParams
import androidx.core.view.updateMargins
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
import com.hippo.ehviewer.databinding.ReaderErrorBinding
import eu.kanade.tachiyomi.source.model.Page
import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
@@ -175,7 +176,12 @@ class WebtoonPageHolder(
private fun setImage(drawable: Drawable) {
progressIndicator.setProgress(0)
removeErrorLayout()
frame.setImage(drawable, ReaderPageImageView.Config(10))
frame.setImage(drawable,
ReaderPageImageView.Config(
zoomDuration = viewer.config.doubleTapAnimDuration,
minimumScaleType = SubsamplingScaleImageView.SCALE_TYPE_FIT_WIDTH,
cropBorders = viewer.config.imageCropBorders,
),)
}
/**