From 5f19fa0f1f8ba18f6d5ec00a5a1726ef3c8c4721 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 13 Dec 2022 21:18:11 +0800
Subject: [PATCH] Restore config

---
 .../ui/reader/viewer/pager/PagerPageHolder.kt        | 12 +++++++++++-
 .../ui/reader/viewer/webtoon/WebtoonPageHolder.kt    |  8 +++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

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 275561e7a..286478db2 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
@@ -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
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
index 6f3def857..3e355b479 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
@@ -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,
+        ),)
     }
 
     /**