Merge branch 'music-folders'

2 files changed, 83 insertions, 15 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java b/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java
index 99e86e23..37f76249 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java
@@ -18,7 +18,12 @@
  */
 package github.daneren2005.dsub.domain;
 
+import android.util.Log;
+
 import java.io.Serializable;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Represents a top level directory in which music or other media is stored.
@@ -27,23 +32,49 @@ import java.io.Serializable;
  * @version $Id$
  */
 public class MusicFolder implements Serializable {
-
-    private String id;
-    private String name;
+	private static final String TAG = MusicFolder.class.getSimpleName();
+	private String id;
+	private String name;
+	private boolean enabled;
 
 	public MusicFolder() {
 
 	}
-    public MusicFolder(String id, String name) {
-        this.id = id;
-        this.name = name;
-    }
+	public MusicFolder(String id, String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+	public boolean getEnabled() {
+		return enabled;
+	}
 
-    public String getId() {
-        return id;
-    }
+	public static class MusicFolderComparator implements Comparator<MusicFolder> {
+		public int compare(MusicFolder lhsMusicFolder, MusicFolder rhsMusicFolder) {
+			if(lhsMusicFolder == rhsMusicFolder || lhsMusicFolder.getName().equals(rhsMusicFolder.getName())) {
+				return 0;
+			} else {
+				return lhsMusicFolder.getName().compareToIgnoreCase(rhsMusicFolder.getName());
+			}
+		}
+	}
 
-    public String getName() {
-        return name;
-    }
+	public static void sort(List<MusicFolder> musicFolders) {
+		try {
+			Collections.sort(musicFolders, new MusicFolderComparator());
+		} catch (Exception e) {
+			Log.w(TAG, "Failed to sort music folders", e);
+		}
+	}
 }
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/User.java b/app/src/main/java/github/daneren2005/dsub/domain/User.java
index 797a1271..b5ee6188 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/User.java
+++ b/app/src/main/java/github/daneren2005/dsub/domain/User.java
@@ -15,6 +15,8 @@
 
 package github.daneren2005.dsub.domain;
 
+import android.util.Pair;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -52,6 +54,7 @@ public class User implements Serializable {
 	private String email;
 
 	private List<Setting> settings = new ArrayList<Setting>();
+	private List<Setting> musicFolders;
 
 	public User() {
 
@@ -92,9 +95,27 @@ public class User implements Serializable {
 		settings.add(new Setting(name, value));
 	}
 
+	public void addMusicFolder(MusicFolder musicFolder) {
+		if(musicFolders == null) {
+			musicFolders = new ArrayList<>();
+		}
+
+		musicFolders.add(new MusicFolderSetting(musicFolder.getId(), musicFolder.getName(), false));
+	}
+	public void addMusicFolder(MusicFolderSetting musicFolderSetting, boolean defaultValue) {
+		if(musicFolders == null) {
+			musicFolders = new ArrayList<>();
+		}
+
+		musicFolders.add(new MusicFolderSetting(musicFolderSetting.getName(), musicFolderSetting.getLabel(), defaultValue));
+	}
+	public List<Setting> getMusicFolderSettings() {
+		return musicFolders;
+	}
+
 	public static class Setting implements Serializable {
-		String name;
-		Boolean value;
+		private String name;
+		private Boolean value;
 
 		public Setting() {
 			
@@ -114,4 +135,20 @@ public class User implements Serializable {
 			this.value = value;
 		}
 	}
+
+	public static class MusicFolderSetting extends Setting {
+		private String label;
+
+		public MusicFolderSetting() {
+
+		}
+		public MusicFolderSetting(String name, String label, Boolean value) {
+			super(name, value);
+			this.label = label;
+		}
+
+		public String getLabel() {
+			return label;
+		}
+	}
 }