diff --git a/app/build.gradle b/app/build.gradle index 78f7e1e6b..1935df0b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 targetSdkVersion 33 - versionCode 496 - versionName '4.0-a7' + versionCode 497 + versionName '4.0-beta1' generatedDensities = [] testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -88,7 +88,7 @@ dependencies { implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4' - implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.activity:activity-ktx:1.5.1' implementation 'androidx.fragment:fragment-ktx:1.5.2' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' @@ -124,7 +124,7 @@ dependencies { implementation 'io.coil-kt:coil-base:2.2.1' implementation 'io.coil-kt:coil-svg:2.2.1' - implementation 'com.github.KotatsuApp:subsampling-scale-image-view:cf1fcaa84e' + implementation 'com.github.KotatsuApp:subsampling-scale-image-view:2aae2133d1' implementation 'com.github.solkin:disk-lru-cache:1.4' implementation 'ch.acra:acra-http:5.9.6' diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt index 4b8a1d29b..6b528eae7 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/PageHolderDelegate.kt @@ -3,8 +3,7 @@ package org.koitharu.kotatsu.reader.ui.pager import android.net.Uri import androidx.core.net.toUri import androidx.lifecycle.Observer -import com.davemorrissey.labs.subscaleview.OnImageEventListener -import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView +import com.davemorrissey.labs.subscaleview.DefaultOnImageEventListener import java.io.File import java.io.IOException import kotlinx.coroutines.* @@ -22,7 +21,7 @@ class PageHolderDelegate( private val readerSettings: ReaderSettings, private val callback: Callback, private val exceptionResolver: ExceptionResolver, -) : OnImageEventListener, Observer { +) : DefaultOnImageEventListener, Observer { private val scope = loader.loaderScope + Dispatchers.Main.immediate private var state = State.EMPTY diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt index aba8e32bd..713bfe306 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/standard/PageHolder.kt @@ -7,9 +7,6 @@ import android.view.View import androidx.core.view.isVisible import com.davemorrissey.labs.subscaleview.ImageSource import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView -import com.davemorrissey.labs.subscaleview.decoder.SkiaPooledImageRegionDecoder -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.asExecutor import org.koitharu.kotatsu.R import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver import org.koitharu.kotatsu.core.model.ZoomMode @@ -30,7 +27,7 @@ open class PageHolder( init { binding.ssiv.isEagerLoadingEnabled = !isLowRamDevice(context) - binding.ssiv.setOnImageEventListener(delegate) + binding.ssiv.addOnImageEventListener(delegate) @Suppress("LeakingThis") bindingInfo.buttonRetry.setOnClickListener(this) binding.textViewNumber.isVisible = settings.isPagesNumbersEnabled diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt index bbdbb1869..da78b6615 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/webtoon/WebtoonHolder.kt @@ -28,7 +28,7 @@ class WebtoonHolder( init { binding.ssiv.regionDecoderFactory = SkiaPooledImageRegionDecoder.Factory() - binding.ssiv.setOnImageEventListener(delegate) + binding.ssiv.addOnImageEventListener(delegate) bindingInfo.buttonRetry.setOnClickListener(this) GoneOnInvisibleListener(bindingInfo.progressBar).attach() }