mirrors/TachideskJUI
1
0
Fork 0
mirror of https://github.com/Suwayomi/TachideskJUI.git synced 2025-12-10 06:42:05 +01:00
Code Issues Projects Releases Wiki Activity

Update imageloader to v1.10.0 (#145)

Browse Source 
* Update imageloader to v1.10.0

* Build fixes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Syer10 <syer10@users.noreply.github.com>
This commit is contained in:
renovate[bot]
2025-10-05 17:12:31 -04:00
committed by GitHub
parent bfdc4651f9
commit 3208f07c81
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@@ -14,7 +14,7 @@ parcelize = "0.9.0"
voyager = "1.1.0-beta03" voyager = "1.1.0-beta03"
accompanist = "0.30.1" accompanist = "0.30.1"
googleAccompanist = "0.36.0" googleAccompanist = "0.36.0"
imageloader = "1.8.1" imageloader = "1.10.0"
materialDialogs = "0.9.7" materialDialogs = "0.9.7"
# Android # Android

8
presentation/src/androidMain/kotlin/ca/gosyer/jui/ui/base/image/AndroidImageLoaderBuilder.kt
View File

@@ -7,10 +7,10 @@
package ca.gosyer.jui.ui.base.image package ca.gosyer.jui.ui.base.image
import android.os.Build import android.os.Build
import androidx.compose.ui.graphics.ImageBitmapConfig
import ca.gosyer.jui.domain.server.Http import ca.gosyer.jui.domain.server.Http
import ca.gosyer.jui.uicore.vm.ContextWrapper import ca.gosyer.jui.uicore.vm.ContextWrapper
import com.seiko.imageloader.Bitmap import com.seiko.imageloader.Bitmap
import com.seiko.imageloader.BitmapConfig
import com.seiko.imageloader.cache.disk.DiskCacheBuilder import com.seiko.imageloader.cache.disk.DiskCacheBuilder
import com.seiko.imageloader.cache.memory.MemoryCacheBuilder import com.seiko.imageloader.cache.memory.MemoryCacheBuilder
import com.seiko.imageloader.cache.memory.MemoryKey import com.seiko.imageloader.cache.memory.MemoryKey
@@ -21,10 +21,10 @@ import com.seiko.imageloader.option.androidContext
import okio.Path.Companion.toOkioPath import okio.Path.Companion.toOkioPath
actual fun OptionsBuilder.configure(contextWrapper: ContextWrapper) { actual fun OptionsBuilder.configure(contextWrapper: ContextWrapper) {
bitmapConfig = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { imageBitmapConfig = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
BitmapConfig.ARGB_8888 ImageBitmapConfig.Argb8888
} else { } else {
BitmapConfig.HARDWARE ImageBitmapConfig.Gpu
} }
androidContext(contextWrapper) androidContext(contextWrapper)
} }

3
presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/base/image/ImageLoaderProvider.kt
View File

@@ -75,7 +75,6 @@ class ImageLoaderProvider(
override fun key( override fun key(
data: Any, data: Any,
options: Options, options: Options,
type: Keyer.Type,
): String? { ): String? {
if (data !is Manga) return null if (data !is Manga) return null
return "${data.sourceId}-${data.thumbnailUrl}-${data.thumbnailUrlLastFetched}" return "${data.sourceId}-${data.thumbnailUrl}-${data.thumbnailUrlLastFetched}"
@@ -97,7 +96,6 @@ class ImageLoaderProvider(
override fun key( override fun key(
data: Any, data: Any,
options: Options, options: Options,
type: Keyer.Type,
): String? { ): String? {
if (data !is Extension) return null if (data !is Extension) return null
return data.iconUrl return data.iconUrl
@@ -119,7 +117,6 @@ class ImageLoaderProvider(
override fun key( override fun key(
data: Any, data: Any,
options: Options, options: Options,
type: Keyer.Type,
): String? { ): String? {
if (data !is Source) return null if (data !is Source) return null
return data.iconUrl return data.iconUrl

7
presentation/src/commonMain/kotlin/ca/gosyer/jui/ui/reader/loader/TachideskPageLoader.kt
View File

@@ -22,8 +22,9 @@ import cafe.adriel.voyager.core.concurrent.AtomicInt32
import com.seiko.imageloader.asImageBitmap import com.seiko.imageloader.asImageBitmap
import com.seiko.imageloader.cache.disk.DiskCache import com.seiko.imageloader.cache.disk.DiskCache
import com.seiko.imageloader.component.decoder.DecodeResult import com.seiko.imageloader.component.decoder.DecodeResult
import com.seiko.imageloader.model.DataSource
import com.seiko.imageloader.model.ImageResult 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 com.seiko.imageloader.option.Options
import io.ktor.client.plugins.onDownload import io.ktor.client.plugins.onDownload
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
@@ -159,8 +160,8 @@ class TachideskPageLoader(
it.source().use { source -> it.source().use { source ->
val decoder = bitmapDecoderFactory.create( val decoder = bitmapDecoderFactory.create(
ImageResult.OfSource( ImageResult.OfSource(
source, ImageSource(source),
DataSource.Engine, ImageSourceFrom.Disk,
), ),
Options(), Options(),
) )