Theme update

4 files changed, 63 insertions, 67 deletions

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 3db670e6..2d2ebd7d 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -7,10 +7,16 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
+	<attr name="actionbar_backward" format="reference"/>
+	<attr name="actionbar_forward" format="reference"/>
+	<attr name="actionbar_pause" format="reference"/>
+	<attr name="actionbar_start" format="reference"/>
+	<attr name="actionbar_stop" format="reference"/>
 	<attr name="chat_send" format="reference"/>
 	<attr name="add" format="reference"/>
 	<attr name="download_none" format="reference"/>
 	<attr name="shuffle" format="reference"/>
+	<attr name="shuffle_button" format="reference"/>
 	<attr name="refresh" format="reference"/>
 	<attr name="search" format="reference"/>
 	<attr name="remove" format="reference"/>
@@ -37,6 +43,9 @@
 	<attr name="drawerAdmin" format="reference"/>
 	<attr name="drawerDownloading" format="reference"/>
 	<attr name="drawerSettings" format="reference"/>
+	<attr name="actionbarTitleStyle" format="reference"/>
+	<attr name="actionbarSubtitleStyle" format="reference"/>
+	<attr name="actionbarPopupStyle" format="reference"/>
 
 	<declare-styleable name="SeekBarPreference">
 		<attr name="min" format="integer"/>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b1422ad6..d3f9bcb2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="lightBackground">#F1F0E6</color>
     <color name="dividerColor">#FF33B5E5</color>
     <color name="appwidget_text">#FFFFFF</color>
     <color name="notificationArtist">#434343</color>
     <color name="notificationTitle">#000000</color>
-	<color name="background_holo_light">#ff33b5e5</color>
 	<color name="overlayColor">#80000000</color>
-	<color name="ics_opaque">#8033b5e5</color>
 	<color name="cyan">#ff0099cc</color>
 
 	<color name="holo_blue_light">#ff33b5e5</color>
 	<color name="holo_orange_light">#ffffbb33</color>
 	<color name="holo_green_light">#ff99cc00</color>
 	<color name="holo_red_light">#ffff4444</color>
+
+	<color name="lightPrimary">#2196f3</color>
+	<color name="lightPrimaryDark">#1e88e5</color>
+	<color name="lightAccent">#448aff</color>
+
+	<color name="darkPrimary">#f44336</color>
+	<color name="darkPrimaryDark">#e53935</color>
+	<color name="darkAccent">#ff5252</color>
+
+	<color name="holoPrimary">#009688</color>
+	<color name="holoPrimaryDark">#00897b</color>
+	<color name="holoAccent">#64ffda</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cfe446f3..83fa4a42 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -29,15 +29,6 @@
 		<item name="android:layout_height">match_parent</item>
 		<item name="android:layout_width">wrap_content</item>
 	</style>
-	
-	<style name="MenuBarButton" parent="@style/BasicButton">
-        <item name="android:layout_width">0dip</item>
-        <item name="android:layout_height">45dip</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:textStyle">bold</item>
-		<item name="android:textColor">?android:textColorPrimary</item>
-    </style>
 
 	<style name="DownloadActionButton" parent="@style/BasicButton">
 		<item name="android:layout_width">wrap_content</item>
@@ -58,27 +49,4 @@
 		<item name="android:paddingRight">16dip</item>
 		<item name="android:paddingLeft">16dip</item>
 	</style>
