#493 Switch from ListView to NavigationView + move server selection logic into drawer

3 files changed, 34 insertions, 41 deletions

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 37b15d12..d876ecdb 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,18 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string-array name="drawerItems">
-		<item>@string/button_bar.home</item>
-		<item>@string/button_bar.browse</item>
-		<item>@string/button_bar.playlists</item>
-		<item>@string/button_bar.podcasts</item>
-		<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>
-
 	<string-array name="drawerItemsDescriptions">
 		<item>Home</item>
 		<item>Artist</item>
@@ -46,32 +33,6 @@
 		<item>Chat</item>
 	</string-array>
 
-	<array name="drawerItemIconsLight">
-		<item>@drawable/main_offline_light</item>
-		<item>@drawable/ic_menu_library_light</item>
-		<item>@drawable/ic_menu_playlist_light</item>
-		<item>@drawable/ic_menu_podcast_light</item>
-		<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>
-
-	<array name="drawerItemIconsDark">
-		<item>@drawable/main_offline_dark</item>
-		<item>@drawable/ic_menu_library_dark</item>
-		<item>@drawable/ic_menu_playlist_dark</item>
-		<item>@drawable/ic_menu_podcast_dark</item>
-		<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>
-
     <string-array name="themeValues">
         <item>light</item>
         <item>dark</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 9667117c..3db670e6 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -27,6 +27,16 @@
 	<attr name="rating_good" format="reference"/>
 	<attr name="radio" format="reference"/>
 	<attr name="drawerItemsIcons" format="reference"/>
+	<attr name="drawerHome" format="reference"/>
+	<attr name="drawerLibrary" format="reference"/>
+	<attr name="drawerPlaylists" format="reference"/>
+	<attr name="drawerPodcasts" format="reference"/>
+	<attr name="drawerBookmarks" format="reference"/>
+	<attr name="drawerShares" format="reference"/>
+	<attr name="drawerChat" format="reference"/>
+	<attr name="drawerAdmin" format="reference"/>
+	<attr name="drawerDownloading" format="reference"/>
+	<attr name="drawerSettings" format="reference"/>
 
 	<declare-styleable name="SeekBarPreference">
 		<attr name="min" format="integer"/>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 50d2d171..27082530 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -29,10 +29,21 @@
 		<item name="rating_bad">@drawable/ic_action_rating_bad_light</item>
 		<item name="rating_good">@drawable/ic_action_rating_good_light</item>
 		<item name="radio">@drawable/ic_menu_radio_light</item>
-		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
+		<item name="drawerHome">@drawable/main_offline_light</item>
+		<item name="drawerLibrary">@drawable/ic_menu_library_light</item>
+		<item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item>
+		<item name="drawerPodcasts">@drawable/ic_menu_podcast_light</item>
+		<item name="drawerBookmarks">@drawable/ic_menu_bookmark_light</item>
+		<item name="drawerShares">@drawable/ic_menu_share_light</item>
+		<item name="drawerChat">@drawable/ic_menu_chat_light</item>
+		<item name="drawerAdmin">@drawable/ic_menu_admin_light</item>
+		<item name="drawerDownloading">@drawable/ic_menu_download_light</item>
+		<item name="drawerSettings">@drawable/ic_menu_settings_light</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
 		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="colorPrimary">@color/cyan</item>
+		<item name="colorPrimaryDark">@color/cyan</item>
 		<item name="colorAccent">@color/cyan</item>
 	</style>
 	<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
@@ -64,10 +75,21 @@
 		<item name="rating_bad">@drawable/ic_action_rating_bad_dark</item>
 		<item name="rating_good">@drawable/ic_action_rating_good_dark</item>
 		<item name="radio">@drawable/ic_menu_radio_dark</item>
-		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
+		<item name="drawerHome">@drawable/main_offline_dark</item>
+		<item name="drawerLibrary">@drawable/ic_menu_library_dark</item>
+		<item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item>
+		<item name="drawerPodcasts">@drawable/ic_menu_podcast_dark</item>
+		<item name="drawerBookmarks">@drawable/ic_menu_bookmark_dark</item>
+		<item name="drawerShares">@drawable/ic_menu_share_dark</item>
+		<item name="drawerChat">@drawable/ic_menu_chat_dark</item>
+		<item name="drawerAdmin">@drawable/ic_menu_admin_dark</item>
+		<item name="drawerDownloading">@drawable/ic_menu_download_dark</item>
+		<item name="drawerSettings">@drawable/ic_menu_settings_dark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
 		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="colorPrimary">@color/cyan</item>
+		<item name="colorPrimaryDark">@color/cyan</item>
 		<item name="colorAccent">@color/cyan</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">