Fixes #714: Add different options for action when pressing a song

10 files changed, 24 insertions, 21 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c31e045f..c43f3aea 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -397,8 +397,6 @@
 	<string name="settings.override_system_language">In Englisch anzeigen</string>
 	<string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub. Benötigt einen Neustart der App.</string>
 	<string name="settings.drawer_items_title">Seitenmenü</string>
-	<string name="settings.play_now_after">Jetzt wiedergeben bis zum Listenende</string>
-	<string name="settings.play_now_after_summary">\"Jetzt wiedergeben\" im Kontextmenü spielt das ausgewählte Lied und alle in der Liste nachfolgenden Lieder ab (wie in der Web-Schnittstelle des Subsonic-Server)</string>
 	<string name="settings.large_album_art">Große Cover anzeigen</string>
 	<string name="settings.large_album_art_summary">Verwende große Cover zur Anzeige der Alben anstatt einer Liste</string>
 	<string name="settings.admin_enabled">Administration aktiviert</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9846dc17..a5273a50 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -386,8 +386,6 @@
 	<string name="settings.override_system_language">Sobreescribir idioma del sistema</string>
 	<string name="settings.override_system_language_summary">Mostrar la aplicación en inglés aún teniendo disponible DSub en el idioma del sistema. Probablemente necesite borrar la aplicación de la memoria para efectuar los cambios.</string>
 	<string name="settings.drawer_items_title">Pestañas</string>
-	<string name="settings.play_now_after">Reproducir ahora - Después</string>
-	<string name="settings.play_now_after_summary">Pulsar "Reproducir ahora" desde el menú contextual actúa como la interfaz web de Subsonic, reproduciendo todos los items a partir del seleccionado</string>
 	<string name="settings.large_album_art">Carátulas grandes</string>
 	<string name="settings.large_album_art_summary">Mostrar los discos con carátulas grandes en vez de en lista</string>
 	<string name="settings.admin_enabled">Admin Habilitado</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6b1089c6..a20c0fd8 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -398,8 +398,6 @@
 	<string name="settings.override_system_language">Ne pas utiliser la langue du système</string>
 	<string name="settings.override_system_language_summary">Afficher DSub en Anglais même si une traduction existe pour la langue système. Peut nécessiter un vidage du cache de l\'application.</string>
 	<string name="settings.drawer_items_title">Entrées de menu</string>
-	<string name="settings.play_now_after">Jouer maintenant - Plus tard</string>
-	<string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string>
 	<string name="settings.large_album_art">Pochettes larges</string>
 	<string name="settings.large_album_art_summary">Afficher les pochettes en grand plutôt qu\'en liste.</string>
 	<string name="settings.admin_enabled">Administration</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1e2a7c69..8ac830a7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -442,8 +442,6 @@
 	<string name="settings.override_system_language">A rendszer nyelvének felülbírálása</string>
 	<string name="settings.override_system_language_summary">A Dsub megjelenítése angol nyelven abban az esetben is, ha rendelkezik fordítással. Az alkalmazást törölni kell a memóriából, mert a beállítás csak újraindítás után lép érvénybe!</string>
 	<string name="settings.drawer_items_title">Oldalsáv elemei</string>
-	<string name="settings.play_now_after">Lejátszás utána</string>
-	<string name="settings.play_now_after_summary">Egy helyi menü, amivel lehetővé válik minden dal lejátszása a kijelölt elem után (mint a Subsonic webes felületén)</string>
 	<string name="settings.large_album_art">Nagyméretű albumborítók</string>
 	<string name="settings.large_album_art_summary">Albumok megjelenítése rácsnézetben és nagyméretű albumborítóval a listanézet helyett.</string>
 	<string name="settings.admin_enabled">Admin engedélyezése</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 02f67538..93ff1f1d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -431,8 +431,6 @@
 	<string name="settings.override_system_language">Systeemtaal overschrijven</string>
 	<string name="settings.override_system_language_summary">Toon de app in Engels, ook als de systeemtaal voor Dsub beschikbaar is. Het is misschien nodig om de app uit cache geheugen te wissen voordat het effectief is.</string>
 	<string name="settings.drawer_items_title">Server tabs</string>
