Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

update Glide to 4.15.0 (#3384)

This commit is contained in:
Konrad Pozniak 2023-02-27 08:54:26 +01:00 committed by GitHub
parent b3f173b2b0
commit 9340e7a6f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -599,7 +599,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter<RecyclerView.View
if (statusDisplayOptions.showBotOverlay() && isBot) {
notificationAvatar.setVisibility(View.VISIBLE);
Glide.with(notificationAvatar)
.load(ContextCompat.getDrawable(notificationAvatar.getContext(), R.drawable.bot_badge))
.load(R.drawable.bot_badge)
.into(notificationAvatar);
} else {

5
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -283,8 +283,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
if (statusDisplayOptions.showBotOverlay() && isBot) {
avatarInset.setVisibility(View.VISIBLE);
Glide.with(avatarInset)
// passing the drawable id directly into .load() ignores night mode https://github.com/bumptech/glide/issues/4692
.load(ContextCompat.getDrawable(avatarInset.getContext(), R.drawable.bot_badge))
.load(R.drawable.bot_badge)
.into(avatarInset);
} else {
avatarInset.setVisibility(View.GONE);
@ -1115,7 +1114,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
cardImage.setScaleType(ImageView.ScaleType.CENTER);
Glide.with(cardImage.getContext())
.load(ContextCompat.getDrawable(cardImage.getContext(), R.drawable.card_image_placeholder))
.load(R.drawable.card_image_placeholder)
.into(cardImage);
}

2
gradle/libs.versions.toml
View File

@ -27,7 +27,7 @@ dagger = "2.45"
emoji2 = "1.2.0"
espresso = "3.5.1"
filemoji-compat = "3.2.7"
glide = "4.13.2"
glide = "4.15.0"
glide-animation-plugin = "2.24.0"
gson = "2.10.1"
kotlin = "1.8.10"