From 4d58ecb4ea0709078e644c06903afa20f43e1bde Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Wed, 8 May 2019 21:42:22 +0200 Subject: [PATCH] stop buggy gif animation for now --- .../main/java/com/keylesspalace/tusky/MainActivity.java | 7 ++++++- .../keylesspalace/tusky/adapter/AccountSelectionAdapter.kt | 1 + .../com/keylesspalace/tusky/adapter/AccountViewHolder.java | 1 + .../com/keylesspalace/tusky/adapter/BlocksAdapter.java | 1 + .../tusky/adapter/ComposeAutoCompleteAdapter.java | 1 + .../keylesspalace/tusky/adapter/FollowRequestsAdapter.java | 1 + .../java/com/keylesspalace/tusky/adapter/MutesAdapter.java | 1 + .../keylesspalace/tusky/adapter/NotificationsAdapter.java | 1 + .../keylesspalace/tusky/adapter/StatusBaseViewHolder.java | 2 ++ 9 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java index c515a219..a6bb4895 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java @@ -333,7 +333,11 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut DrawerImageLoader.init(new AbstractDrawerImageLoader() { @Override public void set(ImageView imageView, Uri uri, Drawable placeholder, String tag) { - Glide.with(MainActivity.this).load(uri).placeholder(placeholder).into(imageView); + Glide.with(MainActivity.this) + .asBitmap() + .load(uri) + .placeholder(placeholder) + .into(imageView); } @Override @@ -530,6 +534,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut ImageView background = headerResult.getHeaderBackgroundView(); Glide.with(MainActivity.this) + .asBitmap() .load(me.getHeader()) .into(background); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountSelectionAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountSelectionAdapter.kt index 9c3d8f72..d7d8ba85 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountSelectionAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountSelectionAdapter.kt @@ -47,6 +47,7 @@ class AccountSelectionAdapter(context: Context): ArrayAdapter(con displayName.text = CustomEmojiHelper.emojifyString(account.displayName, account.emojis, displayName) if (!TextUtils.isEmpty(account.profilePictureUrl)) { Glide.with(avatar) + .asBitmap() .load(account.profilePictureUrl) .placeholder(R.drawable.avatar_default) .into(avatar) diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java index 19dfc638..87e4fc66 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java @@ -39,6 +39,7 @@ class AccountViewHolder extends RecyclerView.ViewHolder { CharSequence emojifiedName = CustomEmojiHelper.emojifyString(account.getName(), account.getEmojis(), displayName); displayName.setText(emojifiedName); Glide.with(avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java index 0fa288fb..78acabf9 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java @@ -86,6 +86,7 @@ public class BlocksAdapter extends AccountAdapter { String formattedUsername = String.format(format, account.getUsername()); username.setText(formattedUsername); Glide.with(avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/ComposeAutoCompleteAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/ComposeAutoCompleteAdapter.java index fb24195a..db433ce7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/ComposeAutoCompleteAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/ComposeAutoCompleteAdapter.java @@ -148,6 +148,7 @@ public class ComposeAutoCompleteAdapter extends BaseAdapter accountViewHolder.displayName.setText(emojifiedName); if (!account.getAvatar().isEmpty()) { Glide.with(accountViewHolder.avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(accountViewHolder.avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java index 8cb5b729..fe0cd952 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java @@ -88,6 +88,7 @@ public class FollowRequestsAdapter extends AccountAdapter { String formattedUsername = String.format(format, account.getUsername()); username.setText(formattedUsername); Glide.with(avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java index 49c235e6..d5dd98a3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java @@ -72,6 +72,7 @@ public class MutesAdapter extends AccountAdapter { String formattedUsername = String.format(format, account.getUsername()); username.setText(formattedUsername); Glide.with(avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java index 8e95ebf6..1029784a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java @@ -317,6 +317,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter { avatar.setImageResource(R.drawable.avatar_default); } else { Glide.with(avatar) + .asBitmap() .load(account.getAvatar()) .placeholder(R.drawable.avatar_default) .into(avatar); diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java index 3cf97b6e..f2d8087d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java @@ -241,6 +241,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { avatarInset.setVisibility(View.VISIBLE); avatarInset.setBackground(null); Glide.with(avatarInset) + .asBitmap() .load(rebloggedUrl) .placeholder(R.drawable.avatar_default) .into(avatarInset); @@ -250,6 +251,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { avatar.setImageResource(R.drawable.avatar_default); } else { Glide.with(avatar) + .asBitmap() .load(url) .placeholder(R.drawable.avatar_default) .into(avatar);