Merge changes

6 files changed, 189 insertions, 31 deletions

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index b558d68e..7e90c727 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,44 @@
 <?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.chat</item>
+		<item>@string/menu.settings</item>
+	</string-array>
+
+	<string-array name="drawerItemsDescriptions">
+		<item>Home</item>
+		<item>Artist</item>
+		<item>Playlist</item>
+		<item>Podcast</item>
+		<item>Bookmark</item>
+		<item>Chat</item>
+		<item>Settings</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_chat_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_chat_dark</item>
+		<item>@drawable/ic_menu_settings_dark</item>
+	</array>
 
     <string-array name="themeValues">
         <item>light</item>
@@ -137,6 +176,19 @@
 		<item>@string/settings.temp_loss_nothing</item>
 	</string-array>
 
+	<string-array name="disconnectPauseValues">
+		<item>0</item>
+		<item>1</item>
+		<item>2</item>
+		<item>3</item>
+	</string-array>
+	<string-array name="disconnectPauseNames">
+		<item>@string/settings.disconnect_pause_both</item>
+		<item>@string/settings.disconnect_pause_headphone</item>
+		<item>@string/settings.disconnect_pause_bluetooth</item>
+		<item>@string/settings.disconnect_pause_neither</item>
+	</string-array>
+
 	<string-array name="videoPlayerValues">
 		<item>raw</item>
 		<item>hls</item>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8f669cd2..ae0939f1 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -7,6 +7,17 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
-	<attr name="chat" format="reference"/> 
-	<attr name="chat_send" format="reference" /> 
+	<attr name="chat_send" format="reference"/>
+	<attr name="download_none" format="reference"/>
+	<attr name="shuffle" format="reference"/>
+	<attr name="refresh" format="reference"/>
+	<attr name="search" format="reference"/>
+	<attr name="remove" format="reference"/>
+	<attr name="save" format="reference"/>
+	<attr name="volume" format="reference"/>
+	<attr name="toggle_list" format="reference"/>
+	<attr name="select_server" format="reference"/>
+	<attr name="downloading" format="reference"/>
+	<attr name="bookmark" format="reference"/>
+	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
new file mode 100644
index 00000000..b504b105
--- /dev/null
+++ b/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>

+<resources>

+	<dimen name="Button">54dip</dimen>

+	<dimen name="Button.Small">46dip</dimen>

+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87667e51..52c899e2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,13 +22,15 @@
 	<string name="common.stream_external">Stream Video</string>

 	<string name="common.confirm">Confirm</string>

 	<string name="common.confirm_message">Do you want to %1$s %2$s?</string>

+	<string name="common.empty">None found</string>

 

     <string name="button_bar.home">Home</string>

     <string name="button_bar.browse">Library</string>

     <string name="button_bar.search">Search</string>

     <string name="button_bar.playlists">Playlists</string>

-    <string name="button_bar.now_playing">Playing</string>

+    <string name="button_bar.now_playing">Now Playing</string>

 	<string name="button_bar.podcasts">Podcasts</string>

+	<string name="button_bar.bookmarks">Bookmarks</string>

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

 

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

@@ -130,10 +132,8 @@
 	<string name="offline.sync_partial">Successfully synced %1$d of %2$d songs</string>

 	<string name="offline.sync_error">Failed to sync songs</string>

 

-	<string name="select_genre.empty">No genres found</string>

 	<string name="select_genre.blank">Blank</string>

 

-	<string name="select_podcasts.empty">No podcasts found</string>

 	<string name="select_podcasts.error">This podcast had an error while downloading on the server.  The server must download it first.</string>

 	<string name="select_podcasts.skipped">This podcast has not been downloaded on the server.  The server must download it first.</string>

     <string name="select_podcasts.initializing">This podcast channel is being initialized on the server.  Please reload after a moment.</string>

@@ -147,8 +147,6 @@
 	<string name="select_podcasts.created_error">Failed to add podcast</string>

 	<string name="select_podcasts.invalid_podcast_channel">Invalid podcast channel: %s</string>

 

-    <string name="select_playlist.empty">No saved playlists on server</string>

-

     <string name="download.empty">Playlist is empty</string>

 	<string name="download.shuffle_loading">Shuffle list is loading...</string>

     <string name="download.playerstate_downloading">Downloading - %s</string>

@@ -189,6 +187,8 @@
 	<string name="download.need_download">Video needs to be downloaded first</string>

 	<string name="download.no_streaming_player">No player can play this stream</string>

 	<string name="download.playing_out_of">Playing: %1$d/%2$d</string>

