diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt index 8cbc4be53..e5581b2e6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt +++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt @@ -3,6 +3,7 @@ package code.name.monkey.retromusic.extensions import android.content.Context import android.content.res.Configuration import android.widget.Toast +import androidx.annotation.DrawableRes import androidx.annotation.StringRes fun Context.showToast(@StringRes stringRes: Int, duration: Int = Toast.LENGTH_SHORT) { diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt index 16b18ea2b..71d42fc9f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt @@ -2,6 +2,8 @@ package code.name.monkey.retromusic.glide import android.content.Context import android.graphics.drawable.Drawable +import androidx.annotation.DrawableRes +import androidx.core.content.ContextCompat import code.name.monkey.appthemehelper.util.TintHelper import code.name.monkey.retromusic.App.Companion.getContext import code.name.monkey.retromusic.Constants.USER_BANNER @@ -107,8 +109,8 @@ object RetroGlideExtension { return baseRequestOptions .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST) .priority(Priority.LOW) - .error(DEFAULT_ARTIST_IMAGE) - .placeholder(DEFAULT_ARTIST_IMAGE) + .error(getDrawable(DEFAULT_ARTIST_IMAGE)) + .placeholder(getDrawable(DEFAULT_ARTIST_IMAGE)) .override(SIZE_ORIGINAL, SIZE_ORIGINAL) .signature(createSignature(artist)) } @@ -120,8 +122,8 @@ object RetroGlideExtension { song: Song ): BaseRequestOptions<*> { return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .error(DEFAULT_SONG_IMAGE) - .placeholder(DEFAULT_SONG_IMAGE) + .error(getDrawable(DEFAULT_SONG_IMAGE)) + .placeholder(getDrawable(DEFAULT_SONG_IMAGE)) .signature(createSignature(song)) } @@ -142,8 +144,8 @@ object RetroGlideExtension { song: Song ): BaseRequestOptions<*> { return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .error(DEFAULT_ALBUM_IMAGE) - .placeholder(DEFAULT_ALBUM_IMAGE) + .error(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE)) + .placeholder(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE)) .signature(createSignature(song)) } @@ -177,7 +179,7 @@ object RetroGlideExtension { baseRequestOptions: BaseRequestOptions<*> ): BaseRequestOptions<*> { return baseRequestOptions.diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .error(DEFAULT_ALBUM_IMAGE) + .error(getDrawable(DEFAULT_ALBUM_IMAGE)) } private fun createSignature(song: Song): Key { @@ -214,6 +216,10 @@ object RetroGlideExtension { fun getDefaultTransition(): GenericTransitionOptions { return GenericTransitionOptions().transition(DEFAULT_ANIMATION) } + + fun getDrawable(@DrawableRes id: Int): Drawable? { + return ContextCompat.getDrawable(getContext(), id) + } } // https://github.com/bumptech/glide/issues/527#issuecomment-148840717 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