Merge branch 'NavigationView' into SlideUpPanel2

15 files changed, 202 insertions, 281 deletions

diff --git a/app/src/main/res/layout/abstract_activity.xml b/app/src/main/res/layout/abstract_activity.xml
index be65e437..56db1439 100644
--- a/app/src/main/res/layout/abstract_activity.xml
+++ b/app/src/main/res/layout/abstract_activity.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/drawer_layout"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	android:fitsSystemWindows="true">
+
 	<!-- The main content view -->
 	<FrameLayout
 		android:id="@+id/content_frame"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
+
 	<!-- The navigation drawer -->
-	<ListView android:id="@+id/left_drawer"
-			  android:layout_width="240dp"
-			  android:layout_height="match_parent"
-			  android:layout_gravity="start"
-			  android:choiceMode="singleChoice"
-			  android:divider="@android:color/transparent"
-			  android:dividerHeight="0dp"
-			  android:background="?android:windowBackground"/>
+	<android.support.design.widget.NavigationView
+		android:id="@+id/left_drawer"
+		android:layout_width="wrap_content"
+		android:layout_height="match_parent"
+		android:layout_gravity="start"/>
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 29fbc3b1..74a94111 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -15,9 +15,10 @@
 
 		<android.support.v7.widget.Toolbar
 			android:id="@+id/main_toolbar"
-			style="?attr/actionBarStyle"
 			android:layout_height="?attr/actionBarSize"
-			android:layout_width="match_parent"/>
+			android:layout_width="match_parent"
+			android:background="?attr/colorPrimary"
+			android:elevation="4dp"/>
 
 		<include layout="@layout/abstract_fragment_container"/>
 	</FrameLayout>
@@ -30,13 +31,14 @@
 		<FrameLayout
 			android:id="@+id/slide_up_swipe_target"
 			android:layout_width="match_parent"
-			android:layout_height="wrap_content">
+			android:layout_height="wrap_content"
+			android:background="?attr/colorPrimary">
 
 			<android.support.v7.widget.Toolbar
 				android:id="@+id/now_playing_toolbar"
-				style="?attr/actionBarStyle"
 				android:layout_height="?attr/actionBarSize"
 				android:layout_width="match_parent"
+				android:elevation="4dp"
 				android:visibility="gone"/>
 
 			<LinearLayout
@@ -44,7 +46,8 @@
 				android:layout_width="fill_parent"
 				android:layout_height="wrap_content"
 				style="@style/BasicButton"
-				android:orientation="horizontal">
+				android:orientation="horizontal"
+				android:elevation="4dp">
 
 				<github.daneren2005.dsub.view.RecyclingImageView
 					android:id="@+id/album_art"
diff --git a/app/src/main/res/layout/album_list_header.xml b/app/src/main/res/layout/album_list_header.xml
new file mode 100644
index 00000000..58af3353
--- /dev/null
+++ b/app/src/main/res/layout/album_list_header.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal">
+
+	<TextView
+		android:id="@+id/item_name"
+		android:layout_width="0dp"
+		android:layout_weight="1"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:background="@android:color/transparent"
+		android:textColor="@color/cyan"
+		android:textStyle="bold"
+		android:paddingLeft="6dp"
+		android:paddingRight="6dp"
+		android:paddingTop="8dp"
+		android:paddingBottom="8dp"/>
+
+	<CheckBox
+		android:id="@+id/item_checkbox"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="@string/main.albums_per_folder"
+		android:layout_marginRight="6dp"
+		android:layout_gravity="right"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index 67c052eb..c43e52a8 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -3,7 +3,8 @@
 			  android:id="@id/drag_handle"
 			  android:orientation="horizontal"
 			  android:layout_width="fill_parent"
-			  android:layout_height="wrap_content">
+			  android:layout_height="wrap_content"
+			  android:background="?attr/selectableItemBackground">
 
 	<RelativeLayout
 		android:layout_width="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/layout/basic_count_item.xml b/app/src/main/res/layout/basic_count_item.xml
index 08d276db..7f71c5a6 100644
--- a/app/src/main/res/layout/basic_count_item.xml
+++ b/app/src/main/res/layout/basic_count_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content"
-	android:background="@android:color/transparent"
+	android:background="?attr/selectableItemBackground"
 	android:minHeight="50dip">
 
 	<TextView
diff --git a/app/src/main/res/layout/download_activity.xml b/app/src/main/res/layout/download_activity.xml
deleted file mode 100644
index 017e4013..00000000
--- a/app/src/main/res/layout/download_activity.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 00441b73..fe0a9f2d 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -3,34 +3,54 @@
 	android:layout_width="match_parent"
 	android:layout_height="178dp"
 	android:orientation="vertical"
-	android:weightSum="1">
+	android:weightSum="1"
+	android:background="?attr/selectableItemBackground">
 
 	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="56dp"
-		android:orientation="vertical"
+		android:orientation="horizontal"
 		android:layout_alignParentBottom="true"
 		android:layout_alignParentLeft="true"
 		android:layout_alignParentStart="true">
 
