From 0767526f18ff1513d3fd7a7bead98400cbeb4f35 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Mon, 18 Mar 2024 09:42:22 -0400 Subject: [PATCH] Revert "Re-Add Animated Image Decoders to Coil" This reverts commit 5d1b1408eb78d94912c36cfbe63ee7663f3c1bb4. --- app/src/main/java/eu/kanade/tachiyomi/App.kt | 7 ------- .../kotlin/tachiyomi/core/common/util/system/ImageUtil.kt | 3 --- 2 files changed, 10 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 801afb29b..e54f28457 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -19,8 +19,6 @@ import coil3.ImageLoader import coil3.SingletonImageLoader import coil3.disk.DiskCache import coil3.disk.directory -import coil3.gif.AnimatedImageDecoder -import coil3.gif.GifDecoder import coil3.network.okhttp.OkHttpNetworkFetcherFactory import coil3.request.allowRgb565 import coil3.request.crossfade @@ -184,11 +182,6 @@ class App : Application(), DefaultLifecycleObserver, SingletonImageLoader.Factor val callFactoryLazy = lazy { Injekt.get().client } val diskCacheLazy = lazy { CoilDiskCache.get(this@App) } components { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - add(AnimatedImageDecoder.Factory()) - } else { - add(GifDecoder.Factory()) - } add(OkHttpNetworkFetcherFactory(callFactoryLazy::value)) add(TachiyomiImageDecoder.Factory()) add(MangaCoverFetcher.MangaFactory(callFactoryLazy, diskCacheLazy)) 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 b642113c3..053a54b41 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,9 +91,6 @@ 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) {