-
-	<style name="MainAlbumButton">
-		<item name="android:drawablePadding">6dip</item>
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:paddingLeft">6dip</item>
-		<item name="android:paddingRight">6dip</item>
-		<item name="android:minHeight">46dip</item>
-	</style>
-
-	<style name="MainAlbumButtonLabel">
-		<item name="android:layout_width">fill_parent</item>
-		<item name="android:layout_height">wrap_content</item>
-		<item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-		<item name="android:textColor">@color/cyan</item>
-		<item name="android:gravity">center_vertical</item>
-		<item name="android:paddingLeft">6dp</item>
-		<item name="android:textAllCaps">true</item>
-		<item name="android:textStyle">bold</item>
-		<item name="android:textSize">16sp</item>
-	</style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index ecba7592..fb47af81 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light">
+	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 		<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>
@@ -8,25 +8,31 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
+		<item name="actionbar_backward">@drawable/media_backward_dark</item>
+		<item name="actionbar_forward">@drawable/media_forward_dark</item>
+		<item name="actionbar_pause">@drawable/media_pause_dark</item>
+		<item name="actionbar_start">@drawable/media_start_dark</item>
+		<item name="actionbar_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
-		<item name="add">@drawable/ic_action_add_light</item>
+		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_light</item>
-		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
-		<item name="refresh">@drawable/ic_menu_refresh_light</item>
-		<item name="search">@drawable/ic_menu_search_light</item>
-		<item name="remove">@drawable/ic_menu_remove_light</item>
-		<item name="save">@drawable/ic_menu_save_light</item>
+		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="shuffle_button">@drawable/ic_menu_shuffle_light</item>
+		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
+		<item name="search">@drawable/ic_menu_search_dark</item>
+		<item name="remove">@drawable/ic_menu_remove_dark</item>
+		<item name="save">@drawable/ic_menu_save_dark</item>
 		<item name="volume">@drawable/ic_action_volume_light</item>
 		<item name="toggle_list">@drawable/action_toggle_list_light</item>
 		<item name="select_server">@drawable/main_select_server_light</item>
 		<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="add_person">@drawable/ic_menu_add_person_dark</item>
+		<item name="password">@drawable/ic_menu_password_dark</item>
 		<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="radio">@drawable/ic_menu_radio_dark</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>
@@ -37,12 +43,14 @@
 		<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>
+		<item name="colorPrimary">@color/lightPrimary</item>
+		<item name="colorPrimaryDark">@color/lightPrimaryDark</item>
+		<item name="colorAccent">@color/lightAccent</item>
+		<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse</item>
+		<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item>
+		<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Light</item>
+		<item name="android:spinnerItemStyle">@style/DarkSpinnerItem</item>
 	</style>
 	<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
 		<item name="offline_icon">@drawable/main_offline_dark</item>
@@ -52,10 +60,16 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
+		<item name="actionbar_backward">@drawable/media_backward_dark</item>
+		<item name="actionbar_forward">@drawable/media_forward_dark</item>
+		<item name="actionbar_pause">@drawable/media_pause_dark</item>
+		<item name="actionbar_start">@drawable/media_start_dark</item>
+		<item name="actionbar_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 		<item name="add">@drawable/ic_action_add_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
+		<item name="shuffle_button">@drawable/ic_menu_shuffle_dark</item>
 		<item name="refresh">@drawable/ic_menu_refresh_dark</item>
 		<item name="search">@drawable/ic_menu_search_dark</item>
 		<item name="remove">@drawable/ic_menu_remove_dark</item>
@@ -81,12 +95,13 @@
 		<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>
+		<item name="colorPrimary">@color/darkPrimary</item>
+		<item name="colorPrimaryDark">@color/darkPrimaryDark</item>
+		<item name="colorAccent">@color/darkAccent</item>
+		<item name="actionbarTitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Title</item>
+		<item name="actionbarSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item>
+		<item name="actionbarPopupStyle">@style/ThemeOverlay.AppCompat.Dark</item>
 	</style>
 	<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
 	</style>
@@ -97,6 +112,9 @@
 	</style>
 	<style name="Theme.DSub.Holo" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@drawable/background</item>
+		<item name="colorPrimary">@color/holoPrimary</item>
+		<item name="colorPrimaryDark">@color/holoPrimaryDark</item>
+		<item name="colorAccent">@color/holoAccent</item>
 	</style>
 
 	<style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light">
@@ -116,19 +134,11 @@
 		<item name="windowNoTitle">true</item>
 	</style>
 
-	<style name="DSub.TextViewStyle" parent="android:Widget.TextView">
-	</style>
-
-	<style name="DSub.TextViewStyle.Bold" parent="android:Widget.TextView">
-		<item name="android:textStyle">bold</item>
-	</style>
-
-	<style name="DSub.ButtonStyle.Dark" parent="android:Widget.Holo.Button">
-	</style>
-	<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
-	</style>
-
 	<style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
 		<item name="spinBars">true</item>
 	</style>
+
+	<style name="DarkSpinnerItem" parent="Widget.AppCompat.TextView.SpinnerItem">
+		<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
+	</style>
 </resources>