Add ability to star/rate albums in root folder

2 files changed, 24 insertions, 5 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
index f48dd2f9..56e8f92e 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
@@ -35,12 +35,12 @@ public class Artist implements Serializable {
     private String name;
     private String index;
 	private boolean starred;
+	private Integer rating;
 	private int closeness;
 
     public String getId() {
         return id;
     }
-
     public void setId(String id) {
         this.id = id;
     }
@@ -48,7 +48,6 @@ public class Artist implements Serializable {
     public String getName() {
         return name;
     }
-
     public void setName(String name) {
         this.name = name;
     }
@@ -56,7 +55,6 @@ public class Artist implements Serializable {
     public String getIndex() {
         return index;
     }
-
     public void setIndex(String index) {
         this.index = index;
     }
@@ -64,15 +62,24 @@ public class Artist implements Serializable {
 	public boolean isStarred() {
 		return starred;
 	}
-
 	public void setStarred(boolean starred) {
 		this.starred = starred;
 	}
+
+	public int getRating() {
+		return rating == null ? 0 : rating;
+	}
+	public void setRating(Integer rating) {
+		if(rating == null || rating == 0) {
+			this.rating = null;
+		} else {
+			this.rating = rating;
+		}
+	}
 	
 	public int getCloseness() {
 		return closeness;
 	}
-	
 	public void setCloseness(int closeness) {
 		this.closeness = closeness;
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
index 3a2b9834..42aa5288 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
@@ -197,6 +197,7 @@ public class MusicDirectory implements Serializable {
 		private Bookmark bookmark;
 		private int type = 0;
 		private int closeness;
+		private transient Artist linkedArtist;
 
 		public Entry() {
 
@@ -208,6 +209,9 @@ public class MusicDirectory implements Serializable {
 			this.id = artist.getId();
 			this.title = artist.getName();
 			this.directory = true;
+			this.starred = artist.isStarred();
+			this.rating = artist.getRating();
+			this.linkedArtist = artist;
 		}
 		
 		@TargetApi(Build.VERSION_CODES.GINGERBREAD_MR1)
@@ -469,6 +473,10 @@ public class MusicDirectory implements Serializable {
         
         public void setStarred(boolean starred) {
             this.starred = starred;
+
+			if(linkedArtist != null) {
+				linkedArtist.setStarred(starred);
+			}
         }
         
 		public int getRating() {
@@ -480,6 +488,10 @@ public class MusicDirectory implements Serializable {
 			} else {
 				this.rating = rating;
 			}
+
+			if(linkedArtist != null) {
+				linkedArtist.setRating(rating);
+			}
 		}
 		
 		public Bookmark getBookmark() {