-	<string name="settings.play_now_after">Speel af - na</string>
-	<string name="settings.play_now_after_summary">Nu afspelen contextmenu speelt alles af na het geselecteerde item (net zoals de Subsonic website)</string>
 	<string name="settings.large_album_art">Grote albumhoezen</string>
 	<string name="settings.large_album_art_summary">Toon albums met grote hoes in plaats van een lijst</string>
 	<string name="settings.admin_enabled">Beheer ingeschakeld</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6cf7a8d6..9042839f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -441,8 +441,6 @@
 	<string name="settings.override_system_language">Sobrepor linguagem do sistema</string>
 	<string name="settings.override_system_language_summary">Mostrar a aplicação em inglês mesmo se o DSub tiver uma tradução disponível para a linguagem do sistema.  Poderá ser necessário limpar a aplicação da memória para as alterações terem efeito</string>
 	<string name="settings.drawer_items_title">Separadores laterais</string>
-	<string name="settings.play_now_after">Premir uma música - Reproduzir tudo</string>
-	<string name="settings.play_now_after_summary">Premir uma música adiciona à fila \"Reproduzir agora\" todas as músicas do álbum a seguir à música selecionada</string>
 	<string name="settings.large_album_art">Grandes capas de álbum</string>
 	<string name="settings.large_album_art_summary">Mostrar os álbuns com uma grande capa em vez de em lista</string>
 	<string name="settings.admin_enabled">Ativar administração</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 539775b5..ac219530 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -430,8 +430,6 @@
 	<string name="settings.override_system_language">Ignorera systemspråket</string>
 	<string name="settings.override_system_language_summary">Visa appen på engelska även om systemet är på ett språk Subsonic har stöd för. Du kan eventuellt behöva rensa appen från minnet för att det ska ta effekt.</string>
 	<string name="settings.drawer_items_title">Sidoflikar</string>
-	<string name="settings.play_now_after">Spela nu - Efter</string>
-	<string name="settings.play_now_after_summary">Spela nu i context menyn spelar allt efter spåret (som i Subsonic webb GUI)</string>
 	<string name="settings.large_album_art">Stora album bilder</string>
 	<string name="settings.large_album_art_summary">Visa album med stora bilder istället för en lista</string>
 	<string name="settings.admin_enabled">Admin aktiverad</string>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3ee60fce..01296e9e 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -222,4 +222,17 @@
 		<item>@string/main.online</item>
 		<item>@string/main.offline</item>
 	</string-array>
+
+	<string-array name="songPressActionValues">
+		<item>single</item>
+		<item>all</item>
+		<item>next</item>
+		<item>last</item>
+	</string-array>
+	<string-array name="songPressActionNames">
+		<item>@string/settings.song_press_play_single</item>
+		<item>@string/settings.song_press_play_all</item>
+		<item>@string/settings.song_press_play_next</item>
+		<item>@string/settings.song_press_play_last</item>
+	</string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6837a88b..d372940f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -447,8 +447,11 @@
 	<string name="settings.override_system_language">Override System Language</string>
 	<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for.  May need to clear the app from memory for changes to take affect.</string>
 	<string name="settings.drawer_items_title">Drawer Tabs</string>
-	<string name="settings.play_now_after">Song Press - Play All</string>
-	<string name="settings.play_now_after_summary">Pressing on a song adds everything in the album to the Now Playing Queue after the pressed song</string>
+	<string name="settings.song_press_action">Song Press Action</string>
+	<string name="settings.song_press_play_single">Play only that song</string>
+	<string name="settings.song_press_play_all">Adds everything in the album to the Now Playing Queue</string>
+	<string name="settings.song_press_play_next">Adds song as next song</string>
+	<string name="settings.song_press_play_last">Adds song to end of Now Playing Queue</string>
 	<string name="settings.large_album_art">Large Album Art</string>
 	<string name="settings.large_album_art_summary">Display albums with large album art instead of in a list</string>
 	<string name="settings.admin_enabled">Admin Enabled</string>
diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml
index 91b0435b..566a8218 100644
--- a/app/src/main/res/xml/settings_playback.xml
+++ b/app/src/main/res/xml/settings_playback.xml
@@ -46,11 +46,12 @@
 			android:key="headsUpNotification"
 			android:defaultValue="false"/>
 
-		<CheckBoxPreference
-			android:title="@string/settings.play_now_after"
-			android:summary="@string/settings.play_now_after_summary"
-			android:key="playNowAfter"
-			android:defaultValue="true"/>
+		<ListPreference
+			android:title="@string/settings.song_press_action"
+			android:key="songPressAction"
+			android:defaultValue="all"
+			android:entryValues="@array/songPressActionValues"
+			android:entries="@array/songPressActionNames"/>
 	</PreferenceCategory>
 
 	<PreferenceCategory