+	<string name="download.save_bookmark_title">Create bookmark</string>

+	<string name="download.save_bookmark">Bookmark created</string>

     

 	<string name="starring_content_starred">Starred \"%s\"</string>

 	<string name="starring_content_unstarred">Unstarred \"%s\"</string>

@@ -198,6 +198,17 @@
 	<string name="updated_playlist">Added %1$s songs to \"%2$s\"</string>

     <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string>

 	<string name="removed_playlist">Removed %1$s songs from \"%2$s\"</string>

+	

+	<string name="bookmark.delete">Delete bookmark</string>

+	<string name="bookmark.delete_title">Delete the bookmark for</string>

+	<string name="bookmark.deleted">Deleted the bookmark for \"%s\"</string>

+	<string name="bookmark.deleted_error">Failed to delete the bookmark for \"%s\"</string>

+	<string name="bookmark.details_title">Bookmark Details</string>

+	<string name="bookmark.details">Song: %1$s

+		\nPosition: %2$s

+		\nCreated: %3$s

+		\nLast Updated: %4$s

+		\nComment: %5$s</string>

 

     <string name="song_details.all">%1$s %2$s</string>

     <string name="song_details.kbps">%d kbps</string>

@@ -290,7 +301,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>

     <string name="settings.other_title">Other settings</string>

     <string name="settings.scrobble_title">Scrobble to Last.fm</string>

-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the DSub server</string>

+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subsonic server</string>

     <string name="settings.hide_media_title">Hide from other</string>

     <string name="settings.hide_media_summary">Hide music files from other apps.</string>

     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>

@@ -311,19 +322,32 @@
 	<string name="settings.temp_loss_pause_lower">Pause, lower volume when requested</string>

 	<string name="settings.temp_loss_lower">Always lower volume</string>

 	<string name="settings.temp_loss_nothing">Do Nothing</string>

+	<string name="settings.disconnect_pause_title">Pause on Disconnect</string>

+	<string name="settings.disconnect_pause_both">Pause on either</string>

+	<string name="settings.disconnect_pause_headphone">Pause only for headphone</string>

+	<string name="settings.disconnect_pause_bluetooth">Pause only for bluetooth</string>

+	<string name="settings.disconnect_pause_neither">Do Nothing</string>

 	<string name="settings.persistent_title">Persistent Notification</string>

 	<string name="settings.persistent_summary">Show the notification even after pausing.  Press the stop button to clear it away.</string>

 	<string name="settings.gapless_playback">Gapless Playback</string>

 	<string name="settings.gapless_playback_summary">The Galaxy S3 seems to be experiencing freezes/other weird issue since the introduction of gapless playback.  Turn this off to fix the issue.</string>

 	<string name="settings.chat_refresh">Chat Refresh Rate (Secs)</string>

 	<string name="settings.chat_enabled">Chat Enabled</string>

