tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display <unknown> Artist as Unknown Artist

Browse source
This commit is contained in:
Karim Abou Zeid 2018-05-18 14:11:29 +02:00
commit b33a1e65d1
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/kabouzeid/gramophone/model/Artist.java
View file

@ -4,12 +4,16 @@ import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.kabouzeid.gramophone.util.MusicUtil;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
* @author Karim Abou Zeid (kabouzeid) * @author Karim Abou Zeid (kabouzeid)
*/ */
public class Artist implements Parcelable { public class Artist implements Parcelable {
public static final String UNKNOWN_ARTIST_DISPLAY_NAME = "Unknown Artist";
public final ArrayList<Album> albums; public final ArrayList<Album> albums;
public Artist(ArrayList<Album> albums) { public Artist(ArrayList<Album> albums) {
@ -25,7 +29,11 @@ public class Artist implements Parcelable {
} }
public String getName() { public String getName() {
return safeGetFirstAlbum().getArtistName(); String name = safeGetFirstAlbum().getArtistName();
if (MusicUtil.isArtistNameUnknown(name)) {
return UNKNOWN_ARTIST_DISPLAY_NAME;
}
return name;
} }
public int getSongCount() { public int getSongCount() {

1
app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java
View file

@ -289,6 +289,7 @@ public class MusicUtil {
public static boolean isArtistNameUnknown(@Nullable String artistName) { public static boolean isArtistNameUnknown(@Nullable String artistName) {
if (TextUtils.isEmpty(artistName)) return false; if (TextUtils.isEmpty(artistName)) return false;
if (artistName.equals(Artist.UNKNOWN_ARTIST_DISPLAY_NAME)) return true;
artistName = artistName.trim().toLowerCase(); artistName = artistName.trim().toLowerCase();
return artistName.equals("unknown") || artistName.equals("<unknown>"); return artistName.equals("unknown") || artistName.equals("<unknown>");
} }