Skip to content

Commit 9815e51

Browse files
committed
Don't use Glide to load drawable resources
Loading drawables using Glide while the size of the ImageView is not known yet appears to result in a blurry mess.
1 parent f9f37d3 commit 9815e51

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

app/src/main/java/com/beemdevelopment/aegis/ui/glide/GlideHelper.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
import android.os.Build;
55
import android.widget.ImageView;
66

7-
import androidx.annotation.DrawableRes;
87
import androidx.annotation.NonNull;
98
import androidx.annotation.Nullable;
10-
import androidx.annotation.RawRes;
119

1210
import com.amulyakhare.textdrawable.TextDrawable;
1311
import com.beemdevelopment.aegis.helpers.TextDrawableHelper;
@@ -38,21 +36,6 @@ public static void loadIcon(RequestManager rm, IconPack.Icon icon, ImageView tar
3836
loadIconFile(rm, icon.getFile(), icon.getIconType(), targetView);
3937
}
4038

41-
public static void loadResource(RequestManager rm, @RawRes @DrawableRes @Nullable Integer resourceId, ImageView targetView) {
42-
loadResource(rm, resourceId, null, targetView);
43-
}
44-
45-
public static void loadResource(RequestManager rm, @RawRes @DrawableRes @Nullable Integer resourceId, @Nullable Integer tint, ImageView targetView) {
46-
setCommonOptions(rm.load(resourceId), null)
47-
.listener(new ViewReadyListener<>(view -> {
48-
if (tint != null) {
49-
view.setColorFilter(tint);
50-
}
51-
setLayerType(targetView, IconType.INVALID);
52-
}))
53-
.into(targetView);
54-
}
55-
5639
public static void loadEntryIcon(RequestManager rm, VaultEntry entry, ImageView targetView) {
5740
if (entry.hasIcon()) {
5841
setCommonOptions(rm.load(entry.getIcon()), entry.getIcon().getType()).into(targetView);

app/src/main/java/com/beemdevelopment/aegis/ui/views/AssignIconHolder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ private void setNewIcon() {
4747
if (_entry.getNewIcon() != null) {
4848
GlideHelper.loadIcon(Glide.with(_view.getContext()), _entry.getNewIcon(), _newIcon);
4949
} else {
50-
GlideHelper.loadResource(Glide.with(_view.getContext()), R.drawable.ic_unselected, _newIcon);
50+
Glide.with(_view.getContext()).clear(_newIcon);
51+
_newIcon.setImageResource(R.drawable.ic_unselected);
5152
}
5253

5354
_btnReset.setVisibility(_entry.getNewIcon() != null ? View.VISIBLE : View.INVISIBLE);

app/src/main/java/com/beemdevelopment/aegis/ui/views/IconHolder.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ public void setData(IconPack.Icon icon) {
3939

4040
public void loadIcon(Context context) {
4141
if (_isCustom) {
42+
Glide.with(context).clear(_imageView);
4243
int tint = MaterialColors.getColor(itemView, com.google.android.material.R.attr.colorOnSurfaceVariant);
43-
GlideHelper.loadResource(Glide.with(context), R.drawable.ic_outline_add_24, tint, _imageView);
44+
_imageView.setColorFilter(tint);
45+
_imageView.setImageResource(R.drawable.ic_outline_add_24);
4446
} else {
4547
GlideHelper.loadIconFile(Glide.with(context), _iconFile, _iconType, _imageView);
4648
}

0 commit comments

Comments
 (0)