diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java index 48082d1cc..4d9d2124b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java +++ b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java @@ -16,8 +16,10 @@ package code.name.monkey.retromusic.glide; import android.content.Context; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import com.bumptech.glide.BitmapRequestBuilder; import com.bumptech.glide.DrawableRequestBuilder; @@ -29,6 +31,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.target.Target; +import code.name.monkey.appthemehelper.ThemeStore; +import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.retromusic.App; import code.name.monkey.retromusic.R; import code.name.monkey.retromusic.glide.artistimage.ArtistImage; @@ -65,15 +69,16 @@ public class ArtistGlideRequest { } public static class Builder { - final Artist artist; final RequestManager requestManager; + private Drawable error; private boolean forceDownload; private boolean noCustomImage; private Builder(@NonNull RequestManager requestManager, Artist artist) { this.requestManager = requestManager; this.artist = artist; + error = TintHelper.createTintedDrawable(ContextCompat.getDrawable(App.Companion.getContext(), R.drawable.default_artist_art), ThemeStore.Companion.accentColor(App.Companion.getContext())); } public static Builder from(@NonNull RequestManager requestManager, Artist artist) { @@ -89,6 +94,7 @@ public class ArtistGlideRequest { return createBaseRequest(requestManager, artist, noCustomImage, forceDownload) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .animate(DEFAULT_ANIMATION) + .error(DEFAULT_ERROR_IMAGE) .priority(Priority.LOW) .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) .dontTransform() diff --git a/app/src/main/res/drawable-hdpi/default_album_art.webp b/app/src/main/res/drawable-hdpi/default_album_art.webp index 744489568..ef3872a29 100644 Binary files a/app/src/main/res/drawable-hdpi/default_album_art.webp and b/app/src/main/res/drawable-hdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-hdpi/default_artist_art.webp b/app/src/main/res/drawable-hdpi/default_artist_art.webp index bb551b29e..176d3cf5c 100644 Binary files a/app/src/main/res/drawable-hdpi/default_artist_art.webp and b/app/src/main/res/drawable-hdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-hdpi/default_audio_art.webp b/app/src/main/res/drawable-hdpi/default_audio_art.webp index b5dc131ab..0f6e0a213 100644 Binary files a/app/src/main/res/drawable-hdpi/default_audio_art.webp and b/app/src/main/res/drawable-hdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-mdpi/default_album_art.webp b/app/src/main/res/drawable-mdpi/default_album_art.webp index 6ffd34f02..a6ce05dc2 100644 Binary files a/app/src/main/res/drawable-mdpi/default_album_art.webp and b/app/src/main/res/drawable-mdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-mdpi/default_artist_art.webp b/app/src/main/res/drawable-mdpi/default_artist_art.webp index c5e115d22..6428e9b37 100644 Binary files a/app/src/main/res/drawable-mdpi/default_artist_art.webp and b/app/src/main/res/drawable-mdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-mdpi/default_audio_art.webp b/app/src/main/res/drawable-mdpi/default_audio_art.webp index ad86e0e0c..7f22b4309 100644 Binary files a/app/src/main/res/drawable-mdpi/default_audio_art.webp and b/app/src/main/res/drawable-mdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-night-hdpi/default_album_art.webp b/app/src/main/res/drawable-night-hdpi/default_album_art.webp new file mode 100644 index 000000000..744489568 Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-night-hdpi/default_artist_art.webp b/app/src/main/res/drawable-night-hdpi/default_artist_art.webp new file mode 100644 index 000000000..bb551b29e Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-night-hdpi/default_audio_art.webp b/app/src/main/res/drawable-night-hdpi/default_audio_art.webp new file mode 100644 index 000000000..b5dc131ab Binary files /dev/null and b/app/src/main/res/drawable-night-hdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-night-mdpi/default_album_art.webp b/app/src/main/res/drawable-night-mdpi/default_album_art.webp new file mode 100644 index 000000000..6ffd34f02 Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-night-mdpi/default_artist_art.webp b/app/src/main/res/drawable-night-mdpi/default_artist_art.webp new file mode 100644 index 000000000..c5e115d22 Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-night-mdpi/default_audio_art.webp b/app/src/main/res/drawable-night-mdpi/default_audio_art.webp new file mode 100644 index 000000000..ad86e0e0c Binary files /dev/null and b/app/src/main/res/drawable-night-mdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-night-xhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xhdpi/default_album_art.webp new file mode 100644 index 000000000..0c50842cb Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp new file mode 100644 index 000000000..d519bac07 Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp new file mode 100644 index 000000000..7ee8cdc52 Binary files /dev/null and b/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp new file mode 100644 index 000000000..0b8fe94ac Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp new file mode 100644 index 000000000..ad8396ae7 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp new file mode 100644 index 000000000..4688f9dc3 Binary files /dev/null and b/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp new file mode 100644 index 000000000..c6e9b5a85 Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp new file mode 100644 index 000000000..1acef0849 Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp new file mode 100644 index 000000000..357baba58 Binary files /dev/null and b/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-xhdpi/default_album_art.webp b/app/src/main/res/drawable-xhdpi/default_album_art.webp index 0c50842cb..fc8e05c61 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_album_art.webp and b/app/src/main/res/drawable-xhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-xhdpi/default_artist_art.webp b/app/src/main/res/drawable-xhdpi/default_artist_art.webp index d519bac07..3522db793 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-xhdpi/default_audio_art.webp b/app/src/main/res/drawable-xhdpi/default_audio_art.webp index 7ee8cdc52..458590631 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_audio_art.webp and b/app/src/main/res/drawable-xhdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/default_album_art.webp b/app/src/main/res/drawable-xxhdpi/default_album_art.webp index 0b8fe94ac..d8e3a1333 100644 Binary files a/app/src/main/res/drawable-xxhdpi/default_album_art.webp and b/app/src/main/res/drawable-xxhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/default_artist_art.webp b/app/src/main/res/drawable-xxhdpi/default_artist_art.webp index ad8396ae7..946b95e2b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xxhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-xxhdpi/default_audio_art.webp b/app/src/main/res/drawable-xxhdpi/default_audio_art.webp index 4688f9dc3..c025db78f 100644 Binary files a/app/src/main/res/drawable-xxhdpi/default_audio_art.webp and b/app/src/main/res/drawable-xxhdpi/default_audio_art.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/default_album_art.webp b/app/src/main/res/drawable-xxxhdpi/default_album_art.webp index c6e9b5a85..9c2f5c51b 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/default_album_art.webp and b/app/src/main/res/drawable-xxxhdpi/default_album_art.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp b/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp index 1acef0849..c3a67b99f 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp differ diff --git a/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp b/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp index 357baba58..4398ea0f2 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp and b/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp differ