From 1130f4f114c7e779b37611c3c200921a3041d118 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 14 Oct 2023 15:11:33 +0800 Subject: [PATCH] Remove coil-gif library We only use coil for thumbnails, which are all static, and `ImageDecoderDecoder` is only applicable for animated images. --- app/src/main/java/com/hippo/ehviewer/EhApplication.kt | 5 ----- gradle/libs.versions.toml | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index 6355a5efc..992261c87 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -23,7 +23,6 @@ import androidx.collection.LruCache import androidx.lifecycle.ProcessLifecycleOwner import androidx.lifecycle.coroutineScope import coil.ImageLoaderFactory -import coil.decode.ImageDecoderDecoder import coil.util.DebugLogger import com.hippo.ehviewer.client.EhCookieStore import com.hippo.ehviewer.client.EhTagDatabase @@ -47,7 +46,6 @@ import com.hippo.ehviewer.util.Crash import com.hippo.ehviewer.util.FavouriteStatusRouter import com.hippo.ehviewer.util.FileUtils import com.hippo.ehviewer.util.ReadableTime -import com.hippo.ehviewer.util.isAtLeastP import com.hippo.ehviewer.util.isAtLeastQ import com.hippo.ehviewer.util.isCronetSupported import eu.kanade.tachiyomi.network.interceptor.CloudflareInterceptor @@ -148,9 +146,6 @@ class EhApplication : Application(), ImageLoaderFactory { } else { callFactory(baseOkHttpClient) } - if (isAtLeastP) { - add(ImageDecoderDecoder.Factory(false)) - } add(MergeInterceptor) } diskCache(imageCache) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e31bee3a9..33701d9ec 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -77,7 +77,6 @@ chucker-nop = { module = "com.github.chuckerteam.chucker:library-no-op", version coil-bom = { module = "io.coil-kt:coil-bom", version.ref = "coil" } coil-compose = { module = "io.coil-kt:coil-compose" } -coil-gif = { module = "io.coil-kt:coil-gif" } compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version.ref = "compose-bom" } # For renovate @@ -132,7 +131,7 @@ accompanist = ["accompanist-themeadapter-material3", "accompanist-webview"] androidx-navigation = ["androidx-navigation-compose", "androidx-navigation-fragment", "androidx-navigation-ui"] androidx-paging = ["androidx-paging-compose", "androidx-paging-runtime"] androidx-recyclerview = ["androidx-recyclerview", "androidx-recyclerview-selection"] -coil = ["coil-compose", "coil-gif"] +coil = ["coil-compose"] compose = ["compose-material-icons-extended", "compose-material3", "compose-material3-windowsizeclass", "compose-ui-util"] kotlinx-serialization = ["kotlinx-serialization-cbor", "kotlinx-serialization-json", "kotlinx-serialization-json-okio"] ktor = ["ktor-io-jvm", "ktor-utils-jvm"]