Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hosted Weblate 2023-12-07 20:51:46 +00:00
commit cebdbd2199
No known key found for this signature in database
GPG key ID: A3FAAA06E6569B4C
3 changed files with 10 additions and 11 deletions

View file

@ -172,9 +172,9 @@ dependencies {
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
// Glide Module
ksp("com.github.bumptech.glide:ksp:4.15.1")
implementation("com.github.bumptech.glide:glide:4.15.1")
implementation("com.github.bumptech.glide:okhttp3-integration:4.15.1")
ksp("com.github.bumptech.glide:ksp:4.16.0")
implementation("com.github.bumptech.glide:glide:4.16.0")
implementation("com.github.bumptech.glide:okhttp3-integration:4.16.0")
// For KSP -> Official Annotation Processors are Not Yet Supported for KSP
ksp("dev.zacsweers.autoservice:auto-service-ksp:1.1.0")

View file

@ -30,7 +30,7 @@ class GlideModule : AppGlideModule() {
.signature(ObjectKey(System.currentTimeMillis().toShort()))
}.setDiskCache {
// Possible to make this a setting in the future.
val memoryCacheSizeBytes: Long = 1024 * 1024 * 100; // 100mb
val memoryCacheSizeBytes: Long = 1024 * 1024 * 100 // 100mb
InternalCacheDiskCacheFactory(context, memoryCacheSizeBytes).build()
}
}

View file

@ -316,15 +316,15 @@ object UIHelper {
if (colorCallback != null) {
builder = builder.listener(object : RequestListener<Drawable> {
@SuppressLint("CheckResult")
override fun onResourceReady(
resource: Drawable?,
model: Any?,
resource: Drawable,
model: Any,
target: Target<Drawable>?,
dataSource: DataSource?,
dataSource: DataSource,
isFirstResource: Boolean
): Boolean {
resource?.toBitmapOrNull()
resource.toBitmapOrNull()
?.let { bitmap ->
createPaletteAsync(
identifier,
@ -335,11 +335,10 @@ object UIHelper {
return false
}
@SuppressLint("CheckResult")
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<Drawable>?,
target: Target<Drawable>,
isFirstResource: Boolean
): Boolean {
return false