diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a296b419..fdb785d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ parcelize = "0.9.0" voyager = "1.1.0-beta03" accompanist = "0.30.1" googleAccompanist = "0.36.0" -imageloader = "1.8.1" +imageloader = "1.10.0" materialDialogs = "0.9.7" # Android diff --git a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/image/AndroidImageLoaderBuilder.kt b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/image/AndroidImageLoaderBuilder.kt index 2308e573..ea120f26 100644 --- a/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/image/AndroidImageLoaderBuilder.kt +++ b/presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/image/AndroidImageLoaderBuilder.kt @@ -7,10 +7,10 @@ package ca.gosyer.jui.ui.base.image import android.os.Build +import androidx.compose.ui.graphics.ImageBitmapConfig import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.uicore.vm.ContextWrapper import com.seiko.imageloader.Bitmap -import com.seiko.imageloader.BitmapConfig import com.seiko.imageloader.cache.disk.DiskCacheBuilder import com.seiko.imageloader.cache.memory.MemoryCacheBuilder import com.seiko.imageloader.cache.memory.MemoryKey @@ -21,10 +21,10 @@ import com.seiko.imageloader.option.androidContext import okio.Path.Companion.toOkioPath actual fun OptionsBuilder.configure(contextWrapper: ContextWrapper) { - bitmapConfig = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - BitmapConfig.ARGB_8888 + imageBitmapConfig = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { + ImageBitmapConfig.Argb8888 } else { - BitmapConfig.HARDWARE + ImageBitmapConfig.Gpu } androidContext(contextWrapper) } diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/ImageLoaderProvider.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/ImageLoaderProvider.kt index 39293cfc..d5a60040 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/ImageLoaderProvider.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/ImageLoaderProvider.kt @@ -75,7 +75,6 @@ class ImageLoaderProvider( override fun key( data: Any, options: Options, - type: Keyer.Type, ): String? { if (data !is Manga) return null return "${data.sourceId}-${data.thumbnailUrl}-${data.thumbnailUrlLastFetched}" @@ -97,7 +96,6 @@ class ImageLoaderProvider( override fun key( data: Any, options: Options, - type: Keyer.Type, ): String? { if (data !is Extension) return null return data.iconUrl @@ -119,7 +117,6 @@ class ImageLoaderProvider( override fun key( data: Any, options: Options, - type: Keyer.Type, ): String? { if (data !is Source) return null return data.iconUrl diff --git a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt index b39e69cc..25c02d45 100644 --- a/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt +++ b/presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt @@ -22,8 +22,9 @@ import cafe.adriel.voyager.core.concurrent.AtomicInt32 import com.seiko.imageloader.asImageBitmap import com.seiko.imageloader.cache.disk.DiskCache import com.seiko.imageloader.component.decoder.DecodeResult -import com.seiko.imageloader.model.DataSource import com.seiko.imageloader.model.ImageResult +import com.seiko.imageloader.model.ImageSource +import com.seiko.imageloader.model.ImageSourceFrom import com.seiko.imageloader.option.Options import io.ktor.client.plugins.onDownload import kotlinx.coroutines.CoroutineScope @@ -159,8 +160,8 @@ class TachideskPageLoader( it.source().use { source -> val decoder = bitmapDecoderFactory.create( ImageResult.OfSource( - source, - DataSource.Engine, + ImageSource(source), + ImageSourceFrom.Disk, ), Options(), )