Improved the artist loading mechanism.

app/src/main/java/com/kabouzeid/gramophone/model/Album.java

@@ -44,9 +44,13 @@ public class Album implements Parcelable {
         return safeGetFirstSong().dateModified;
     }
 
+    public int getSongCount() {
+        return songs.size();
+    }
+
     @NonNull
     public Song safeGetFirstSong() {
-        return songs.isEmpty() ? new Song() : songs.get(0);
+        return songs.isEmpty() ? Song.EMPTY_SONG : songs.get(0);
     }
 
     @Override

app/src/main/java/com/kabouzeid/gramophone/model/Artist.java

@@ -2,28 +2,55 @@ package com.kabouzeid.gramophone.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+import java.util.ArrayList;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class Artist implements Parcelable {
-    public final int id;
-    public final String name;
-    public final int albumCount;
-    public final int songCount;
+    public final ArrayList<Album> albums;
 
-    public Artist(final int id, final String name, final int albumCount, final int songCount) {
-        this.id = id;
-        this.name = name;
-        this.songCount = songCount;
-        this.albumCount = albumCount;
+    public Artist(ArrayList<Album> albums) {
+        this.albums = albums;
     }
 
     public Artist() {
-        id = -1;
-        name = "";
-        songCount = -1;
-        albumCount = -1;
+        this.albums = new ArrayList<>();
+    }
+
+    public int getId() {
+        return safeGetFirstAlbum().getArtistId();
+    }
+
+    public String getName() {
+        return safeGetFirstAlbum().getArtistName();
+    }
+
+    public int getSongCount() {
+        int songCount = 0;
+        for (Album album : albums) {
+            songCount += album.getSongCount();
+        }
+        return songCount;
+    }
+
+    public int getAlbumCount() {
+        return albums.size();
+    }
+
+    public ArrayList<Song> getSongs() {
+        ArrayList<Song> songs = new ArrayList<>();
+        for (Album album : albums) {
+            songs.addAll(album.songs);
+        }
+        return songs;
+    }
+
+    @NonNull
+    public Album safeGetFirstAlbum() {
+        return albums.isEmpty() ? new Album() : albums.get(0);
     }
 
     @Override
@@ -33,29 +60,19 @@ public class Artist implements Parcelable {
 
         Artist artist = (Artist) o;
 
-        if (id != artist.id) return false;
-        if (albumCount != artist.albumCount) return false;
-        if (songCount != artist.songCount) return false;
-        return name != null ? name.equals(artist.name) : artist.name == null;
+        return albums != null ? albums.equals(artist.albums) : artist.albums == null;
 
     }
 
     @Override
     public int hashCode() {
-        int result = id;
-        result = 31 * result + (name != null ? name.hashCode() : 0);
-        result = 31 * result + albumCount;
-        result = 31 * result + songCount;
-        return result;
+        return albums != null ? albums.hashCode() : 0;
     }
 
     @Override
     public String toString() {
         return "Artist{" +
-                "id=" + id +
-                ", name='" + name + '\'' +
-                ", albumCount=" + albumCount +
-                ", songCount=" + songCount +
+                "albums=" + albums +
                 '}';
     }
 
@@ -67,24 +84,20 @@ public class Artist implements Parcelable {
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(this.id);
-        dest.writeString(this.name);
-        dest.writeInt(this.albumCount);
-        dest.writeInt(this.songCount);
+        dest.writeTypedList(this.albums);
     }
 
     protected Artist(Parcel in) {
-        this.id = in.readInt();
-        this.name = in.readString();
-        this.albumCount = in.readInt();
-        this.songCount = in.readInt();
+        this.albums = in.createTypedArrayList(Album.CREATOR);
     }
 
     public static final Parcelable.Creator<Artist> CREATOR = new Parcelable.Creator<Artist>() {
+        @Override
         public Artist createFromParcel(Parcel source) {
             return new Artist(source);
         }
 
+        @Override
         public Artist[] newArray(int size) {
             return new Artist[size];
         }

app/src/main/java/com/kabouzeid/gramophone/model/PlaylistSong.java

@@ -3,6 +3,7 @@ package com.kabouzeid.gramophone.model;
 import android.os.Parcel;
 
 public class PlaylistSong extends Song {
+    public static final PlaylistSong EMPTY_PLAYLIST_SONG = new PlaylistSong(-1, "", -1, -1, -1, "", -1, -1, "", -1, "", -1, -1);
 
     public final int playlistId;
     public final int idInPlayList;
@@ -13,12 +14,6 @@ public class PlaylistSong extends Song {
         this.idInPlayList = idInPlayList;
     }
 
-    public PlaylistSong() {
-        super();
-        playlistId = -1;
-        idInPlayList = -1;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

app/src/main/java/com/kabouzeid/gramophone/model/Song.java

@@ -7,6 +7,8 @@ import android.os.Parcelable;
  * @author Karim Abou Zeid (kabouzeid)
  */
 public class Song implements Parcelable {
+    public static final Song EMPTY_SONG = new Song(-1, "", -1, -1, -1, "", -1, -1, "", -1, "");
+
     public final int id;
     public final String title;
     public final int trackNumber;
@@ -33,20 +35,6 @@ public class Song implements Parcelable {
         this.artistName = artistName;
     }
 
-    public Song() {
-        this.id = -1;
-        this.title = "";
-        this.trackNumber = -1;
-        this.year = -1;
-        this.duration = -1;
-        this.data = "";
-        this.dateModified = -1;
-        this.albumId = -1;
-        this.albumName = "";
-        this.artistId = -1;
-        this.artistName = "";
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;