Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

upgrade glide to 4.16.0 (#4017) 

They added some nullability annotations to their Java code, which is
nice but requires some changes in our Kotlin code.
closes #3975
This commit is contained in:
Levi Bard 2023-09-12 09:52:05 +02:00 committed by GitHub
parent a525cab52b 42c033c5ae
commit 765ee605c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/FocusDialog.kt
View File

@ -49,12 +49,12 @@ fun <T> T.makeFocusDialog(
.load(previewUri)
.downsample(DownsampleStrategy.CENTER_INSIDE)
.listener(object : RequestListener<Drawable> {
override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target<Drawable?>?, p3: Boolean): Boolean {
override fun onLoadFailed(p0: GlideException?, p1: Any?, p2: Target<Drawable?>, p3: Boolean): Boolean {
return false
}
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable?>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
val width = resource!!.intrinsicWidth
override fun onResourceReady(resource: Drawable, model: Any, target: Target<Drawable?>?, dataSource: DataSource, isFirstResource: Boolean): Boolean {
val width = resource.intrinsicWidth
val height = resource.intrinsicHeight
dialogBinding.focusIndicator.setImageSize(width, height)

2
app/src/main/java/com/keylesspalace/tusky/fragment/ViewImageFragment.kt
View File

@ -306,7 +306,7 @@ class ViewImageFragment : ViewMediaFragment() {
override fun onLoadFailed(
e: GlideException?,
model: Any,
model: Any?,
target: Target<Drawable>,
isFirstResource: Boolean
): Boolean {

4
app/src/main/java/com/keylesspalace/tusky/view/MediaPreviewImageView.kt
View File

@ -96,11 +96,11 @@ open class MediaPreviewImageView
}
}
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean {
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>, isFirstResource: Boolean): Boolean {
return false
}
override fun onResourceReady(resource: Drawable?, model: Any?, target: Target<Drawable>?, dataSource: DataSource?, isFirstResource: Boolean): Boolean {
override fun onResourceReady(resource: Drawable, model: Any, target: Target<Drawable>?, dataSource: DataSource, isFirstResource: Boolean): Boolean {
recalculateMatrix(width, height, resource)
return false
}

2
gradle/libs.versions.toml
View File

@ -30,7 +30,7 @@ diffx = "1.1.1"
emoji2 = "1.3.0"
espresso = "3.5.1"
filemoji-compat = "3.2.7"
glide = "4.15.1"
glide = "4.16.0"
# Deliberate downgrade, https://github.com/tuskyapp/Tusky/issues/3631
glide-animation-plugin = "2.23.0"
gson = "2.10.1"