From a96e682e2b62f1522fb2b098db02979cf30d3b69 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Thu, 6 Jun 2019 22:34:26 +0530 Subject: [PATCH] Update playlist details --- app/src/main/assets/retro-changelog.html | 2 +- .../adapter/playlist/PlaylistAdapter.kt | 4 ++-- .../monkey/retromusic/model/Playlist.java | 22 ++++--------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 3e8ac7975..07c6c59f3 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

Artist images are not loading because last.fm changed policy for image downloading

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

We're really sorry for Announcing this Retro Music is driving towards pure Android Material Design guidelines we don't want any unnecessary UI elements that don't need for Music player.

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file 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 100cd9edf..9819269ac 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 @@ -66,7 +66,7 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL } protected fun getPlaylistText(playlist: Playlist): String { - return playlist.getInfoString(activity) + return MusicUtil.getPlaylistInfoString(activity, getSongs(playlist)) } override fun onBindViewHolder(holder: ViewHolder, position: Int) { @@ -158,7 +158,7 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL return songs } - private fun getSongs(playlist: Playlist): ArrayList? { + private fun getSongs(playlist: Playlist): ArrayList { val songs = ArrayList() if (playlist is AbsSmartPlaylist) { songs.addAll(playlist.getSongs(activity).blockingFirst()) diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java index 63fc3967b..49afccb25 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java @@ -18,12 +18,9 @@ import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; -import java.util.ArrayList; - -import code.name.monkey.retromusic.loaders.PlaylistSongsLoader; -import code.name.monkey.retromusic.util.MusicUtil; +import org.jetbrains.annotations.NotNull; /** * @author Karim Abou Zeid (kabouzeid) @@ -42,19 +39,6 @@ public class Playlist implements Parcelable { this.name = ""; } - @NonNull - public String getInfoString(@NonNull Context context) { - int songCount = getSongs(context).size(); - String songCountString = MusicUtil.getSongCountString(context, songCount); - return MusicUtil.buildInfoString(songCountString, ""); - } - - @NonNull - public ArrayList getSongs(Context context) { - // this default implementation covers static playlists - return PlaylistSongsLoader.INSTANCE.getPlaylistSongList(context, id).blockingFirst(); - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -108,4 +92,6 @@ public class Playlist implements Parcelable { return new Playlist[size]; } }; + + }