-		<TextView
-			android:id="@+id/header_server_name"
+		<LinearLayout
+			android:orientation="vertical"
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:textColor="?android:textColorPrimary"
-			android:textSize="14sp"
-			android:textStyle="bold"/>
+			android:layout_height="wrap_content">
+
+			<TextView
+				android:id="@+id/header_server_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="16dp"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="14sp"
+				android:textStyle="bold"/>
+
+			<TextView
+				android:id="@+id/header_user_name"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginLeft="16dp"
+				android:layout_marginTop="5dp"
+				android:textColor="?android:textColorSecondary"
+				android:textSize="14sp"
+				android:textStyle="normal"/>
+		</LinearLayout>
+
+		<View
+			android:layout_width="0dp"
+			android:layout_height="0dp"
+			android:layout_weight="1"/>
 
-		<TextView
-			android:id="@+id/header_user_name"
+		<ImageView
+			android:id="@+id/header_select_image"
+			android:src="?attr/select_server"
+			android:layout_gravity="center_vertical"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_marginLeft="16dp"
-			android:layout_marginTop="5dp"
-			android:textColor="?android:textColorSecondary"
-			android:textSize="14sp"
-			android:textStyle="normal"/>
+			android:paddingRight="20dp"/>
 	</LinearLayout>
 
 	<de.hdodenhof.circleimageview.CircleImageView
