diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt index e4d1313fa..6fc1d8432 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt @@ -5,6 +5,7 @@ import android.view.View import androidx.core.view.isVisible import androidx.lifecycle.LifecycleOwner import com.davemorrissey.labs.subscaleview.ImageSource +import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver import org.koitharu.kotatsu.core.os.NetworkState @@ -96,6 +97,9 @@ class WebtoonHolder( override fun onImageShowing(settings: ReaderSettings) { binding.ssiv.colorFilter = settings.colorFilter?.toColorFilter() with(binding.ssiv) { + minimumScaleType = SubsamplingScaleImageView.SCALE_TYPE_CUSTOM + minScale = width / sWidth.toFloat() + maxScale = minScale scrollTo( when { scrollToRestore != 0 -> scrollToRestore diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt index bc42c1ca6..d663fa2da 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonImageView.kt @@ -100,17 +100,6 @@ class WebtoonImageView @JvmOverloads constructor( } } - override fun onReady() { - super.onReady() - adjustScale() - } - - override fun onDownsamplingChanged() { - super.onDownsamplingChanged() - adjustScale() - computeScrollRange() - } - private fun scrollToInternal(pos: Int) { scrollPos = pos ct.set(sWidth / 2f, (height / 2f + pos.toFloat()) / minScale) @@ -128,10 +117,4 @@ class WebtoonImageView @JvmOverloads constructor( private fun parentHeight(): Int { return ancestors.firstNotNullOfOrNull { it as? RecyclerView }?.height ?: 0 } - - private fun adjustScale() { - minScale = width / sWidth.toFloat() - maxScale = minScale - minimumScaleType = SCALE_TYPE_CUSTOM - } }