chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

update Glide to 4.15.0 (#3384)

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

2
gradle/libs.versions.toml
View file

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