From 4fc13ee1d2c376f65549a1b1ffad8afdfe1e8303 Mon Sep 17 00:00:00 2001
From: Hendrik Borghorst <hendrikborghorst@gmail.com>
Date: Sun, 27 May 2018 11:34:35 +0200
Subject: [PATCH] Add menu entry to add playlist URLs for soundcloud, e.g.
 playlists in NowPlaylingPlaylistView. Fixes #125

---
 .../application/views/NowPlayingView.java     | 19 ++++++++++++++----
 .../main/res/menu/popup_menu_nowplaying.xml   | 20 ++++++++++++++-----
 app/src/main/res/values-de/strings.xml        |  2 ++
 app/src/main/res/values/strings.xml           |  4 +++-
 4 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/gateshipone/malp/application/views/NowPlayingView.java b/app/src/main/java/org/gateshipone/malp/application/views/NowPlayingView.java
index be00c55c..72b2c543 100644
--- a/app/src/main/java/org/gateshipone/malp/application/views/NowPlayingView.java
+++ b/app/src/main/java/org/gateshipone/malp/application/views/NowPlayingView.java
@@ -361,7 +361,7 @@ public boolean onMenuItemClick(MenuItem item) {
                 });
                 shuffleListBuilder.create().show();
             }
-                break;
+            break;
             case R.id.action_save_playlist:
                 OnSaveDialogListener plDialogCallback = new OnSaveDialogListener() {
                     @Override
@@ -403,7 +403,7 @@ public void onCreateNewObject() {
                 choosePlaylistDialog.setArguments(args);
                 choosePlaylistDialog.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "ChoosePlaylistDialog");
                 break;
-            case R.id.action_add_url:
+            case R.id.action_add_url: {
                 TextDialog addURLDialog = new TextDialog();
                 addURLDialog.setCallback(MPDQueryHandler::addPath);
                 Bundle textDialogArgs = new Bundle();
@@ -411,7 +411,18 @@ public void onCreateNewObject() {
                 textDialogArgs.putString(TextDialog.EXTRA_DIALOG_TITLE, getResources().getString(R.string.action_add_url));
                 addURLDialog.setArguments(textDialogArgs);
                 addURLDialog.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "AddURLDialog");
-                break;
+            }
+            break;
+            case R.id.action_add_url_playlist: {
+                TextDialog addURLDialog = new TextDialog();
+                addURLDialog.setCallback(MPDQueryHandler::loadPlaylist);
+                Bundle textDialogArgs = new Bundle();
+                textDialogArgs.putString(TextDialog.EXTRA_DIALOG_TEXT, "http://...");
+                textDialogArgs.putString(TextDialog.EXTRA_DIALOG_TITLE, getResources().getString(R.string.action_add_url));
+                addURLDialog.setArguments(textDialogArgs);
+                addURLDialog.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "AddURLDialog");
+            }
+            break;
             case R.id.action_jump_to_current:
                 mPlaylistView.jumpToCurrentSong();
                 break;
@@ -1306,7 +1317,7 @@ private void updateMPDCurrentTrack(MPDTrack track) {
             mCoverLoader.getImage(track, true, mCoverImage.getWidth(), mCoverImage.getHeight());
         }
 
-        if (mShowArtistImage && (null == mLastTrack || !track.getTrackArtist().equals(mLastTrack.getTrackArtist()) || !track.getTrackArtistMBID().equals(mLastTrack.getTrackAlbumArtistMBID()) )) {
+        if (mShowArtistImage && (null == mLastTrack || !track.getTrackArtist().equals(mLastTrack.getTrackArtist()) || !track.getTrackArtistMBID().equals(mLastTrack.getTrackAlbumArtistMBID()))) {
             mCoverImage.clearArtistImage();
 
             mCoverLoader.getArtistImage(track, true, mCoverImage.getWidth(), mCoverImage.getHeight());
diff --git a/app/src/main/res/menu/popup_menu_nowplaying.xml b/app/src/main/res/menu/popup_menu_nowplaying.xml
index 8896bf59..109aa9de 100644
--- a/app/src/main/res/menu/popup_menu_nowplaying.xml
+++ b/app/src/main/res/menu/popup_menu_nowplaying.xml
@@ -56,11 +56,21 @@
             android:title="@string/action_clear_playlist"
             app:showAsAction="never" />
 
-        <item
-            android:id="@+id/action_add_url"
-            android:orderInCategory="4"
-            android:title="@string/action_add_url"
-            app:showAsAction="never" />
+        <item android:id="@+id/group_playlist_add_actions"
+            android:title="@string/action_add_group">
+            <menu>
+                <item
+                    android:id="@+id/action_add_url"
+                    android:orderInCategory="4"
+                    android:title="@string/action_add_url"
+                    app:showAsAction="never" />
+                <item
+                    android:id="@+id/action_add_url_playlist"
+                    android:orderInCategory="5"
+                    android:title="@string/action_add_url_playlist"
+                    app:showAsAction="never" />
+            </menu>
+        </item>
         <item
             android:id="@+id/action_jump_to_current"
             android:orderInCategory="5"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index eab89c5f..2cf4e2f8 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -275,4 +275,6 @@
     <string name="preference_use_artist_sort_text">Verwenden des ArtistSort (oder AlbumArtistSort) Tags, falls der Server diesen anbietet.</string>
     <string name="preference_npv_show_playlist_title">Starte mit Wiedergabeliste</string>
     <string name="preference_npv_show_playlist_text">Zeige die Wiedergabeliste wenn während der Wiedergabe M.A.L.P. über ein Widget oder Benachrichtigung gestartet wird</string>
+    <string name="action_add_group">Hinzufügen</string>
+    <string name="action_add_url_playlist">Playlist-URL hinzufügen</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2aeba905..1751d4af 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -83,7 +83,9 @@
     <string name="action_remove_track">Remove track</string>
     <string name="action_remove_album">Remove album</string>
 
-    <string name="action_add_url">Add URL</string>
+    <string name="action_add_group">Add</string>
+    <string name="action_add_url">Add file URL</string>
+    <string name="action_add_url_playlist">Add playlist URL</string>
     <string name="action_show_albums_from_here">Show albums in this directory</string>
     <string name="action_update_database_here">Update database here</string>