diff --git a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt index 956d3829b..93d46fcd3 100644 --- a/app/src/main/java/com/hippo/ehviewer/EhApplication.kt +++ b/app/src/main/java/com/hippo/ehviewer/EhApplication.kt @@ -24,7 +24,6 @@ import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.ProcessLifecycleOwner import androidx.room.Room -import coil.ImageLoader import coil.ImageLoaderFactory import coil.decode.ImageDecoderDecoder import coil.util.DebugLogger @@ -36,6 +35,7 @@ import com.hippo.ehviewer.client.data.GalleryDetail import com.hippo.ehviewer.client.install import com.hippo.ehviewer.coil.MergeInterceptor import com.hippo.ehviewer.coil.diskCache +import com.hippo.ehviewer.coil.imageLoader import com.hippo.ehviewer.dailycheck.checkDawn import com.hippo.ehviewer.dao.EhDatabase import com.hippo.ehviewer.download.DownloadManager @@ -133,18 +133,16 @@ class EhApplication : Application(), DefaultLifecycleObserver, ImageLoaderFactor locked = true } - override fun newImageLoader(): ImageLoader { - return ImageLoader.Builder(this).apply { - okHttpClient(nonCacheOkHttpClient) - components { - add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) } - add(MergeInterceptor) - } - diskCache(imageCache) - crossfade(300) - error(R.drawable.image_failed) - if (BuildConfig.DEBUG) logger(DebugLogger()) - }.build() + override fun newImageLoader() = imageLoader { + okHttpClient(nonCacheOkHttpClient) + components { + add { result, options, _ -> ImageDecoderDecoder(result.source, options, false) } + add(MergeInterceptor) + } + diskCache(imageCache) + crossfade(300) + error(R.drawable.image_failed) + if (BuildConfig.DEBUG) logger(DebugLogger()) } companion object { diff --git a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt index 42eaf3ad9..f024431d6 100644 --- a/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt +++ b/app/src/main/java/com/hippo/ehviewer/coil/Extensions.kt @@ -3,6 +3,7 @@ package com.hippo.ehviewer.coil import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable +import coil.ImageLoader import coil.decode.DecodeResult import coil.decode.Decoder import coil.disk.DiskCache @@ -41,3 +42,4 @@ inline fun Context.imageRequest(preview: GalleryPreview, builder: ImageRequest.B inline fun Context.imageRequest(info: GalleryInfo, builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).ehUrl(info).apply(builder).build() inline fun Context.imageRequest(builder: ImageRequest.Builder.() -> Unit = {}) = ImageRequest.Builder(this).apply(builder).build() inline fun diskCache(builder: DiskCache.Builder.() -> Unit) = DiskCache.Builder().apply(builder).build() +inline fun Context.imageLoader(builder: ImageLoader.Builder.() -> Unit) = ImageLoader.Builder(this).apply(builder).build()