diff --git a/app/src/main/res/layout/drawer_list_item.xml b/app/src/main/res/layout/drawer_list_item.xml
deleted file mode 100644
index 607b3658..00000000
--- a/app/src/main/res/layout/drawer_list_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:paddingTop="8dip"
-	android:paddingBottom="9dip">
-
-	<ImageView
-		android:id="@+id/drawer_icon"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="left|center_vertical"
-		android:paddingTop="1dip"
-		android:paddingBottom="1dip"
-		android:paddingRight="8dip"
-		android:paddingLeft="10dip"/>
-
-	<TextView
-		android:id="@+id/drawer_name"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:singleLine="true"
-		android:textColor="?android:textColorPrimary"
-		android:textAppearance="?android:attr/textAppearanceLarge"
-		style="DSub.TextViewStyle"/>
-</LinearLayout>
diff --git a/app/src/main/res/layout/main_buttons.xml b/app/src/main/res/layout/main_buttons.xml
deleted file mode 100644
index 95a60409..00000000
--- a/app/src/main/res/layout/main_buttons.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content">
-
-    <LinearLayout
-            android:id="@+id/main_select_server"
-            android:orientation="horizontal"
-            android:paddingTop="2dip"
-            android:paddingBottom="2dip"
-            android:paddingLeft="6dp"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="?android:attr/listPreferredItemHeight">
-
-        <ImageView
-                android:src="?attr/select_server"
-                android:layout_gravity="center_vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"/>
-
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
-
-            <TextView android:id="@+id/main.select_server_1"
-                      android:text="@string/main.select_server"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="10dip"
-                      android:layout_marginTop="6dip"
-                      android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-            <TextView android:id="@+id/main.select_server_2"
-                      android:layout_width="fill_parent"
-                      android:layout_height="wrap_content"
-                      android:layout_marginLeft="10dip"
-                      android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-        </LinearLayout>
-    </LinearLayout>
-	
-	<TextView
-		android:id="@+id/main_offline"
-		android:text="@string/main.offline"
-		android:drawablePadding="12dip"
-		android:drawableLeft="?attr/offline_icon"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:gravity="center_vertical"
-        android:paddingLeft="6dp"
-		android:paddingBottom="4dp"
-		android:minHeight="50dip"/>
-
-	<LinearLayout
-		android:id="@+id/main_albums"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-
-		<TextView
-			android:text="@string/main.albums_title"
-			style="@style/MainAlbumButtonLabel"
-			android:layout_width="0dp"
-			android:layout_weight="1"
-			android:layout_height="fill_parent"/>
-
-		<CheckBox
-			android:id="@+id/main_albums_per_folder"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="@string/main.albums_per_folder"
-			android:layout_marginRight="6dp"
-			android:layout_gravity="right"/>
-	</LinearLayout>
-
-	<TextView
-		android:id="@+id/main_video_section"
-		android:text="@string/main.videos"
-		style="@style/MainAlbumButtonLabel"
-		android:layout_width="0dp"
-		android:layout_weight="1"
-		android:layout_height="fill_parent"/>
-
-	<LinearLayout
-		android:id="@+id/main_albums_newest"
-		android:layout_width="fill_parent"
-		android:layout_height="wrap_content"
-		android:minHeight="46dip">
-
-		<TextView
-			android:layout_width="wrap_content"
-			android:layout_height="fill_parent"
-			android:text="@string/main.albums_newest"
-			style="@style/MainAlbumButton"/>
-
-		<TextView
-			android:id="@+id/main_albums_recent_count"
-			android:layout_width="32dp"
-			android:layout_height="32dp"
-			android:layout_marginRight="12dp"
-			android:background="@drawable/ic_number_border"
-			android:focusable="false"
-			android:paddingRight="10dp"
-			android:layout_marginLeft="20px"
-			android:layout_marginBottom="4px"
-			android:text="99"
-			android:textAppearance="?android:attr/textAppearanceSmallPopupMenu"
-			android:textSize="11sp"
-			android:gravity="right|center_vertical"
-			android:layout_gravity="center_vertical"
-			android:visibility="gone"/>
-	</LinearLayout>
-
-	<TextView
-		android:id="@+id/main_albums_recent"
-		android:text="@string/main.albums_recent"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_frequent"
-		android:text="@string/main.albums_frequent"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_highest"
-		android:text="@string/main.albums_highest"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_starred"
-		android:text="@string/main.albums_starred"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_genres"
-		android:text="@string/main.albums_genres"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_year"
-		android:text="@string/main.albums_year"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_random"
-		android:text="@string/main.albums_random"
-		style="@style/MainAlbumButton"/>
-	<TextView
-		android:id="@+id/main_albums_alphabetical"
-		android:text="@string/main.albums_alphabetical"
-		style="@style/MainAlbumButton"/>
-
-	<TextView
-		android:id="@+id/main_videos"
-		android:text="@string/main.videos"
-		style="@style/MainAlbumButton"/>
-
-</LinearLayout>
-
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
new file mode 100644
index 00000000..89355cb7
--- /dev/null
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -0,0 +1,16 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/main_toolbar"
+        android:layout_height="?attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"/>
+
+    <FrameLayout
+         android:id="@+id/fragment_container"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml
new file mode 100644
index 00000000..88ecd920
--- /dev/null
+++ b/app/src/main/res/menu/drawer_navigation.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+	<group android:checkableBehavior="single">
+		<item
+			android:id="@+id/drawer_home"
+			android:icon="?attr/drawerHome"
+			android:title="@string/button_bar.home"/>
+		<item
+			android:id="@+id/drawer_library"
+			android:icon="?attr/drawerLibrary"
+			android:title="@string/button_bar.browse"/>
+		<item
+			android:id="@+id/drawer_playlists"
+			android:icon="?attr/drawerPlaylists"
+			android:title="@string/button_bar.playlists"/>
+		<item
+			android:id="@+id/drawer_podcasts"
+			android:icon="?attr/drawerPodcasts"
+			android:title="@string/button_bar.podcasts"/>
+		<item
+			android:id="@+id/drawer_bookmarks"
+			android:icon="?attr/drawerBookmarks"
+			android:title="@string/button_bar.bookmarks"/>
+		<item
+			android:id="@+id/drawer_shares"
+			android:icon="?attr/drawerShares"
+			android:title="@string/button_bar.shares"/>
+		<item
+			android:id="@+id/drawer_chat"
+			android:icon="?attr/drawerChat"
+			android:title="@string/button_bar.chat"/>
+		<item
+			android:id="@+id/drawer_admin"
+			android:icon="?attr/drawerAdmin"
+			android:title="@string/button_bar.admin"/>
+		<item
+			android:id="@+id/drawer_downloading"
+			android:icon="?attr/drawerDownloading"
+			android:title="@string/button_bar.downloading"
+			android:visible="false"/>
+	</group>
+
+	<group
+		android:id="@+id/drawer_bottom"
+		android:checkableBehavior="single">
+
+		<item
+			android:id="@+id/drawer_settings"
+			android:title="@string/menu.settings"/>
+	</group>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
new file mode 100644
index 00000000..acd117b5
--- /dev/null
+++ b/app/src/main/res/values-v21/themes.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
+		<item name="android:windowTranslucentStatus">true</item>
+	</style>
+
+	<style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+		<item name="android:windowTranslucentStatus">true</item>
+	</style>
+</resources>
\ No newline at end of file
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..ecba7592 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light" parent="@style/Theme.AppCompat.Light">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Light</item>
+	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light">
 		<item name="offline_icon">@drawable/main_offline_light</item>
 		<item name="media_button_backward">@drawable/media_backward_light</item>
 		<item name="media_button_forward">@drawable/media_forward_light</item>
@@ -29,15 +27,24 @@
 		<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">
-		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
-		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
+	<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
 		<item name="offline_icon">@drawable/main_offline_dark</item>
 		<item name="media_button_backward">@drawable/media_backward_dark</item>
 		<item name="media_button_forward">@drawable/media_forward_dark</item>
@@ -64,12 +71,27 @@
 		<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.Light" parent="Theme.DSub.Light.Base">
+	</style>
+	<style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
 	</style>
@@ -93,20 +115,6 @@
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 	</style>
-	
-	<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
-		<item name="background">@android:color/transparent</item>
-		<item name="android:background">@android:color/transparent</item>
-		<item name="backgroundStacked">@android:color/transparent</item>
-		<item name="android:backgroundStacked">@android:color/transparent</item>
-	</style>
-
-	<style name="Widget.DSub.ActionBarStyle.Dark" parent="Widget.AppCompat.ActionBar.Solid">
-		<item name="background">@android:color/transparent</item>
-		<item name="android:background">@android:color/transparent</item>
-		<item name="backgroundStacked">@android:color/transparent</item>
-		<item name="android:backgroundStacked">@android:color/transparent</item>
-	</style>
 
 	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
 	</style>