diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt index 3c93c0de2..5a7450708 100755 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt @@ -107,9 +107,7 @@ class PlaylistAdapter( holder.image?.setImageDrawable(getIconRes()) } else { Glide.with(activity) - .load( - PlaylistPreview(playlist) - ) + .load(PlaylistPreview(playlist)) .playlistOptions() .into(holder.image!!) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt index d7dbbef88..a4e2152d3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt @@ -76,7 +76,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli viewModel.getPlaylist().observe(viewLifecycleOwner) { playlistWithSongs -> playlist = playlistWithSongs Glide.with(this) - .load(PlaylistPreview(playlist)) + .load(PlaylistPreview(playlistWithSongs)) .playlistOptions() .into(binding.image) binding.title.text = playlist.playlistEntity.playlistName 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 47d1168ad..11439ace9 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 @@ -148,9 +148,9 @@ object RetroGlideExtension { .signature(createSignature(file)) } - fun RequestBuilder.playlistOptions( - ): RequestBuilder { - return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) + fun RequestBuilder.playlistOptions(): RequestBuilder { + return diskCacheStrategy(DiskCacheStrategy.AUTOMATIC) + .placeholder(getDrawable(DEFAULT_ALBUM_IMAGE)) .error(getDrawable(DEFAULT_ALBUM_IMAGE)) } diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt index b9257db62..7af7e0dae 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt @@ -11,21 +11,20 @@ class PlaylistPreview(val playlistWithSongs: PlaylistWithSongs) { val songs: List get() = playlistWithSongs.songs.toSongs() override fun equals(other: Any?): Boolean { - if (other is PlaylistPreview) { - if (other.playlistEntity.playListId != playlistEntity.playListId) { - return false - } - if (other.songs.size != songs.size) { - return false - } - return true - } - return false + println("Glide equals $this $other") + if (this === other) return true + if (javaClass != other?.javaClass) return false + + other as PlaylistPreview + if (other.playlistEntity.playListId != playlistEntity.playListId) return false + if (other.songs.size != songs.size) return false + return true } override fun hashCode(): Int { var result = playlistEntity.playListId.hashCode() result = 31 * result + playlistWithSongs.songs.size + println("Glide $result") return result } } \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt index 07a2ec4b1..5443b5825 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt +++ b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt @@ -17,7 +17,7 @@ class PlaylistPreviewFetcher(val context: Context, private val playlistPreview: val bitmap = AutoGeneratedPlaylistBitmap.getBitmap( context, - playlistPreview.songs.shuffled() + playlistPreview.songs ) callback.onDataReady(bitmap) } catch (e: Exception) {