Merge branch 'master' of git://github.com/daneren2005/Subsonic

12 files changed, 5 insertions, 10 deletions

diff --git a/res/drawable-hdpi/ic_menu_download_dark.png b/res/drawable-hdpi/ic_menu_download_dark.png
new file mode 100644
index 00000000..872b73c0
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_download_dark.png
diff --git a/res/drawable-hdpi/ic_menu_download_light.png b/res/drawable-hdpi/ic_menu_download_light.png
new file mode 100644
index 00000000..f8818490
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_download_light.png
diff --git a/res/drawable-mdpi/ic_menu_download_dark.png b/res/drawable-mdpi/ic_menu_download_dark.png
new file mode 100644
index 00000000..935bbd45
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_download_dark.png
diff --git a/res/drawable-mdpi/ic_menu_download_light.png b/res/drawable-mdpi/ic_menu_download_light.png
new file mode 100644
index 00000000..cc13d444
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_download_light.png
diff --git a/res/drawable-xhdpi/ic_menu_download_dark.png b/res/drawable-xhdpi/ic_menu_download_dark.png
new file mode 100644
index 00000000..6b6c65df
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_download_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_download_light.png b/res/drawable-xhdpi/ic_menu_download_light.png
new file mode 100644
index 00000000..c8caf90b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_download_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_download_dark.png b/res/drawable-xxhdpi/ic_menu_download_dark.png
new file mode 100644
index 00000000..03ddef9f
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_download_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_download_light.png b/res/drawable-xxhdpi/ic_menu_download_light.png
new file mode 100644
index 00000000..c487580c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_download_light.png
diff --git a/res/menu/nowplaying_downloading.xml b/res/menu/downloading.xml
index 50ab00f3..670a2803 100644
--- a/res/menu/nowplaying_downloading.xml
+++ b/res/menu/downloading.xml
@@ -7,10 +7,6 @@
         android:title="@string/download.menu_remove_all"
         compat:showAsAction="always|withText"/>
 		
-	<item
-        android:id="@+id/menu_toggle_now_playing"
-        android:title="@string/download.show_now_playing"/>
-		
 	<item 
 		android:id="@+id/menu_exit"
 		android:title="@string/menu.exit"/>
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 1d720464..bc87f0c4 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -36,10 +36,6 @@
 	<item
         android:id="@+id/menu_toggle_timer"
         android:title="@string/download.start_timer"/>
-		
-	<item
-        android:id="@+id/menu_toggle_now_playing"
-        android:title="@string/download.show_downloading"/>
 
 	<item
 		android:id="@+id/menu_exit"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 7fec7760..e8eee980 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.downloading</item>
 		<item>@string/menu.settings</item>
 	</string-array>
 
@@ -19,6 +20,7 @@
 		<item>Bookmark</item>
 		<item>Share</item>
 		<item>Chat</item>
+		<item>Download</item>
 		<item>Settings</item>
 	</string-array>
 
@@ -30,6 +32,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_download_light</item>
 		<item>@drawable/ic_menu_settings_light</item>
 	</array>
 
@@ -41,6 +44,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_download_dark</item>
 		<item>@drawable/ic_menu_settings_dark</item>
 	</array>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 87c7c8e0..dbb08ee0 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.downloading">Downloading</string>

 

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

     <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve

@@ -183,8 +184,6 @@
     <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string>

     <string name="download.jukebox_offline">Remote control is not available in offline mode.</string>

     <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users &gt; Settings</b> on your Subsonic server.</string>

-	<string name="download.show_downloading">Show Downloading</string>

-	<string name="download.show_now_playing">Show Now Playing</string>

 	<string name="download.timer_length">Timer:</string>

 	<string name="download.start_timer">Start Timer</string>

 	<string name="download.stop_timer">Stop Timer</string>