From 4b702ea9eed062efb6b220913d568d4d719a629b Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Fri, 29 Jan 2016 17:25:30 -0800 Subject: #456 start of music folder admin --- .../daneren2005/dsub/domain/MusicFolder.java | 8 +++++ .../java/github/daneren2005/dsub/domain/User.java | 34 ++++++++++++++++++++-- 2 files changed, 40 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/github/daneren2005/dsub/domain') 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..12ca5909 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java @@ -30,6 +30,7 @@ public class MusicFolder implements Serializable { private String id; private String name; + private boolean enabled; public MusicFolder() { @@ -46,4 +47,11 @@ public class MusicFolder implements Serializable { public String getName() { return name; } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public boolean getEnabled() { + return enabled; + } } 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..8186453b 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 settings = new ArrayList(); + private List musicFolders; public User() { @@ -92,9 +95,20 @@ 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 List getMusicFolderSettings() { + return musicFolders; + } + public static class Setting implements Serializable { - String name; - Boolean value; + private String name; + private Boolean value; public Setting() { @@ -114,4 +128,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; + } + } } -- cgit v1.2.3