From b33a1e65d1c13d6faef1051c85abd7272f8acfc4 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 18 May 2018 14:11:29 +0200 Subject: [PATCH] Display Artist as Unknown Artist --- .../java/com/kabouzeid/gramophone/model/Artist.java | 10 +++++++++- .../java/com/kabouzeid/gramophone/util/MusicUtil.java | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java index 3844dc56..f53d2d1a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/model/Artist.java @@ -4,12 +4,16 @@ import android.os.Parcel; import android.os.Parcelable; import android.support.annotation.NonNull; +import com.kabouzeid.gramophone.util.MusicUtil; + import java.util.ArrayList; /** * @author Karim Abou Zeid (kabouzeid) */ public class Artist implements Parcelable { + public static final String UNKNOWN_ARTIST_DISPLAY_NAME = "Unknown Artist"; + public final ArrayList albums; public Artist(ArrayList albums) { @@ -25,7 +29,11 @@ public class Artist implements Parcelable { } public String getName() { - return safeGetFirstAlbum().getArtistName(); + String name = safeGetFirstAlbum().getArtistName(); + if (MusicUtil.isArtistNameUnknown(name)) { + return UNKNOWN_ARTIST_DISPLAY_NAME; + } + return name; } public int getSongCount() { diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java index 03fc90e1..23ddd8b0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java @@ -289,6 +289,7 @@ public class MusicUtil { public static boolean isArtistNameUnknown(@Nullable String artistName) { if (TextUtils.isEmpty(artistName)) return false; + if (artistName.equals(Artist.UNKNOWN_ARTIST_DISPLAY_NAME)) return true; artistName = artistName.trim().toLowerCase(); return artistName.equals("unknown") || artistName.equals(""); }