-	<string name="settings.chat_enabled_summary">Whether or not to display the chat tab.  Restart app after changing.</string>

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

 	<string name="settings.video_title">Video</string>

 	<string name="settings.video_player">Video Player</string>

 	<string name="settings.video_raw">Raw (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_hls">HTTP Live Stream (HLS) (Requires Subsonic 4.8+)</string>

 	<string name="settings.video_transcode">Direct Transcode (Requires video -> mp4 or similar setup on Server)</string>

 	<string name="settings.video_flash">Flash (Requires Plugin)</string>

+	<string name="settings.cache_screen_title">Cache/Network</string>

+	<string name="settings.playback_title">Playback</string>

+	<string name="settings.hide_widget_title">Hide Widget</string>

+	<string name="settings.hide_widget_summary">Hide widget after exiting app</string>

+	<string name="settings.podcasts_enabled">Podcasts Enabled</string>

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

+	<string name="settings.bookmarks_enabled">Bookmarks Enabled</string>

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

 	<string name="settings.sync_title">Sync</string>

 	<string name="settings.sync_enabled">Sync Enabled</string>

 	<string name="settings.sync_enabled_summary">Whether or not playlists or podcasts are periodically checked for changes</string>

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 4dcce34f..b1475eb6 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -6,15 +6,15 @@
         <item name="android:padding">6dip</item>
         <item name="android:layout_marginLeft">4dip</item>
         <item name="android:layout_marginRight">4dip</item>
-        <item name="android:layout_width">54dip</item>
-        <item name="android:layout_height">54dip</item>
+        <item name="android:layout_width">@dimen/Button</item>
+        <item name="android:layout_height">@dimen/Button</item>
         <item name="android:contentDescription">@null</item>
     </style>
 	
 	<style name="PlaybackControl.Small" parent="@style/PlaybackControl">
 		<item name="android:padding">4dip</item>
-        <item name="android:layout_width">46dip</item>
-        <item name="android:layout_height">46dip</item>
+        <item name="android:layout_width">@dimen/Button.Small</item>
+        <item name="android:layout_height">@dimen/Button.Small</item>
     </style>
 	
 	<style name="MenuBarButton">
@@ -27,6 +27,28 @@
 		<item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
+	<style name="DownloadActionButton">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textSize">22sp</item>
+		<item name="android:background">@drawable/menubar_button</item>
+		<item name="android:paddingTop">4dip</item>
+		<item name="android:paddingBottom">4dip</item>
+		<item name="android:paddingRight">4dip</item>
+		<item name="android:paddingLeft">4dip</item>
+	</style>
+
+	<style name="DownloadActionImageButton">
+		<item name="android:layout_width">wrap_content</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:background">@drawable/menubar_button</item>
+		<item name="android:paddingTop">8dip</item>
+		<item name="android:paddingBottom">8dip</item>
+		<item name="android:paddingRight">16dip</item>
+		<item name="android:paddingLeft">16dip</item>
+	</style>
+
 	<style name="DragDropListView">
 		<item name="drag_enabled">true</item>
 		<item name="collapsed_height">1dp</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index b2aa8277..1b2078a7 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -10,22 +10,48 @@
 		<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="chat">@drawable/ic_menu_chat_light</item> 
-		<item name="chat_send">@drawable/ic_menu_chat_send_light</item> 
+		<item name="chat_send">@drawable/ic_menu_chat_send_light</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="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="drawerItemsIcons">@array/drawerItemIconsLight</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</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>
 		<item name="android:textColorSecondary">@color/cyan</item>
-		<item name="offline_icon">@drawable/main_offline</item>
-		<item name="media_button_backward">@drawable/media_backward</item>
-		<item name="media_button_forward">@drawable/media_forward</item>
-		<item name="media_button_pause">@drawable/media_pause</item>
+		<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>
+		<item name="media_button_pause">@drawable/media_pause_dark</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
-		<item name="media_button_start">@drawable/media_start</item>
-		<item name="media_button_stop">@drawable/media_stop</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item> 
-		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item> 
+		<item name="media_button_start">@drawable/media_start_dark</item>
+		<item name="media_button_stop">@drawable/media_stop_dark</item>
+		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="download_none">@drawable/download_none_dark</item>
+		<item name="shuffle">@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>
+		<item name="save">@drawable/ic_menu_save_dark</item>
+		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="toggle_list">@drawable/action_toggle_list_dark</item>
+		<item name="select_server">@drawable/main_select_server_dark</item>
+		<item name="downloading">@drawable/downloading_dark</item>
+		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
 	<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
 		<item name="android:windowBackground">@android:color/black</item>
@@ -33,17 +59,29 @@
 	<style name="Theme.DSub.Holo" parent="@style/Theme.AppCompat">
 		<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
 		<item name="android:actionBarStyle">@style/Widget.DSub.ActionBarStyle.Holo</item>
-		<item name="android:textColorSecondary">@color/cyan</item>
 		<item name="android:windowBackground">@drawable/background</item>
-		<item name="offline_icon">@drawable/main_offline</item>
-		<item name="media_button_backward">@drawable/media_backward</item>
-		<item name="media_button_forward">@drawable/media_forward</item>
-		<item name="media_button_pause">@drawable/media_pause</item>
+		<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>
+		<item name="media_button_pause">@drawable/media_pause_dark</item>
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
-		<item name="media_button_start">@drawable/media_start</item>
-		<item name="media_button_stop">@drawable/media_stop</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item> 
+		<item name="media_button_start">@drawable/media_start_dark</item>
+		<item name="media_button_stop">@drawable/media_stop_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
+		<item name="download_none">@drawable/download_none_dark</item>
+		<item name="shuffle">@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>
+		<item name="save">@drawable/ic_menu_save_dark</item>
+		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="toggle_list">@drawable/action_toggle_list_dark</item>
+		<item name="select_server">@drawable/main_select_server_dark</item>
+		<item name="downloading">@drawable/downloading_dark</item>
+		<item name="bookmark">@drawable/ic_menu_bookmark_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
+		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
+		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
 	
 	<style name="Theme.DSub.Light.Fullscreen" parent="Theme.DSub.Light">
@@ -79,4 +117,10 @@
 		<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>
+
+	<style name="DSub.ButtonStyle" parent="android:Widget.Holo.Button">
+	</style>
 </resources>