Merge branch 'Admin'

4 files changed, 39 insertions, 0 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f6ee767f..deb8fdf5 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -8,6 +8,7 @@
 		<item>@string/button_bar.bookmarks</item>
 		<item>@string/button_bar.shares</item>
 		<item>@string/button_bar.chat</item>
+		<item>@string/button_bar.admin</item>
 		<item>@string/button_bar.downloading</item>
 		<item>@string/menu.settings</item>
 	</string-array>
@@ -20,6 +21,7 @@
 		<item>Bookmark</item>
 		<item>Share</item>
 		<item>Chat</item>
+		<item>Admin</item>
 		<item>Download</item>
 		<item>Settings</item>
 	</string-array>
@@ -32,6 +34,7 @@
 		<item>@drawable/ic_menu_bookmark_light</item>
 		<item>@drawable/ic_menu_share_light</item>
 		<item>@drawable/ic_menu_chat_light</item>
+		<item>@drawable/ic_menu_admin_light</item>
 		<item>@drawable/ic_menu_download_light</item>
 		<item>@drawable/ic_menu_settings_light</item>
 	</array>
@@ -44,6 +47,7 @@
 		<item>@drawable/ic_menu_bookmark_dark</item>
 		<item>@drawable/ic_menu_share_dark</item>
 		<item>@drawable/ic_menu_chat_dark</item>
+		<item>@drawable/ic_menu_admin_dark</item>
 		<item>@drawable/ic_menu_download_dark</item>
 		<item>@drawable/ic_menu_settings_dark</item>
 	</array>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index d025a48f..ac535487 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -21,5 +21,7 @@
 	<attr name="downloading" format="reference"/>
 	<attr name="bookmark" format="reference"/>
 	<attr name="share" format="reference"/>
+	<attr name="add_person" format="reference"/>
+	<attr name="password" format="reference"/>
 	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fd0efec4..e4e9d299 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -35,6 +35,7 @@
 	<string name="button_bar.bookmarks">Bookmarks</string>

 	<string name="button_bar.shares">Shares</string>

 	<string name="button_bar.chat">Chat</string>

+	<string name="button_bar.admin">Admin</string>

 	<string name="button_bar.downloading">Downloading</string>

 

     <string name="main.welcome_title">Welcome!</string>

@@ -99,6 +100,7 @@
 	<string name="menu.delete_cache">Delete Cache</string>

 	<string name="menu.cast">Cast To Device</string>

 	<string name="menu.faq">FAQ</string>

+	<string name="menu.add_user">Add User</string>

 

     <string name="playlist.label">Playlists</string>

 	<string name="playlist.update_info">Update Information</string>

@@ -414,6 +416,8 @@
 	<string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string>

 	<string name="settings.large_album_art">Large Album Art</string>

 	<string name="settings.large_album_art_summary">Display albums with large album art instead of in a list</string>

+	<string name="settings.admin_enabled">Admin Enabled</string>

+	<string name="settings.admin_enabled_summary">Whether or not to display the admin listing in the pull out drawer</string>

 

 	<string name="shuffle.title">Shuffle By</string>

 	<string name="shuffle.startYear">Start Year:</string>

@@ -441,6 +445,29 @@
 	<string name="share.via">Share via</string>

 	<string name="share.delete">Delete Share</string>

 

+	<string name="admin.add_user_username">Username:</string>

+	<string name="admin.add_user_email">Email:</string>

+	<string name="admin.add_user_password">Password:</string>

+	<string name="admin.create_user_success">Successfully created new user</string>

+	<string name="admin.create_user_error">Failed to create new user</string>

+	<string name="admin.change_username_invalid">Enter a valid username</string>

+	<string name="admin.update_permissions">Update Permissions</string>

+	<string name="admin.update_permissions_success">Successfully updated permission for %1$s</string>

+	<string name="admin.update_permissions_error">Failed to update permissions for %1$s</string>

+	<string name="admin.change_email">Change Email</string>

+	<string name="admin.change_email_success">Successfully changed email for %1$s</string>

+	<string name="admin.change_email_error">Failed to change email for %1$s</string>

+	<string name="admin.change_email_label">New Email:</string>

+	<string name="admin.change_email_invalid">Enter a valid email</string>

+	<string name="admin.change_password">Change Password</string>

+	<string name="admin.change_password_success">Successfully changed password for %1$s</string>

+	<string name="admin.change_password_error">Failed to change password for %1$s</string>

+	<string name="admin.change_password_label">New Password:</string>

+	<string name="admin.change_password_invalid">Enter a valid password</string>

+	<string name="admin.delete_user">Delete User</string>

+	<string name="admin.delete_user_success">Successfully deleted %1$s</string>

+	<string name="admin.delete_user_error">Failed to delete %1$s</string>

+

     <string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string>

 

     <string name="background_task.wait">Please wait...</string>

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 677ee4e1..6611cff7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -24,6 +24,8 @@
 		<item name="downloading">@drawable/downloading_light</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_light</item>
 		<item name="share">@drawable/ic_menu_share_light</item>
+		<item name="add_person">@drawable/ic_menu_add_person_light</item>
+		<item name="password">@drawable/ic_menu_password_light</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
@@ -53,6 +55,8 @@
 		<item name="downloading">@drawable/downloading_dark</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
 		<item name="share">@drawable/ic_menu_share_dark</item>
+		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
@@ -85,6 +89,8 @@
 		<item name="downloading">@drawable/downloading_dark</item>
 		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
 		<item name="share">@drawable/ic_menu_share_dark</item>
+		<item name="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>