From fb1649125cd4fce6843ede61862de195b393f1d1 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 18 Mar 2024 09:43:14 -0400 Subject: [PATCH] Actually fix animated images --- .../kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt | 5 +++-- .../kotlin/tachiyomi/core/common/util/system/ImageUtil.kt | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt index 3397ee643..91045613d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/ReaderPageImageView.kt @@ -343,8 +343,9 @@ open class ReaderPageImageView @JvmOverloads constructor( .diskCachePolicy(CachePolicy.DISABLED) .target( onSuccess = { result -> - setImageDrawable(result.asDrawable(context.resources)) - (result as? Animatable)?.start() + val drawable = result.asDrawable(context.resources) + setImageDrawable(drawable) + (drawable as? Animatable)?.start() isVisible = true this@ReaderPageImageView.onImageLoaded() }, diff --git a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt index 053a54b41..b642113c3 100644 --- a/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt +++ b/core/common/src/main/kotlin/tachiyomi/core/common/util/system/ImageUtil.kt @@ -91,6 +91,9 @@ object ImageUtil { // Coil supports animated WebP on Android 9.0+ // https://coil-kt.github.io/coil/getting_started/#supported-image-formats Format.Webp -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P + // Coil supports animated Heif on Android 11+ + // https://coil-kt.github.io/coil/getting_started/#supported-image-formats + Format.Heif -> type.isAnimated && Build.VERSION.SDK_INT >= Build.VERSION_CODES.R else -> false } } catch (e: Exception) {