github/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2024-11-21 20:47:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix regression from coil3 migration

Browse source 
Fixes #495

Co-authored-by: jobobby04 <17078382+jobobby04@users.noreply.github.com>
This commit is contained in:
AntsyLich 2024-03-18 23:01:23 +06:00
parent ebee275110
commit 59bedb33ff
No known key found for this signature in database
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt
View file

@ -349,8 +349,9 @@ open class ReaderPageImageView @JvmOverloads constructor(
.diskCachePolicy(CachePolicy.DISABLED) .diskCachePolicy(CachePolicy.DISABLED)
.target( .target(
onSuccess = { result -> onSuccess = { result ->
setImageDrawable(result.asDrawable(context.resources)) val drawable = result.asDrawable(context.resources)
(result as? Animatable)?.start() setImageDrawable(drawable)
(drawable as? Animatable)?.start()
isVisible = true isVisible = true
this@ReaderPageImageView.onImageLoaded() this@ReaderPageImageView.onImageLoaded()
}, },

13
core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt
View file

@ -77,19 +77,20 @@ object ImageUtil {
} }
fun isAnimatedAndSupported(stream: InputStream): Boolean { fun isAnimatedAndSupported(stream: InputStream): Boolean {
try { return try {
val type = getImageType(stream) ?: return false val type = getImageType(stream) ?: return false
return when (type.format) { // https://coil-kt.github.io/coil/getting_started/#supported-image-formats
when (type.format) {
Format.Gif -> true Format.Gif -> true
// Coil supports animated WebP on Android 9.0+ // Animated WebP on Android 9+
// https://coil-kt.github.io/coil/getting_started/#supported-image-formats
Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
// Animated Heif on Android 11+
Format.Heif -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
else -> false else -> false
} }
} catch (e: Exception) { } catch (e: Exception) {
/* Do Nothing */ false
} }
return false
} }
private fun getImageType(stream: InputStream): tachiyomi.decoder.ImageType? { private fun getImageType(stream: InputStream): tachiyomi.decoder.ImageType? {