From d844e0aba6550e60c417cd663a450ff14c5fcc89 Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Sat, 2 Oct 2021 19:21:25 +0200
Subject: [PATCH 1/8] Add a add to playlist option in the share menu.

---
 .../org/schabi/newpipe/RouterActivity.java    | 59 +++++++++++++++++--
 .../local/dialog/PlaylistAppendDialog.java    | 28 ++++++++-
 .../local/dialog/PlaylistCreationDialog.java  | 18 ++++++
 app/src/main/res/values/settings_keys.xml     |  3 +
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 103 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index feb9e029d..eba080e62 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -1,5 +1,8 @@
 package org.schabi.newpipe;
 
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
+import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
+
 import android.annotation.SuppressLint;
 import android.app.IntentService;
 import android.content.Context;
@@ -56,6 +59,8 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.ktx.ExceptionUtils;
+import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
+import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
@@ -69,8 +74,8 @@ import org.schabi.newpipe.util.ExtractorHelper;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.urlfinder.UrlFinder;
 import org.schabi.newpipe.views.FocusOverlayView;
 
@@ -89,9 +94,6 @@ import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO;
-import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.VIDEO;
-
 /**
  * Get the url from the intent and open it in the chosen preferred player.
  */
@@ -107,6 +109,7 @@ public class RouterActivity extends AppCompatActivity {
     protected String currentUrl;
     private StreamingService currentService;
     private boolean selectionIsDownload = false;
+    private boolean selectionIsAddToPlaylist = false;
     private AlertDialog alertDialogChoice = null;
 
     @Override
@@ -350,7 +353,7 @@ public class RouterActivity extends AppCompatActivity {
                 .setNegativeButton(R.string.just_once, dialogButtonsClickListener)
                 .setPositiveButton(R.string.always, dialogButtonsClickListener)
                 .setOnDismissListener((dialog) -> {
-                    if (!selectionIsDownload) {
+                    if (!selectionIsDownload && !selectionIsAddToPlaylist) {
                         finish();
                     }
                 })
@@ -446,6 +449,10 @@ public class RouterActivity extends AppCompatActivity {
         final AdapterChoiceItem backgroundPlayer = new AdapterChoiceItem(
                 getString(R.string.background_player_key), getString(R.string.background_player),
                 R.drawable.ic_headset);
+        final AdapterChoiceItem addToPlaylist = new AdapterChoiceItem(
+                getString(R.string.add_to_playlist_key), getString(R.string.add_to_playlist),
+                R.drawable.ic_add);
+
 
         if (linkType == LinkType.STREAM) {
             if (isExtVideoEnabled) {
@@ -482,6 +489,10 @@ public class RouterActivity extends AppCompatActivity {
                     getString(R.string.download),
                     R.drawable.ic_file_download));
 
+            // Add to playlist is not necessary for CHANNEL and PLAYLIST linkType since those can
+            // not be added to a playlist
+            returnList.add(addToPlaylist);
+
         } else {
             returnList.add(showInfo);
             if (capabilities.contains(VIDEO) && !isExtVideoEnabled) {
@@ -547,6 +558,12 @@ public class RouterActivity extends AppCompatActivity {
             return;
         }
 
+        if (selectedChoiceKey.equals(getString(R.string.add_to_playlist_key))) {
+            selectionIsAddToPlaylist = true;
+            openAddToPlaylistDialog();
+            return;
+        }
+
         // stop and bypass FetcherService if InfoScreen was selected since
         // StreamDetailFragment can fetch data itself
         if (selectedChoiceKey.equals(getString(R.string.show_info_key))) {
@@ -572,6 +589,38 @@ public class RouterActivity extends AppCompatActivity {
         finish();
     }
 
+    private void openAddToPlaylistDialog() {
+        disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, false)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(info -> {
+                    final FragmentManager fm = getSupportFragmentManager();
+                    final PlaylistAppendDialog playlistAppendDialog = PlaylistAppendDialog
+                            .fromStreamInfo(info);
+
+                    playlistAppendDialog.setOnDismissListener(dialog -> finish());
+
+                    PlaylistAppendDialog.onPlaylistFound(getThemeWrapperContext(),
+                            () -> {
+                                playlistAppendDialog.show(fm, "addToPlaylistDialog");
+                                fm.executePendingTransactions();
+                            },
+                            () -> {
+                                final PlaylistCreationDialog playlistCreationDialog =
+                                        PlaylistCreationDialog.newInstance(playlistAppendDialog);
+                                playlistCreationDialog.show(fm, "addToPlaylistDialog");
+
+                                fm.executePendingTransactions();
+
+                            });
+
+                }, throwable -> handleError(this,
+                        new ErrorInfo(throwable, UserAction.REQUESTED_STREAM,
+                                "Tried to add " + currentUrl + " to a playlist",
+                                currentService.getServiceId())))
+        );
+    }
+
     @SuppressLint("CheckResult")
     private void openDownloadDialog() {
         disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, true)
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
index 93e1141c7..268848818 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
@@ -1,6 +1,8 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -40,6 +42,9 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
 
     private final CompositeDisposable playlistDisposables = new CompositeDisposable();
 
+    @Nullable
+    private OnDismissListener onDismissListener = null;
+
     public static Disposable onPlaylistFound(
             final Context context, final Runnable onSuccess, final Runnable onFailed
     ) {
@@ -83,6 +88,14 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         return dialog;
     }
 
+    public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    public OnDismissListener getOnDismissListener() {
+        return onDismissListener;
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // LifeCycle - Creation
     //////////////////////////////////////////////////////////////////////////*/
@@ -141,6 +154,14 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         playlistAdapter = null;
     }
 
+    @Override
+    public void onDismiss(@NonNull final DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Helper
     //////////////////////////////////////////////////////////////////////////*/
@@ -150,7 +171,12 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
             return;
         }
 
-        PlaylistCreationDialog.newInstance(getStreams()).show(getParentFragmentManager(), TAG);
+        final PlaylistCreationDialog dialog = PlaylistCreationDialog.newInstance(getStreams());
+        // Move the dismissListener to the new dialog.
+        dialog.setOnDismissListener(this.onDismissListener);
+        this.onDismissListener = null;
+
+        dialog.show(getParentFragmentManager(), TAG);
         requireDialog().dismiss();
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
index f48c72d04..55d6cec89 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
@@ -1,6 +1,8 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
 import android.os.Bundle;
 import android.text.InputType;
 import android.widget.Toast;
@@ -20,6 +22,9 @@ import java.util.List;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 public final class PlaylistCreationDialog extends PlaylistDialog {
+    @Nullable
+    private OnDismissListener onDismissListener = null;
+
     public static PlaylistCreationDialog newInstance(final List<StreamEntity> streams) {
         final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
         dialog.setInfo(streams);
@@ -29,9 +34,22 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
     public static PlaylistCreationDialog newInstance(final PlaylistAppendDialog appendDialog) {
         final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
         dialog.setInfo(appendDialog.getStreams());
+        dialog.setOnDismissListener(appendDialog.getOnDismissListener());
         return dialog;
     }
 
+    public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    @Override
+    public void onDismiss(@NonNull final DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // Dialog
     //////////////////////////////////////////////////////////////////////////*/
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 9261dfae1..4d9927b0d 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -360,6 +360,7 @@
     <string name="popup_player_key" translatable="false">popup_player</string>
     <string name="download_key" translatable="false">download</string>
     <string name="always_ask_open_action_key" translatable="false">always_ask_player</string>
+    <string name="add_to_playlist_key" translatable="false">add_to_playlist</string>
 
     <string-array name="preferred_open_action_description_list" translatable="false">
         <item>@string/show_info</item>
@@ -368,6 +369,7 @@
         <item>@string/popup_player</item>
         <item>@string/download</item>
         <item>@string/always_ask_open_action</item>
+        <item>@string/add_to_playlist</item>
     </string-array>
     <string-array name="preferred_open_action_values_list" translatable="false">
         <item>@string/show_info_key</item>
@@ -376,6 +378,7 @@
         <item>@string/popup_player_key</item>
         <item>@string/download_key</item>
         <item>@string/always_ask_open_action_key</item>
+        <item>@string/add_to_playlist_key</item>
     </string-array>
 
     <!-- Updates -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 225ccd126..0497d2660 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -433,6 +433,7 @@
     <string name="background_player">Background player</string>
     <string name="popup_player">Popup player</string>
     <string name="always_ask_open_action">Always ask</string>
+    <string name="add_to_playlist">Add to playlist</string>
     <string name="preferred_player_fetcher_notification_title">Getting info…</string>
     <string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
     <!-- Local Playlist -->

From 87c958b2e711d70ce516ecbc4785d96d7ebc6e2b Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Sun, 3 Oct 2021 13:27:24 +0200
Subject: [PATCH 2/8] Rename the "append_playlist" string to "add_to_playlist"

---
 .../main/java/org/schabi/newpipe/util/StreamDialogEntry.java  | 2 +-
 app/src/main/res/layout-large-land/fragment_video_detail.xml  | 2 +-
 app/src/main/res/layout/fragment_video_detail.xml             | 2 +-
 app/src/main/res/menu/menu_play_queue.xml                     | 2 +-
 app/src/main/res/menu/menu_play_queue_item.xml                | 2 +-
 app/src/main/res/values-ar/strings.xml                        | 2 +-
 app/src/main/res/values-b+ast/strings.xml                     | 2 +-
 app/src/main/res/values-b+uz+Latn/strings.xml                 | 2 +-
 app/src/main/res/values-b+zh+HANS+CN/strings.xml              | 2 +-
 app/src/main/res/values-be/strings.xml                        | 2 +-
 app/src/main/res/values-bg/strings.xml                        | 2 +-
 app/src/main/res/values-bn-rBD/strings.xml                    | 2 +-
 app/src/main/res/values-bn-rIN/strings.xml                    | 2 +-
 app/src/main/res/values-bn/strings.xml                        | 2 +-
 app/src/main/res/values-ca/strings.xml                        | 2 +-
 app/src/main/res/values-ckb/strings.xml                       | 2 +-
 app/src/main/res/values-cs/strings.xml                        | 2 +-
 app/src/main/res/values-da/strings.xml                        | 2 +-
 app/src/main/res/values-de/strings.xml                        | 2 +-
 app/src/main/res/values-el/strings.xml                        | 2 +-
 app/src/main/res/values-eo/strings.xml                        | 2 +-
 app/src/main/res/values-es/strings.xml                        | 2 +-
 app/src/main/res/values-et/strings.xml                        | 2 +-
 app/src/main/res/values-eu/strings.xml                        | 2 +-
 app/src/main/res/values-fa/strings.xml                        | 2 +-
 app/src/main/res/values-fi/strings.xml                        | 2 +-
 app/src/main/res/values-fr/strings.xml                        | 2 +-
 app/src/main/res/values-gl/strings.xml                        | 2 +-
 app/src/main/res/values-he/strings.xml                        | 2 +-
 app/src/main/res/values-hi/strings.xml                        | 2 +-
 app/src/main/res/values-hr/strings.xml                        | 2 +-
 app/src/main/res/values-hu/strings.xml                        | 2 +-
 app/src/main/res/values-in/strings.xml                        | 2 +-
 app/src/main/res/values-it/strings.xml                        | 2 +-
 app/src/main/res/values-ja/strings.xml                        | 2 +-
 app/src/main/res/values-kmr/strings.xml                       | 2 +-
 app/src/main/res/values-ko/strings.xml                        | 2 +-
 app/src/main/res/values-ku/strings.xml                        | 2 +-
 app/src/main/res/values-lt/strings.xml                        | 2 +-
 app/src/main/res/values-lv/strings.xml                        | 2 +-
 app/src/main/res/values-mk/strings.xml                        | 2 +-
 app/src/main/res/values-ml/strings.xml                        | 2 +-
 app/src/main/res/values-ms/strings.xml                        | 2 +-
 app/src/main/res/values-nb-rNO/strings.xml                    | 2 +-
 app/src/main/res/values-ne/strings.xml                        | 2 +-
 app/src/main/res/values-nl-rBE/strings.xml                    | 2 +-
 app/src/main/res/values-nl/strings.xml                        | 2 +-
 app/src/main/res/values-pa/strings.xml                        | 2 +-
 app/src/main/res/values-pl/strings.xml                        | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml                    | 2 +-
 app/src/main/res/values-pt-rPT/strings.xml                    | 2 +-
 app/src/main/res/values-pt/strings.xml                        | 2 +-
 app/src/main/res/values-ro/strings.xml                        | 2 +-
 app/src/main/res/values-ru/strings.xml                        | 2 +-
 app/src/main/res/values-sc/strings.xml                        | 2 +-
 app/src/main/res/values-sk/strings.xml                        | 2 +-
 app/src/main/res/values-sl/strings.xml                        | 2 +-
 app/src/main/res/values-so/strings.xml                        | 2 +-
 app/src/main/res/values-sq/strings.xml                        | 2 +-
 app/src/main/res/values-sr/strings.xml                        | 2 +-
 app/src/main/res/values-sv/strings.xml                        | 2 +-
 app/src/main/res/values-th/strings.xml                        | 2 +-
 app/src/main/res/values-tr/strings.xml                        | 2 +-
 app/src/main/res/values-uk/strings.xml                        | 2 +-
 app/src/main/res/values-ur/strings.xml                        | 2 +-
 app/src/main/res/values-vi/strings.xml                        | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                    | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml                    | 2 +-
 app/src/main/res/values/settings_keys.xml                     | 4 ++--
 app/src/main/res/values/strings.xml                           | 3 +--
 70 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index ec51cc370..11cc4daba 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -81,7 +81,7 @@ public enum StreamDialogEntry {
     delete(R.string.delete, (fragment, item) -> {
     }), // has to be set manually
 
-    append_playlist(R.string.append_playlist, (fragment, item) -> {
+    append_playlist(R.string.add_to_playlist, (fragment, item) -> {
         final PlaylistAppendDialog d = PlaylistAppendDialog
                 .fromStreamInfoItems(Collections.singletonList(item));
 
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 3bee4bf9a..d2637110f 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -444,7 +444,7 @@
                                 android:layout_weight="1"
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
-                                android:contentDescription="@string/append_playlist"
+                                android:contentDescription="@string/add_to_playlist"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 165c690dd..6853ca7de 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -430,7 +430,7 @@
                             android:layout_weight="1"
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
-                            android:contentDescription="@string/append_playlist"
+                            android:contentDescription="@string/add_to_playlist"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
diff --git a/app/src/main/res/menu/menu_play_queue.xml b/app/src/main/res/menu/menu_play_queue.xml
index 0efadcb66..e8c9ab0ec 100644
--- a/app/src/main/res/menu/menu_play_queue.xml
+++ b/app/src/main/res/menu/menu_play_queue.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/action_append_playlist"
         android:icon="@drawable/ic_playlist_add"
-        android:title="@string/append_playlist"
+        android:title="@string/add_to_playlist"
         android:visible="true"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_play_queue_item.xml b/app/src/main/res/menu/menu_play_queue_item.xml
index ebb361be9..be5513708 100644
--- a/app/src/main/res/menu/menu_play_queue_item.xml
+++ b/app/src/main/res/menu/menu_play_queue_item.xml
@@ -9,7 +9,7 @@
         android:title="@string/play_queue_stream_detail" />
     <item
         android:id="@+id/menu_item_append_playlist"
-        android:title="@string/append_playlist" />
+        android:title="@string/add_to_playlist" />
     <item
         android:id="@+id/menu_item_share"
         android:title="@string/share" />
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f90a82c44..55f41563c 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -235,7 +235,7 @@
     <string name="create_playlist">إنشاء قائمة تشغيل جديدة</string>
     <string name="rename_playlist">إعادة تسمية</string>
     <string name="name">التسمية</string>
-    <string name="append_playlist">إضافة إلى قائمة التشغيل</string>
+    <string name="add_to_playlist">إضافة إلى قائمة التشغيل</string>
     <string name="delete_playlist_prompt">هل تريد حذف قائمة التشغيل هذه؟</string>
     <string name="playlist_creation_success">تم إنشاء قائمة التشغيل</string>
     <string name="playlist_add_stream_success">تمت إضافتها إلى قائمة التشغيل</string>
diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml
index 213ef6f48..19ed896f0 100644
--- a/app/src/main/res/values-b+ast/strings.xml
+++ b/app/src/main/res/values-b+ast/strings.xml
@@ -132,7 +132,7 @@
     <string name="dismiss">Escartar</string>
     <string name="create_playlist">Llista de reproducción nueva</string>
     <string name="name">Nome</string>
-    <string name="append_playlist">Amestar a una llista de reproducción</string>
+    <string name="add_to_playlist">Amestar a una llista de reproducción</string>
     <string name="delete_playlist_prompt">¿Desanicair esta llista de reproducción\?</string>
     <string name="caption_none">Ensin sotítulos</string>
     <string name="resize_fit">Axustar</string>
diff --git a/app/src/main/res/values-b+uz+Latn/strings.xml b/app/src/main/res/values-b+uz+Latn/strings.xml
index 16f28dc09..4d4602daa 100644
--- a/app/src/main/res/values-b+uz+Latn/strings.xml
+++ b/app/src/main/res/values-b+uz+Latn/strings.xml
@@ -534,7 +534,7 @@
     <string name="set_as_playlist_thumbnail">Pleylist eskizi sifatida o\'rnating</string>
     <string name="unmute">Unmute rejimi</string>
     <string name="mute">Mute rejimi</string>
-    <string name="append_playlist">Playlist qo\'shish</string>
+    <string name="add_to_playlist">Playlist qo\'shish</string>
     <string name="name">Nomi</string>
     <string name="rename_playlist">Nomni o\'zgartirish</string>
     <string name="create_playlist">Yangi Playlist</string>
diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
index 9670c318d..20b01f605 100644
--- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml
+++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml
@@ -259,7 +259,7 @@
     <string name="create_playlist">新建播放列表</string>
     <string name="rename_playlist">重命名</string>
     <string name="name">名称</string>
-    <string name="append_playlist">添加至播放列表</string>
+    <string name="add_to_playlist">添加至播放列表</string>
     <string name="set_as_playlist_thumbnail">设为播放列表封面</string>
     <string name="bookmark_playlist">收藏播放列表</string>
     <string name="unbookmark_playlist">删除收藏</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 46eedac34..4b185b301 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -274,7 +274,7 @@
     <string name="create_playlist">Стварыць плэйліст</string>
     <string name="rename_playlist">Перайменаваць</string>
     <string name="name">Імя</string>
-    <string name="append_playlist">Дадаць у плэйліст</string>
+    <string name="add_to_playlist">Дадаць у плэйліст</string>
     <string name="set_as_playlist_thumbnail">На мініяцюру плэйліста</string>
     <string name="bookmark_playlist">Дадаць плэйліст у закладкі</string>
     <string name="unbookmark_playlist">Выдаліць закладку</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index f1edfa124..1c16e225b 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -267,7 +267,7 @@
     <string name="create_playlist">Нов Плейлист</string>
     <string name="rename_playlist">Преименувай</string>
     <string name="name">Име</string>
-    <string name="append_playlist">Добави Към Плейлист</string>
+    <string name="add_to_playlist">Добави Към Плейлист</string>
     <string name="set_as_playlist_thumbnail">Задай като миниатюра на плейлиста</string>
     <string name="bookmark_playlist">Миниатюрата на плейлиста е сменена</string>
     <string name="unbookmark_playlist">Премахни отметката</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 6198b926e..d561d52e8 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -188,7 +188,7 @@
     <string name="unbookmark_playlist">বুকমার্ক মুছুন</string>
     <string name="unmute">আন মিউট</string>
     <string name="mute">মিউট</string>
-    <string name="append_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
+    <string name="add_to_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
     <string name="name">নাম</string>
     <string name="create_playlist">নতুন প্লে লিস্ট</string>
     <string name="always_ask_open_action">সবসময় জিজ্ঞেস করুন</string>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 79ce1caaa..831364013 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -167,7 +167,7 @@
     <string name="delete_playlist_prompt">প্লে লিস্ট ডিলিট করতে চান\?</string>
     <string name="unmute">আন মিউট</string>
     <string name="mute">মিউট</string>
-    <string name="append_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
+    <string name="add_to_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
     <string name="always_ask_open_action">সবসময় জিজ্ঞেস করুন</string>
     <string name="video_player">ভিডিও প্লেয়ার</string>
     <string name="drawer_close">ড্রয়ার বন্ধ করুন</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index a2f9dec31..11225e706 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -37,7 +37,7 @@
     <string name="unbookmark_playlist">বুকমার্ক মুছুন</string>
     <string name="unmute">আন মিউট</string>
     <string name="mute">মিউট</string>
-    <string name="append_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
+    <string name="add_to_playlist">প্লে লিস্ট এ যুক্ত করুন</string>
     <string name="name">নাম</string>
     <string name="rename_playlist">নাম পাল্টাও</string>
     <string name="create_playlist">নতুন প্লে লিস্ট</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index cbd725c77..5e1d1b201 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -86,7 +86,7 @@
     <string name="create_playlist">Crea una llista de reproducció</string>
     <string name="rename_playlist">Canvia el nom</string>
     <string name="name">Nom</string>
-    <string name="append_playlist">Afegeix a una llista de reproducció</string>
+    <string name="add_to_playlist">Afegeix a una llista de reproducció</string>
     <string name="import_title">Importa</string>
     <string name="import_from">Importa des de</string>
     <string name="export_to">Exporta a</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index b04048c5f..65af5ffff 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -403,7 +403,7 @@
     <string name="msg_name">ناوفایل</string>
     <string name="set_as_playlist_thumbnail">دانان لەسەر وێنۆچکەی خشتەلێدان</string>
     <string name="title_activity_about">دەربارەی نیوپایپ</string>
-    <string name="append_playlist">زیادکردن بۆ خشتەلێدان</string>
+    <string name="add_to_playlist">زیادکردن بۆ خشتەلێدان</string>
     <string name="unknown_content">(نەزانراو)</string>
     <string name="app_language_title">زمانی به‌رنامه‌</string>
     <string name="kiosk_page_summary">پەڕەی کیۆسک</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1791c1794..5a4091db5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -234,7 +234,7 @@
     <string name="create_playlist">Nový playlist</string>
     <string name="rename_playlist">Přejmenovat</string>
     <string name="name">Jméno</string>
-    <string name="append_playlist">Přidat do playlistu</string>
+    <string name="add_to_playlist">Přidat do playlistu</string>
     <string name="set_as_playlist_thumbnail">Nastavit jako miniaturu playlistu</string>
     <string name="bookmark_playlist">Přidat playlist do záložek</string>
     <string name="unbookmark_playlist">Smazat záložku</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 158ec44ec..d59c35edb 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -270,7 +270,7 @@
     <string name="create_playlist">Ny spilleliste</string>
     <string name="rename_playlist">Omdøb</string>
     <string name="name">Navn</string>
-    <string name="append_playlist">Føj til spilleliste</string>
+    <string name="add_to_playlist">Føj til spilleliste</string>
     <string name="delete_playlist_prompt">Slet denne spilleliste\?</string>
     <string name="playlist_creation_success">Spilleliste oprettet</string>
     <string name="caption_none">Ingen undertekster</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index ca4d3e4d9..105646a16 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -228,7 +228,7 @@
     <string name="always_ask_open_action">Immer fragen</string>
     <string name="create_playlist">Neue Wiedergabeliste</string>
     <string name="rename_playlist">Umbenennen</string>
-    <string name="append_playlist">Zur Wiedergabeliste hinzufügen</string>
+    <string name="add_to_playlist">Zur Wiedergabeliste hinzufügen</string>
     <string name="set_as_playlist_thumbnail">Als Vorschaubild der Wiedergabeliste festlegen</string>
     <string name="unbookmark_playlist">Lesezeichen entfernen</string>
     <string name="delete_playlist_prompt">Diese Wiedergabeliste löschen?</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 3d4343195..1775e1ca8 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -270,7 +270,7 @@
     <string name="create_playlist">Νέα λίστα αναπαραγωγής</string>
     <string name="rename_playlist">Μετονομασία</string>
     <string name="name">Όνομα</string>
-    <string name="append_playlist">Προσθήκη σε λίστα αναπαραγωγής</string>
+    <string name="add_to_playlist">Προσθήκη σε λίστα αναπαραγωγής</string>
     <string name="set_as_playlist_thumbnail">Ορισμός ως μικρογραφία λίστας αναπαραγωγής</string>
     <string name="bookmark_playlist">Προσθήκη σελιδοδείκτη στη λίστα</string>
     <string name="unbookmark_playlist">Διαγραφή σελιδοδείκτη</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 50cdf09b3..769272345 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -153,7 +153,7 @@
     <string name="create_playlist">Nova ludlisto</string>
     <string name="rename_playlist">Alinomi</string>
     <string name="name">Nomo</string>
-    <string name="append_playlist">Aldoni al la ludlisto</string>
+    <string name="add_to_playlist">Aldoni al la ludlisto</string>
     <string name="set_as_playlist_thumbnail">Meti kiel bildeto de ludlisto</string>
     <string name="bookmark_playlist">Legosigno Ludlisto</string>
     <string name="unbookmark_playlist">Forviŝi Legosignon</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bb5819ff9..1937ca144 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -231,7 +231,7 @@
     <string name="create_playlist">Lista de reproducción nueva</string>
     <string name="rename_playlist">Cambiar nombre</string>
     <string name="name">Nombre</string>
-    <string name="append_playlist">Añadir a la lista de reproducción</string>
+    <string name="add_to_playlist">Añadir a la lista de reproducción</string>
     <string name="set_as_playlist_thumbnail">Definir como miniatura de lista de reproducción</string>
     <string name="bookmark_playlist">Marcar lista de reproducción</string>
     <string name="unbookmark_playlist">Quitar marcador</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 1321806f5..107c0f624 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -256,7 +256,7 @@
     <string name="create_playlist">Uus esitusloend</string>
     <string name="rename_playlist">Nimeta ümber</string>
     <string name="name">Nimi</string>
-    <string name="append_playlist">Lisa esitusloendisse</string>
+    <string name="add_to_playlist">Lisa esitusloendisse</string>
     <string name="set_as_playlist_thumbnail">Määra esitusloendi pisipildiks</string>
     <string name="bookmark_playlist">Lisa esitusloend järjehoidjaks</string>
     <string name="unbookmark_playlist">Eemalda järjehoidja</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9ca4bfae6..5b8161bf2 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -259,7 +259,7 @@
     <string name="create_playlist">Erreprodukzio-zerrenda berria</string>
     <string name="rename_playlist">Aldatu izena</string>
     <string name="name">Izena</string>
-    <string name="append_playlist">Gehitu erreprodukzio-zerrendara</string>
+    <string name="add_to_playlist">Gehitu erreprodukzio-zerrendara</string>
     <string name="set_as_playlist_thumbnail">Ezarri erreprodukzio-zerrendaren iruditxo gisa</string>
     <string name="bookmark_playlist">Gogoko erreprodukzio-zerrenda</string>
     <string name="unbookmark_playlist">Kendu gogokoa</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e66825b96..58f6cef81 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -217,7 +217,7 @@
     <string name="create_playlist">فهرست پخش جدید</string>
     <string name="rename_playlist">تغییر نام</string>
     <string name="name">نام</string>
-    <string name="append_playlist">افزودن به سیاههٔ پخش</string>
+    <string name="add_to_playlist">افزودن به سیاههٔ پخش</string>
     <string name="set_as_playlist_thumbnail">تنظیم برای تصویر سیاههٔ پخش</string>
     <string name="delete_playlist_prompt">این فهرست پخش پاک شود؟</string>
     <string name="playlist_creation_success">فهرست پخش ایجاد شد</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 25ae94dd5..cd6777b5e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -271,7 +271,7 @@
     <string name="create_playlist">Uusi soittolista</string>
     <string name="rename_playlist">Uudelleennimeä</string>
     <string name="name">Nimi</string>
-    <string name="append_playlist">Lisää soittolistaan</string>
+    <string name="add_to_playlist">Lisää soittolistaan</string>
     <string name="set_as_playlist_thumbnail">Aseta soittolistan kuvakkeeksi</string>
     <string name="bookmark_playlist">Tallenna soittolista kirjanmerkkeihin</string>
     <string name="unbookmark_playlist">Poista kirjanmerkki</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f4226497a..8d27ddff9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -230,7 +230,7 @@
     <string name="create_playlist">Nouvelle liste de lecture</string>
     <string name="rename_playlist">Renommer</string>
     <string name="name">Nom</string>
-    <string name="append_playlist">Ajouter à la liste de lecture</string>
+    <string name="add_to_playlist">Ajouter à la liste de lecture</string>
     <string name="set_as_playlist_thumbnail">Définir comme miniature de la liste de lecture</string>
     <string name="bookmark_playlist">Enregister la liste de lecture</string>
     <string name="unbookmark_playlist">Supprimer le signet</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 185fdda9a..f22ecff86 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -270,7 +270,7 @@
     <string name="create_playlist">Nova lista de reprodución</string>
     <string name="rename_playlist">Renomear</string>
     <string name="name">Nome</string>
-    <string name="append_playlist">Engadir á lista de reprodución</string>
+    <string name="add_to_playlist">Engadir á lista de reprodución</string>
     <string name="set_as_playlist_thumbnail">Estabelecer como miniatura da lista de reprodución</string>
     <string name="bookmark_playlist">Gardar a lista de reprodución nos marcadores</string>
     <string name="unbookmark_playlist">Eliminar o marcador</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6bc06eb3e..1d054155a 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -240,7 +240,7 @@
     <string name="create_playlist">רשימת נגינה חדשה</string>
     <string name="rename_playlist">שינוי שם</string>
     <string name="name">שם</string>
-    <string name="append_playlist">הוספה לרשימת נגינה</string>
+    <string name="add_to_playlist">הוספה לרשימת נגינה</string>
     <string name="bookmark_playlist">הוספת רשימת נגינה לסימניות</string>
     <string name="unbookmark_playlist">הסרת סימנייה</string>
     <string name="delete_playlist_prompt">למחוק רשימת נגינה זו\?</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 6402fc638..5f295bda8 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -230,7 +230,7 @@
     <string name="create_playlist">नई प्लेलिस्ट</string>
     <string name="rename_playlist">नाम बदलें</string>
     <string name="name">नाम</string>
-    <string name="append_playlist">प्लेलिस्ट में जोड़ें</string>
+    <string name="add_to_playlist">प्लेलिस्ट में जोड़ें</string>
     <string name="set_as_playlist_thumbnail">प्लेलिस्ट थंबनेल के रूप में सेट करें</string>
     <string name="bookmark_playlist">प्लेलिस्ट बुकमार्क करें</string>
     <string name="unbookmark_playlist">बुकमार्क हटायें</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 88e79451e..1f8ef42a0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -202,7 +202,7 @@
     <string name="create_playlist">Nova playlista</string>
     <string name="rename_playlist">Preimenuj</string>
     <string name="name">Ime</string>
-    <string name="append_playlist">Dodaj u playlistu</string>
+    <string name="add_to_playlist">Dodaj u playlistu</string>
     <string name="set_as_playlist_thumbnail">Postavi kao minijaturu playliste</string>
     <string name="bookmark_playlist">Zabilježi playlistu</string>
     <string name="unbookmark_playlist">Ukloni zabilješku</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ca1913403..e19fade83 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -254,7 +254,7 @@
     <string name="create_playlist">Új lejátszási lista</string>
     <string name="rename_playlist">Átnevezés</string>
     <string name="name">Név</string>
-    <string name="append_playlist">Lejátszási listához adás</string>
+    <string name="add_to_playlist">Lejátszási listához adás</string>
     <string name="set_as_playlist_thumbnail">Beállítás lejátszási lista indexképeként</string>
     <string name="unbookmark_playlist">Könyvjelző törlése</string>
     <string name="delete_playlist_prompt">Törlődjön ez a lejátszási lista\?</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index b6cd2a7e2..c9fa4cebe 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -229,7 +229,7 @@
     <string name="create_playlist">Daftar Putar Baru</string>
     <string name="rename_playlist">Ubah Nama</string>
     <string name="name">Nama</string>
-    <string name="append_playlist">Tambah ke daftar putar</string>
+    <string name="add_to_playlist">Tambah ke daftar putar</string>
     <string name="set_as_playlist_thumbnail">Atur sebagai thumbnail daftar putar</string>
     <string name="bookmark_playlist">Markah Daftar Putar</string>
     <string name="unbookmark_playlist">Hapus Markah</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index af9d529d3..2ee99d452 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -231,7 +231,7 @@
     <string name="create_playlist">Nuova playlist</string>
     <string name="rename_playlist">Rinomina</string>
     <string name="name">Nome</string>
-    <string name="append_playlist">Aggiungi alla playlist</string>
+    <string name="add_to_playlist">Aggiungi alla playlist</string>
     <string name="set_as_playlist_thumbnail">Imposta come copertina della playlist</string>
     <string name="bookmark_playlist">Salva playlist</string>
     <string name="unbookmark_playlist">Rimuovi playlist</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 769a31b52..f2540f205 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -221,7 +221,7 @@
     <string name="create_playlist">新規プレイリスト</string>
     <string name="rename_playlist">変更</string>
     <string name="name">プレイリスト名</string>
-    <string name="append_playlist">プレイリストに追加</string>
+    <string name="add_to_playlist">プレイリストに追加</string>
     <string name="set_as_playlist_thumbnail">プレイリストのサムネイルに設定</string>
     <string name="bookmark_playlist">プレイリストをブックマーク</string>
     <string name="unbookmark_playlist">ブックマークを削除</string>
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
index 3fa5f2f45..d7ac85dd1 100644
--- a/app/src/main/res/values-kmr/strings.xml
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -498,7 +498,7 @@
     <string name="set_as_playlist_thumbnail">Wekî Thumbnailê Lîsteya Lîsteyê saz bikin</string>
     <string name="unmute">Bê deng kirin</string>
     <string name="mute">Bêdeng</string>
-    <string name="append_playlist">Li lîsteyê zêde bike</string>
+    <string name="add_to_playlist">Li lîsteyê zêde bike</string>
     <string name="name">Nav</string>
     <string name="rename_playlist">Navlêkirin</string>
     <string name="create_playlist">Lîstinê ya nû</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index aaf02a5dd..880c45aee 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -230,7 +230,7 @@
     <string name="create_playlist">새로운 재생목록</string>
     <string name="rename_playlist">이름 바꾸기</string>
     <string name="name">이름</string>
-    <string name="append_playlist">재생목록에 추가</string>
+    <string name="add_to_playlist">재생목록에 추가</string>
     <string name="set_as_playlist_thumbnail">재생목록 썸네일로 설정</string>
     <string name="bookmark_playlist">재생목록 북마크하기</string>
     <string name="unbookmark_playlist">북마크 제거하기</string>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 2cdd31d3b..be2a8086f 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -212,7 +212,7 @@
     <string name="create_playlist">لیستەلێدانی نوێ</string>
     <string name="rename_playlist">ناولێنانەوە</string>
     <string name="name">ناو</string>
-    <string name="append_playlist">زیادکردن بۆ لیستەلێدان</string>
+    <string name="add_to_playlist">زیادکردن بۆ لیستەلێدان</string>
     <string name="set_as_playlist_thumbnail">دانان لەسەر وێنۆچکەی لیستەلێدان</string>
     <string name="bookmark_playlist">لیستەلێدانی نیشانەکراو</string>
     <string name="unbookmark_playlist">لادانی نیشانەکراو</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index dae17e3ff..d0249568e 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -235,7 +235,7 @@
     <string name="create_playlist">Naujas grojaraštį</string>
     <string name="rename_playlist">Pervadinti</string>
     <string name="name">Pavadinimas</string>
-    <string name="append_playlist">Pridėti į grojaraštį</string>
+    <string name="add_to_playlist">Pridėti į grojaraštį</string>
     <string name="set_as_playlist_thumbnail">Nustatyti kaip grojaraščio miniatiūrą</string>
     <string name="bookmark_playlist">Pridėti grojaraštį į žymes</string>
     <string name="unbookmark_playlist">Pašalinti žymes</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 01167c426..58d40b61d 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -5,7 +5,7 @@
     <string name="playlist_creation_success">Atskaņošanas saraksts radīts</string>
     <string name="delete_playlist_prompt">Dzēst atskaņošanas sarakstu\?</string>
     <string name="set_as_playlist_thumbnail">Iestatīt, kā atskaņošanas saraksta attēlu</string>
-    <string name="append_playlist">Pievienot atskaņošanas sarakstam</string>
+    <string name="add_to_playlist">Pievienot atskaņošanas sarakstam</string>
     <string name="name">Vārds</string>
     <string name="rename_playlist">Pārsaukt</string>
     <string name="create_playlist">Jauns Atskaņošanas Saraksts</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c0e16def2..d925e2970 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -248,7 +248,7 @@
     <string name="create_playlist">Создај нова плејлиста</string>
     <string name="rename_playlist">Прекрсти плејлиста</string>
     <string name="name">Име</string>
-    <string name="append_playlist">Додај во плејлиста</string>
+    <string name="add_to_playlist">Додај во плејлиста</string>
     <string name="set_as_playlist_thumbnail">Постави како икона на плејлистата</string>
     <string name="bookmark_playlist">Обележи ја плејлистата</string>
     <string name="unbookmark_playlist">Избриши ја белешката</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 20372cbb9..eb78ca44c 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -54,7 +54,7 @@
     <string name="set_as_playlist_thumbnail">പ്ലേലിസ്റ്റ് ലഘുചിത്രമായി സജ്ജമാക്കുക</string>
     <string name="unmute">അൺമ്യൂട്ട്</string>
     <string name="mute">മ്യൂട്ട്</string>
-    <string name="append_playlist">പ്ലേലിസ്റ്റിലേക്ക് ചേർക്കുക</string>
+    <string name="add_to_playlist">പ്ലേലിസ്റ്റിലേക്ക് ചേർക്കുക</string>
     <string name="name">പേര്</string>
     <string name="rename_playlist">പേര് മാറ്റുക</string>
     <string name="create_playlist">പുതിയ പ്ലേലിസ്റ്റ്</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index ddf04c1e2..76aef646f 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -284,7 +284,7 @@
     <string name="create_playlist">Senarai Main Baru</string>
     <string name="rename_playlist">Namakan semula</string>
     <string name="name">Nama</string>
-    <string name="append_playlist">Tambah ke Senarai Main</string>
+    <string name="add_to_playlist">Tambah ke Senarai Main</string>
     <string name="set_as_playlist_thumbnail">Tetapkan sebagai Thumbnail Senarai Main</string>
     <string name="bookmark_playlist">Menanda senarai main</string>
     <string name="unbookmark_playlist">Hapuskan Penanda Halaman</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index b7c370900..9cce73360 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -231,7 +231,7 @@
     <string name="create_playlist">Ny spilleliste</string>
     <string name="rename_playlist">Gi nytt navn</string>
     <string name="name">Navn</string>
-    <string name="append_playlist">Legg til i spilleliste</string>
+    <string name="add_to_playlist">Legg til i spilleliste</string>
     <string name="set_as_playlist_thumbnail">Sett som miniatyrbilde for spilleliste</string>
     <string name="bookmark_playlist">Bokmerk spilleliste</string>
     <string name="unbookmark_playlist">Fjern bokmerke</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index f26e8a051..71c9e107f 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -292,7 +292,7 @@
     <string name="create_playlist">नया प्लेलिस्ट</string>
     <string name="rename_playlist">पुनः नामकरण</string>
     <string name="name">नाम</string>
-    <string name="append_playlist">प्लेसूचीमा थप्नुहोस</string>
+    <string name="add_to_playlist">प्लेसूचीमा थप्नुहोस</string>
     <string name="set_as_playlist_thumbnail">प्लेलिस्ट थम्बनेल रूपमा सेट</string>
     <string name="bookmark_playlist">बुकमार्क प्लेलिस्ट</string>
     <string name="unbookmark_playlist">बुकमार्क हटाउ</string>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index 5190e814e..be7627079 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -252,7 +252,7 @@
     <string name="create_playlist">Nieuwe afspeellijst</string>
     <string name="rename_playlist">Hernoemen</string>
     <string name="name">Naam</string>
-    <string name="append_playlist">Toevoegen aan afspeellijst</string>
+    <string name="add_to_playlist">Toevoegen aan afspeellijst</string>
     <string name="set_as_playlist_thumbnail">Instellen als miniatuur voor afspeellijst</string>
     <string name="bookmark_playlist">Afspeellijst toevoegen aan bladwijzers</string>
     <string name="unbookmark_playlist">Bladwijzer verwijderen</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index f33e5d9cd..b835c68dc 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -231,7 +231,7 @@
     <string name="create_playlist">Nieuwe afspeellijst</string>
     <string name="rename_playlist">Naam wijzigen</string>
     <string name="name">Naam</string>
-    <string name="append_playlist">Toevoegen aan afspeellijst</string>
+    <string name="add_to_playlist">Toevoegen aan afspeellijst</string>
     <string name="set_as_playlist_thumbnail">Instellen als miniatuur voor afspeellijst</string>
     <string name="bookmark_playlist">Afspeellijst toevoegen aan bladwijzers</string>
     <string name="unbookmark_playlist">Bladwijzer verwijderen</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 75f40b725..8fad329f3 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -259,7 +259,7 @@
     <string name="create_playlist">ਨਵੀਂ ਪਲੇ-ਲਿਸਟ</string>
     <string name="rename_playlist">ਨਾਮ ਬਦਲੋ</string>
     <string name="name">ਨਾਮ</string>
-    <string name="append_playlist">ਪਲੇ-ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
+    <string name="add_to_playlist">ਪਲੇ-ਸੂਚੀ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
     <string name="set_as_playlist_thumbnail">ਬਤੌਰ ਪਲੇ-ਸੂਚੀ ਥਮਨੇਲ ਸੈੱਟ ਕਰੋ</string>
     <string name="bookmark_playlist">ਬੁੱਕਮਾਰਕ ਪਲੇ-ਲਿਸਟ</string>
     <string name="unbookmark_playlist">ਬੁੱਕਮਾਰਕ ਹਟਾਓ</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0de5abcf0..b4de246eb 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -238,7 +238,7 @@
     <string name="create_playlist">Nowa playlista</string>
     <string name="rename_playlist">Zmień nazwę</string>
     <string name="name">Nazwa</string>
-    <string name="append_playlist">Dodaj do playlisty</string>
+    <string name="add_to_playlist">Dodaj do playlisty</string>
     <string name="set_as_playlist_thumbnail">Ustaw jako miniaturę playlisty</string>
     <string name="bookmark_playlist">Dodaj do ulubionych</string>
     <string name="unbookmark_playlist">Usuń z ulubionych</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1f53db3ce..7c85328d0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -229,7 +229,7 @@
     <string name="create_playlist">Nova playlist</string>
     <string name="rename_playlist">Renomear</string>
     <string name="name">Nome</string>
-    <string name="append_playlist">Adicionar à Playlist</string>
+    <string name="add_to_playlist">Adicionar à Playlist</string>
     <string name="set_as_playlist_thumbnail">Definir Como Capa da Playlist</string>
     <string name="bookmark_playlist">Favoritar playlist</string>
     <string name="unbookmark_playlist">Desfavoritar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index ad4bb5061..4fa8e4e18 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -504,7 +504,7 @@
     <string name="use_inexact_seek_title">Utilizar pesquisa rápida</string>
     <string name="override_current_data">Está prestes a substituir a configuração atual.</string>
     <string name="switch_to_popup">Mudar para popup</string>
-    <string name="append_playlist">Adicionar à lista de reprodução</string>
+    <string name="add_to_playlist">Adicionar à lista de reprodução</string>
     <string name="popup_playing_toast">Reproduzir no modo poppup</string>
     <string name="feed_use_dedicated_fetch_method_help_text">Acha que a fonte demora muito tempo a carregar\? Se sim, tente ativar o carregamento rápido (pode alterar a opção nas definições ou no botão abaixo).
 \n
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 7b8cd4cdc..c1d95a797 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -242,7 +242,7 @@
     <string name="preferred_player_fetcher_notification_message">A carregar o conteúdo solicitado</string>
     <string name="create_playlist">Nova lista de reprodução</string>
     <string name="rename_playlist">Mudar nome</string>
-    <string name="append_playlist">Adicionar à lista de reprodução</string>
+    <string name="add_to_playlist">Adicionar à lista de reprodução</string>
     <string name="bookmark_playlist">Guardar lista de reprodução como favorita</string>
     <string name="unbookmark_playlist">Remover marcador</string>
     <string name="delete_playlist_prompt">Eliminar esta lista de reprodução\?</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 81c116cc4..fb367eaf0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -266,7 +266,7 @@
     <string name="delete_view_history_alert">Ștergeți întregul istoric al vizionărilor\?</string>
     <string name="one_item_deleted">1 element șters.</string>
     <string name="create_playlist">Playlist nou</string>
-    <string name="append_playlist">Adăugați la playlist</string>
+    <string name="add_to_playlist">Adăugați la playlist</string>
     <string name="import_title">Importare</string>
     <string name="import_from">Importați din</string>
     <string name="export_to">Exportați în</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5c019d68e..4cd08d860 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -251,7 +251,7 @@
     <string name="create_playlist">Новый плейлист</string>
     <string name="rename_playlist">Переименовать</string>
     <string name="name">Имя</string>
-    <string name="append_playlist">В плейлист</string>
+    <string name="add_to_playlist">В плейлист</string>
     <string name="set_as_playlist_thumbnail">На миниатюру плейлиста</string>
     <string name="bookmark_playlist">Сохранить плейлист</string>
     <string name="unbookmark_playlist">Удалить плейлист</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 95ba064a5..1afb7990f 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -39,7 +39,7 @@
     <string name="set_as_playlist_thumbnail">Imposta che a miniadura de s\'iscalita</string>
     <string name="unmute">Allughe su sonu</string>
     <string name="mute">Pone a sa muda</string>
-    <string name="append_playlist">Annanghe a s\'iscalita</string>
+    <string name="add_to_playlist">Annanghe a s\'iscalita</string>
     <string name="name">Nùmene</string>
     <string name="rename_playlist">Càmbia de nùmene</string>
     <string name="create_playlist">Iscalita noa</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 82655d4ad..3df4ff0af 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -234,7 +234,7 @@
     <string name="create_playlist">Nový zoznam skladieb</string>
     <string name="rename_playlist">Premenovať</string>
     <string name="name">Názov</string>
-    <string name="append_playlist">Pridať do zoznamu skladieb</string>
+    <string name="add_to_playlist">Pridať do zoznamu skladieb</string>
     <string name="set_as_playlist_thumbnail">Nastaviť ako miniatúru zoznamu skladieb</string>
     <string name="bookmark_playlist">Záložka zoznamu skladieb</string>
     <string name="unbookmark_playlist">Odstrániť Záložku</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index c6be5581b..dbfef543d 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -247,7 +247,7 @@
     <string name="resize_fill">Napolni</string>
     <string name="playlist_creation_success">Seznam predvajanja je bil ustvarjen</string>
     <string name="delete_playlist_prompt">Izbrišem seznam predvajanja\?</string>
-    <string name="append_playlist">Dodaj v seznam predvajanja</string>
+    <string name="add_to_playlist">Dodaj v seznam predvajanja</string>
     <string name="rename_playlist">Preimenuj</string>
     <string name="create_playlist">Nov seznam predvajanja</string>
     <string name="preferred_player_fetcher_notification_message">Nalaganje zahtevano vsebino</string>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 5455d728b..bf9e7a768 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -115,7 +115,7 @@
     <string name="bookmark_playlist">Calaamadso Xulka</string>
     <string name="set_as_playlist_thumbnail">Ku fadhiisi galka xulka</string>
     <string name="unmute">Ka hadalsii</string>
-    <string name="append_playlist">Ku dar xul</string>
+    <string name="add_to_playlist">Ku dar xul</string>
     <string name="rename_playlist">Magaca ka baddal</string>
     <string name="create_playlist">Xul Cusub</string>
     <string name="preferred_player_fetcher_notification_message">Soo kicinaya shayga la codsaday</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index f9d2e8cfd..10ab40e69 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -183,7 +183,7 @@
     <string name="set_as_playlist_thumbnail">Vendose si pamjen statike të listës së luajtjes</string>
     <string name="unmute">Me zë</string>
     <string name="mute">Pa zë</string>
-    <string name="append_playlist">Shto në listën e luajtjes</string>
+    <string name="add_to_playlist">Shto në listën e luajtjes</string>
     <string name="name">Emri</string>
     <string name="rename_playlist">Riemërto</string>
     <string name="create_playlist">Listë Luajtje e Re</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 628f2a100..e27d9e8a8 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -350,7 +350,7 @@
     <string name="set_as_playlist_thumbnail">Постави као сличицу листе</string>
     <string name="unmute">Упали звук</string>
     <string name="mute">Утишај</string>
-    <string name="append_playlist">Додај на листу</string>
+    <string name="add_to_playlist">Додај на листу</string>
     <string name="name">Назив</string>
     <string name="rename_playlist">Преименуј</string>
     <string name="create_playlist">Нова листа</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8eb761329..4fc9778be 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -271,7 +271,7 @@
     <string name="create_playlist">Ny spellista</string>
     <string name="rename_playlist">Byt namn</string>
     <string name="name">Namn</string>
-    <string name="append_playlist">Lägg till i spellista</string>
+    <string name="add_to_playlist">Lägg till i spellista</string>
     <string name="set_as_playlist_thumbnail">Använd som spellistans miniatyrbild</string>
     <string name="bookmark_playlist">Bokmärk spellistan</string>
     <string name="unbookmark_playlist">Ta bort bokmärke</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 22123e517..01946c321 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -270,7 +270,7 @@
     <string name="create_playlist">เพลย์ลิสต์ใหม่</string>
     <string name="rename_playlist">เปลี่ยนชื่อ</string>
     <string name="name">ชื่อ</string>
-    <string name="append_playlist">เพิ่มในเพลย์ลิสต์</string>
+    <string name="add_to_playlist">เพิ่มในเพลย์ลิสต์</string>
     <string name="set_as_playlist_thumbnail">ตั้งเป็นรูปขนาดย่อของเพลย์ลิสต์</string>
     <string name="bookmark_playlist">เก็บเพลย์ลิสต์</string>
     <string name="unbookmark_playlist">เอาที่คั่นหน้าออก</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f802302ab..f318de744 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -227,7 +227,7 @@
     <string name="create_playlist">Yeni Oynatma Listesi</string>
     <string name="rename_playlist">Yeniden adlandır</string>
     <string name="name">Ad</string>
-    <string name="append_playlist">Oynatma listesine ekle</string>
+    <string name="add_to_playlist">Oynatma listesine ekle</string>
     <string name="set_as_playlist_thumbnail">Oynatma listesi küçük resmi olarak ayarla</string>
     <string name="bookmark_playlist">Oynatma listesini yer imlerine ekle</string>
     <string name="unbookmark_playlist">Yer imini kaldır</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index eae9079c0..c6b1f5bfd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -240,7 +240,7 @@
     <string name="create_playlist">Нова добірка</string>
     <string name="rename_playlist">Перейменувати</string>
     <string name="name">Назва</string>
-    <string name="append_playlist">Додати в добірку</string>
+    <string name="add_to_playlist">Додати в добірку</string>
     <string name="set_as_playlist_thumbnail">Призначити ескізом добірки</string>
     <string name="bookmark_playlist">Додати добірку до закладок</string>
     <string name="unbookmark_playlist">Видалити закладку</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 0454fc293..1f427504b 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -248,7 +248,7 @@
     <string name="create_playlist">نئی پلے لسٹ</string>
     <string name="rename_playlist">نام تبدیل کریں</string>
     <string name="name">نام</string>
-    <string name="append_playlist">پلے لسٹ میں شامل</string>
+    <string name="add_to_playlist">پلے لسٹ میں شامل</string>
     <string name="set_as_playlist_thumbnail">بطور پلے لسٹ انگشتی طے کریں</string>
     <string name="bookmark_playlist">پلے لسٹ کو نشان زد کریں</string>
     <string name="unbookmark_playlist">نشان زد حدف کریں</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 83aea33c0..3635aa4b4 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -267,7 +267,7 @@
     <string name="create_playlist">Tạo playlist mới</string>
     <string name="rename_playlist">Đổi tên playlist</string>
     <string name="name">Tên</string>
-    <string name="append_playlist">Thêm vào danh sách phát</string>
+    <string name="add_to_playlist">Thêm vào danh sách phát</string>
     <string name="set_as_playlist_thumbnail">Đặt làm hình thu nhỏ của danh sách phát</string>
     <string name="bookmark_playlist">Đánh dấu playlist này</string>
     <string name="unbookmark_playlist">Xóa dấu trang</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e5180c51e..f6318df0b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -259,7 +259,7 @@
     <string name="create_playlist">新建播放列表</string>
     <string name="rename_playlist">重 命名</string>
     <string name="name">名称</string>
-    <string name="append_playlist">添加到播放列表</string>
+    <string name="add_to_playlist">添加到播放列表</string>
     <string name="set_as_playlist_thumbnail">设为播放列表缩略图</string>
     <string name="bookmark_playlist">收藏播放列表</string>
     <string name="unbookmark_playlist">删除收藏</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 576f9d480..e5c499119 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -225,7 +225,7 @@
     <string name="create_playlist">新的播放清單</string>
     <string name="rename_playlist">重新命名</string>
     <string name="name">名稱</string>
-    <string name="append_playlist">新增至播放清單</string>
+    <string name="add_to_playlist">新增至播放清單</string>
     <string name="set_as_playlist_thumbnail">設為播放清單縮圖</string>
     <string name="bookmark_playlist">將播放清單加入書籤</string>
     <string name="unbookmark_playlist">移除書籤</string>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 4d9927b0d..7518b2ce8 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -368,8 +368,8 @@
         <item>@string/background_player</item>
         <item>@string/popup_player</item>
         <item>@string/download</item>
-        <item>@string/always_ask_open_action</item>
         <item>@string/add_to_playlist</item>
+        <item>@string/always_ask_open_action</item>
     </string-array>
     <string-array name="preferred_open_action_values_list" translatable="false">
         <item>@string/show_info_key</item>
@@ -377,8 +377,8 @@
         <item>@string/background_player_key</item>
         <item>@string/popup_player_key</item>
         <item>@string/download_key</item>
-        <item>@string/always_ask_open_action_key</item>
         <item>@string/add_to_playlist_key</item>
+        <item>@string/always_ask_open_action_key</item>
     </string-array>
 
     <!-- Updates -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0497d2660..c1fc08bc7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -433,14 +433,13 @@
     <string name="background_player">Background player</string>
     <string name="popup_player">Popup player</string>
     <string name="always_ask_open_action">Always ask</string>
-    <string name="add_to_playlist">Add to playlist</string>
     <string name="preferred_player_fetcher_notification_title">Getting info…</string>
     <string name="preferred_player_fetcher_notification_message">"Loading requested content"</string>
     <!-- Local Playlist -->
     <string name="create_playlist">New Playlist</string>
     <string name="rename_playlist">Rename</string>
     <string name="name">Name</string>
-    <string name="append_playlist">Add to playlist</string>
+    <string name="add_to_playlist">Add to playlist</string>
     <string name="mute">Mute</string>
     <string name="unmute">Unmute</string>
     <string name="set_as_playlist_thumbnail">Set as playlist thumbnail</string>

From ceb55d0ede4b7d6c6a9bda7023687adb2242054b Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Sun, 3 Oct 2021 14:25:50 +0200
Subject: [PATCH 3/8] Set the theme for PlaylistCreationDialog explicitly.

---
 .../newpipe/local/dialog/PlaylistCreationDialog.java       | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
index 55d6cec89..b27b7c454 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
@@ -9,13 +9,14 @@ import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog.Builder;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.DialogEditTextBinding;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
 
@@ -66,7 +67,8 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
         dialogBinding.dialogEditText.setHint(R.string.name);
         dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);
 
-        final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext())
+        final Builder dialogBuilder = new Builder(requireContext(),
+                ThemeHelper.getDialogTheme(requireContext()))
                 .setTitle(R.string.create_playlist)
                 .setView(dialogBinding.getRoot())
                 .setCancelable(true)
@@ -83,7 +85,6 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(longs -> successToast.show());
                 });
-
         return dialogBuilder.create();
     }
 }

From 4fde62ff89407dc6169d59071f573e501897df2d Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Mon, 4 Oct 2021 21:23:56 +0200
Subject: [PATCH 4/8] Reorder preferred open action menu

---
 app/src/main/res/values/settings_keys.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 7518b2ce8..9489ef543 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -359,8 +359,8 @@
     <string name="background_player_key" translatable="false">background_player</string>
     <string name="popup_player_key" translatable="false">popup_player</string>
     <string name="download_key" translatable="false">download</string>
-    <string name="always_ask_open_action_key" translatable="false">always_ask_player</string>
     <string name="add_to_playlist_key" translatable="false">add_to_playlist</string>
+    <string name="always_ask_open_action_key" translatable="false">always_ask_player</string>
 
     <string-array name="preferred_open_action_description_list" translatable="false">
         <item>@string/show_info</item>

From 731640997e74af702a0df44a93ec6f3043b83292 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sat, 9 Oct 2021 18:46:20 +0200
Subject: [PATCH 5/8] Cleaned up PlaylistDialog-related code

---
 .../org/schabi/newpipe/QueueItemMenuUtil.java | 18 ++--
 .../org/schabi/newpipe/RouterActivity.java    | 46 +++++----
 .../fragments/detail/VideoDetailFragment.java | 14 +--
 .../local/dialog/PlaylistAppendDialog.java    | 94 ++++---------------
 .../local/dialog/PlaylistCreationDialog.java  | 34 +------
 .../newpipe/local/dialog/PlaylistDialog.java  | 75 +++++++++++++--
 .../newpipe/player/PlayQueueActivity.java     | 17 ++--
 .../newpipe/util/StreamDialogEntry.java       | 19 ++--
 8 files changed, 147 insertions(+), 170 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
index 9105ff992..ef24937fe 100644
--- a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java
@@ -9,8 +9,8 @@ import android.widget.PopupMenu;
 
 import androidx.fragment.app.FragmentManager;
 
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.NavigationHelper;
@@ -47,13 +47,15 @@ public final class QueueItemMenuUtil {
                             false);
                     return true;
                 case R.id.menu_item_append_playlist:
-                    final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(
-                            Collections.singletonList(item)
+                    PlaylistDialog.createCorrespondingDialog(
+                            context,
+                            Collections.singletonList(new StreamEntity(item)),
+                            dialog -> dialog.show(
+                                    fragmentManager,
+                                    "QueueItemMenuUtil@append_playlist"
+                            )
                     );
-                    PlaylistAppendDialog.onPlaylistFound(context,
-                            () -> d.show(fragmentManager, "QueueItemMenuUtil@append_playlist"),
-                            () -> PlaylistCreationDialog.newInstance(d)
-                                    .show(fragmentManager, "QueueItemMenuUtil@append_playlist"));
+
                     return true;
                 case R.id.menu_item_share:
                     shareText(context, item.getTitle(), item.getUrl(),
diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index eba080e62..e3e97d570 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -33,6 +33,7 @@ import androidx.core.widget.TextViewCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.PreferenceManager;
 
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ListRadioIconItemBinding;
 import org.schabi.newpipe.databinding.SingleChoiceDialogViewBinding;
 import org.schabi.newpipe.download.DownloadDialog;
@@ -59,8 +60,7 @@ import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.extractor.stream.VideoStream;
 import org.schabi.newpipe.ktx.ExceptionUtils;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
@@ -82,6 +82,7 @@ import org.schabi.newpipe.views.FocusOverlayView;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import icepick.Icepick;
@@ -593,31 +594,26 @@ public class RouterActivity extends AppCompatActivity {
         disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(info -> {
-                    final FragmentManager fm = getSupportFragmentManager();
-                    final PlaylistAppendDialog playlistAppendDialog = PlaylistAppendDialog
-                            .fromStreamInfo(info);
+                .subscribe(
+                        info -> PlaylistDialog.createCorrespondingDialog(
+                                getThemeWrapperContext(),
+                                Collections.singletonList(new StreamEntity(info)),
+                                playlistDialog -> {
+                                    playlistDialog.setOnDismissListener(dialog -> finish());
 
-                    playlistAppendDialog.setOnDismissListener(dialog -> finish());
-
-                    PlaylistAppendDialog.onPlaylistFound(getThemeWrapperContext(),
-                            () -> {
-                                playlistAppendDialog.show(fm, "addToPlaylistDialog");
-                                fm.executePendingTransactions();
-                            },
-                            () -> {
-                                final PlaylistCreationDialog playlistCreationDialog =
-                                        PlaylistCreationDialog.newInstance(playlistAppendDialog);
-                                playlistCreationDialog.show(fm, "addToPlaylistDialog");
-
-                                fm.executePendingTransactions();
-
-                            });
-
-                }, throwable -> handleError(this,
-                        new ErrorInfo(throwable, UserAction.REQUESTED_STREAM,
+                                    playlistDialog.show(
+                                            this.getSupportFragmentManager(),
+                                            "addToPlaylistDialog"
+                                    );
+                                }
+                        ),
+                        throwable -> handleError(this, new ErrorInfo(
+                                throwable,
+                                UserAction.REQUESTED_STREAM,
                                 "Tried to add " + currentUrl + " to a playlist",
-                                currentService.getServiceId())))
+                                currentService.getServiceId())
+                        )
+                )
         );
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 5a30ea0f3..bda16849a 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -52,6 +52,7 @@ import com.squareup.picasso.Callback;
 
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.FragmentVideoDetailBinding;
 import org.schabi.newpipe.download.DownloadDialog;
 import org.schabi.newpipe.error.ErrorActivity;
@@ -73,8 +74,7 @@ import org.schabi.newpipe.fragments.EmptyFragment;
 import org.schabi.newpipe.fragments.list.comments.CommentsFragment;
 import org.schabi.newpipe.fragments.list.videos.RelatedItemsFragment;
 import org.schabi.newpipe.ktx.AnimationType;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.MainPlayer;
 import org.schabi.newpipe.player.MainPlayer.PlayerType;
@@ -99,6 +99,7 @@ import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -444,12 +445,11 @@ public final class VideoDetailFragment
                 break;
             case R.id.detail_controls_playlist_append:
                 if (getFM() != null && currentInfo != null) {
-
-                    final PlaylistAppendDialog d = PlaylistAppendDialog.fromStreamInfo(currentInfo);
                     disposables.add(
-                            PlaylistAppendDialog.onPlaylistFound(getContext(),
-                                    () -> d.show(getFM(), TAG),
-                                    () -> PlaylistCreationDialog.newInstance(d).show(getFM(), TAG)
+                            PlaylistDialog.createCorrespondingDialog(
+                                    getContext(),
+                                    Collections.singletonList(new StreamEntity(currentInfo)),
+                                    dialog -> dialog.show(getFM(), TAG)
                             )
                     );
                 }
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
index 268848818..2db7e0153 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java
@@ -1,8 +1,5 @@
 package org.schabi.newpipe.local.dialog;
 
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,20 +16,14 @@ import org.schabi.newpipe.R;
 import org.schabi.newpipe.database.LocalItem;
 import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
-import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.local.LocalItemListAdapter;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
-import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 import org.schabi.newpipe.util.OnClickGesture;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
-import io.reactivex.rxjava3.disposables.Disposable;
 
 public final class PlaylistAppendDialog extends PlaylistDialog {
     private static final String TAG = PlaylistAppendDialog.class.getCanonicalName();
@@ -42,58 +33,8 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
 
     private final CompositeDisposable playlistDisposables = new CompositeDisposable();
 
-    @Nullable
-    private OnDismissListener onDismissListener = null;
-
-    public static Disposable onPlaylistFound(
-            final Context context, final Runnable onSuccess, final Runnable onFailed
-    ) {
-        final LocalPlaylistManager playlistManager =
-                new LocalPlaylistManager(NewPipeDatabase.getInstance(context));
-
-        return playlistManager.hasPlaylists()
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(hasPlaylists -> {
-                    if (hasPlaylists) {
-                        onSuccess.run();
-                    } else {
-                        onFailed.run();
-                    }
-                });
-    }
-
-    public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        dialog.setInfo(Collections.singletonList(new StreamEntity(info)));
-        return dialog;
-    }
-
-    public static PlaylistAppendDialog fromStreamInfoItems(final List<StreamInfoItem> items) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        final List<StreamEntity> entities = new ArrayList<>(items.size());
-        for (final StreamInfoItem item : items) {
-            entities.add(new StreamEntity(item));
-        }
-        dialog.setInfo(entities);
-        return dialog;
-    }
-
-    public static PlaylistAppendDialog fromPlayQueueItems(final List<PlayQueueItem> items) {
-        final PlaylistAppendDialog dialog = new PlaylistAppendDialog();
-        final List<StreamEntity> entities = new ArrayList<>(items.size());
-        for (final PlayQueueItem item : items) {
-            entities.add(new StreamEntity(item));
-        }
-        dialog.setInfo(entities);
-        return dialog;
-    }
-
-    public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
-        this.onDismissListener = onDismissListener;
-    }
-
-    public OnDismissListener getOnDismissListener() {
-        return onDismissListener;
+    public PlaylistAppendDialog(final List<StreamEntity> streamEntities) {
+        super(streamEntities);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -117,11 +58,15 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         playlistAdapter.setSelectedListener(new OnClickGesture<LocalItem>() {
             @Override
             public void selected(final LocalItem selectedItem) {
-                if (!(selectedItem instanceof PlaylistMetadataEntry) || getStreams() == null) {
+                if (!(selectedItem instanceof PlaylistMetadataEntry)
+                        || getStreamEntities() == null) {
                     return;
                 }
-                onPlaylistSelected(playlistManager, (PlaylistMetadataEntry) selectedItem,
-                        getStreams());
+                onPlaylistSelected(
+                        playlistManager,
+                        (PlaylistMetadataEntry) selectedItem,
+                        getStreamEntities()
+                );
             }
         });
 
@@ -154,29 +99,22 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
         playlistAdapter = null;
     }
 
-    @Override
-    public void onDismiss(@NonNull final DialogInterface dialog) {
-        super.onDismiss(dialog);
-        if (onDismissListener != null) {
-            onDismissListener.onDismiss(dialog);
-        }
-    }
-
     /*//////////////////////////////////////////////////////////////////////////
     // Helper
     //////////////////////////////////////////////////////////////////////////*/
 
     public void openCreatePlaylistDialog() {
-        if (getStreams() == null || !isAdded()) {
+        if (getStreamEntities() == null || !isAdded()) {
             return;
         }
 
-        final PlaylistCreationDialog dialog = PlaylistCreationDialog.newInstance(getStreams());
+        final PlaylistCreationDialog playlistCreationDialog =
+                new PlaylistCreationDialog(getStreamEntities());
         // Move the dismissListener to the new dialog.
-        dialog.setOnDismissListener(this.onDismissListener);
-        this.onDismissListener = null;
+        playlistCreationDialog.setOnDismissListener(this.getOnDismissListener());
+        this.setOnDismissListener(null);
 
-        dialog.show(getParentFragmentManager(), TAG);
+        playlistCreationDialog.show(getParentFragmentManager(), TAG);
         requireDialog().dismiss();
     }
 
@@ -191,7 +129,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog {
     private void onPlaylistSelected(@NonNull final LocalPlaylistManager manager,
                                     @NonNull final PlaylistMetadataEntry playlist,
                                     @NonNull final List<StreamEntity> streams) {
-        if (getStreams() == null) {
+        if (getStreamEntities() == null) {
             return;
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
index b27b7c454..0f71e54d9 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
@@ -1,8 +1,6 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnDismissListener;
 import android.os.Bundle;
 import android.text.InputType;
 import android.widget.Toast;
@@ -23,32 +21,8 @@ import java.util.List;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 
 public final class PlaylistCreationDialog extends PlaylistDialog {
-    @Nullable
-    private OnDismissListener onDismissListener = null;
-
-    public static PlaylistCreationDialog newInstance(final List<StreamEntity> streams) {
-        final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
-        dialog.setInfo(streams);
-        return dialog;
-    }
-
-    public static PlaylistCreationDialog newInstance(final PlaylistAppendDialog appendDialog) {
-        final PlaylistCreationDialog dialog = new PlaylistCreationDialog();
-        dialog.setInfo(appendDialog.getStreams());
-        dialog.setOnDismissListener(appendDialog.getOnDismissListener());
-        return dialog;
-    }
-
-    public void setOnDismissListener(@Nullable final OnDismissListener onDismissListener) {
-        this.onDismissListener = onDismissListener;
-    }
-
-    @Override
-    public void onDismiss(@NonNull final DialogInterface dialog) {
-        super.onDismiss(dialog);
-        if (onDismissListener != null) {
-            onDismissListener.onDismiss(dialog);
-        }
+    public PlaylistCreationDialog(final List<StreamEntity> streamEntities) {
+        super(streamEntities);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -58,7 +32,7 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
     @NonNull
     @Override
     public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
-        if (getStreams() == null) {
+        if (getStreamEntities() == null) {
             return super.onCreateDialog(savedInstanceState);
         }
 
@@ -81,7 +55,7 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
                             R.string.playlist_creation_success,
                             Toast.LENGTH_SHORT);
 
-                    playlistManager.createPlaylist(name, getStreams())
+                    playlistManager.createPlaylist(name, getStreamEntities())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(longs -> successToast.show());
                 });
diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
index 2c2987e95..c2d4474f8 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java
@@ -1,6 +1,8 @@
 package org.schabi.newpipe.local.dialog;
 
 import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.view.Window;
 
@@ -8,23 +10,29 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
 
+import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
+import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.util.List;
 import java.util.Queue;
+import java.util.function.Consumer;
+
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public abstract class PlaylistDialog extends DialogFragment implements StateSaver.WriteRead {
+
+    @Nullable
+    private DialogInterface.OnDismissListener onDismissListener = null;
+
     private List<StreamEntity> streamEntities;
 
     private org.schabi.newpipe.util.SavedState savedState;
 
-    protected void setInfo(final List<StreamEntity> entities) {
-        this.streamEntities = entities;
-    }
-
-    protected List<StreamEntity> getStreams() {
-        return streamEntities;
+    public PlaylistDialog(final List<StreamEntity> streamEntities) {
+        this.streamEntities = streamEntities;
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -43,6 +51,10 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         StateSaver.onDestroy(savedState);
     }
 
+    public List<StreamEntity> getStreamEntities() {
+        return streamEntities;
+    }
+
     @NonNull
     @Override
     public Dialog onCreateDialog(final Bundle savedInstanceState) {
@@ -55,6 +67,14 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
         return dialog;
     }
 
+    @Override
+    public void onDismiss(@NonNull final DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (onDismissListener != null) {
+            onDismissListener.onDismiss(dialog);
+        }
+    }
+
     /*//////////////////////////////////////////////////////////////////////////
     // State Saving
     //////////////////////////////////////////////////////////////////////////*/
@@ -84,4 +104,47 @@ public abstract class PlaylistDialog extends DialogFragment implements StateSave
                     savedState, outState, this);
         }
     }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Getter + Setter
+    //////////////////////////////////////////////////////////////////////////*/
+
+    @Nullable
+    public DialogInterface.OnDismissListener getOnDismissListener() {
+        return onDismissListener;
+    }
+
+    public void setOnDismissListener(
+            @Nullable final DialogInterface.OnDismissListener onDismissListener
+    ) {
+        this.onDismissListener = onDismissListener;
+    }
+
+    /*//////////////////////////////////////////////////////////////////////////
+    // Dialog creation
+    //////////////////////////////////////////////////////////////////////////*/
+
+    /**
+     * Creates a {@link PlaylistAppendDialog} when playlists exists,
+     * otherwise a {@link PlaylistCreationDialog}.
+     *
+     * @param context        context used for accessing the database
+     * @param streamEntities used for crating the dialog
+     * @param onExec         execution that should occur after a dialog got created, e.g. showing it
+     * @return Disposable
+     */
+    public static Disposable createCorrespondingDialog(
+            final Context context,
+            final List<StreamEntity> streamEntities,
+            final Consumer<PlaylistDialog> onExec
+    ) {
+        return new LocalPlaylistManager(NewPipeDatabase.getInstance(context))
+                .hasPlaylists()
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(hasPlaylists ->
+                        onExec.accept(hasPlaylists
+                                ? new PlaylistAppendDialog(streamEntities)
+                                : new PlaylistCreationDialog(streamEntities))
+                );
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
index 0976aa4fb..e0c5ab083 100644
--- a/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/player/PlayQueueActivity.java
@@ -23,11 +23,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.exoplayer2.PlaybackParameters;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.ActivityPlayerQueueControlBinding;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.fragments.OnScrollBelowItemsListener;
-import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.player.event.PlayerEventListener;
 import org.schabi.newpipe.player.helper.PlaybackParameterDialog;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
@@ -43,6 +43,7 @@ import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.schabi.newpipe.QueueItemMenuUtil.openPopupMenu;
 import static org.schabi.newpipe.player.helper.PlayerHelper.formatSpeed;
@@ -452,12 +453,12 @@ public final class PlayQueueActivity extends AppCompatActivity
         }
     }
 
-    private void openPlaylistAppendDialog(final List<PlayQueueItem> playlist) {
-        final PlaylistAppendDialog d = PlaylistAppendDialog.fromPlayQueueItems(playlist);
-
-        PlaylistAppendDialog.onPlaylistFound(getApplicationContext(),
-            () -> d.show(getSupportFragmentManager(), TAG),
-            () -> PlaylistCreationDialog.newInstance(d).show(getSupportFragmentManager(), TAG));
+    private void openPlaylistAppendDialog(final List<PlayQueueItem> playQueueItems) {
+        PlaylistDialog.createCorrespondingDialog(
+                getApplicationContext(),
+                playQueueItems.stream().map(StreamEntity::new).collect(Collectors.toList()),
+                dialog -> dialog.show(getSupportFragmentManager(), TAG)
+        );
     }
 
     ////////////////////////////////////////////////////////////////////////////
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index 11cc4daba..e33c4da87 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -8,9 +8,10 @@ import androidx.fragment.app.Fragment;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.extractor.stream.StreamInfoItem;
 import org.schabi.newpipe.local.dialog.PlaylistAppendDialog;
-import org.schabi.newpipe.local.dialog.PlaylistCreationDialog;
+import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.external_communication.KoreUtils;
@@ -82,13 +83,15 @@ public enum StreamDialogEntry {
     }), // has to be set manually
 
     append_playlist(R.string.add_to_playlist, (fragment, item) -> {
-        final PlaylistAppendDialog d = PlaylistAppendDialog
-                .fromStreamInfoItems(Collections.singletonList(item));
-
-        PlaylistAppendDialog.onPlaylistFound(fragment.getContext(),
-            () -> d.show(fragment.getParentFragmentManager(), "StreamDialogEntry@append_playlist"),
-            () -> PlaylistCreationDialog.newInstance(d)
-                    .show(fragment.getParentFragmentManager(), "StreamDialogEntry@create_playlist")
+        PlaylistDialog.createCorrespondingDialog(
+                fragment.getContext(),
+                Collections.singletonList(new StreamEntity(item)),
+                dialog -> dialog.show(
+                        fragment.getParentFragmentManager(),
+                        "StreamDialogEntry@"
+                                + (dialog instanceof PlaylistAppendDialog ? "append" : "create")
+                                + "_playlist"
+                )
         );
     }),
 

From d7d87691cb776c13cda8ccdb8a6d04448e53146a Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sat, 9 Oct 2021 18:47:36 +0200
Subject: [PATCH 6/8] Add to playlist - Showing toast that this may take a
 moment

---
 app/src/main/java/org/schabi/newpipe/RouterActivity.java | 8 ++++++++
 app/src/main/res/values/strings.xml                      | 1 +
 2 files changed, 9 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
index e3e97d570..4e96f3bb6 100644
--- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java
@@ -591,6 +591,14 @@ public class RouterActivity extends AppCompatActivity {
     }
 
     private void openAddToPlaylistDialog() {
+        // Getting the stream info usually takes a moment
+        // Notifying the user here to ensure that no confusion arises
+        Toast.makeText(
+                getApplicationContext(),
+                getString(R.string.processing_may_take_a_moment),
+                Toast.LENGTH_SHORT)
+                .show();
+
         disposables.add(ExtractorHelper.getStreamInfo(currentServiceId, currentUrl, false)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c1fc08bc7..faceb5910 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -440,6 +440,7 @@
     <string name="rename_playlist">Rename</string>
     <string name="name">Name</string>
     <string name="add_to_playlist">Add to playlist</string>
+    <string name="processing_may_take_a_moment">Processing... May take moment</string>
     <string name="mute">Mute</string>
     <string name="unmute">Unmute</string>
     <string name="set_as_playlist_thumbnail">Set as playlist thumbnail</string>

From 12aac09c7bed2700e7966e3b2bf157cc2f47a175 Mon Sep 17 00:00:00 2001
From: litetex <40789489+litetex@users.noreply.github.com>
Date: Sat, 9 Oct 2021 18:56:10 +0200
Subject: [PATCH 7/8] Fixed typo

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index faceb5910..897ec0af8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -440,7 +440,7 @@
     <string name="rename_playlist">Rename</string>
     <string name="name">Name</string>
     <string name="add_to_playlist">Add to playlist</string>
-    <string name="processing_may_take_a_moment">Processing... May take moment</string>
+    <string name="processing_may_take_a_moment">Processing... May take a moment</string>
     <string name="mute">Mute</string>
     <string name="unmute">Unmute</string>
     <string name="set_as_playlist_thumbnail">Set as playlist thumbnail</string>

From 9d7e9289bb88a4acb8ac9fb326f4f7b02797911c Mon Sep 17 00:00:00 2001
From: Kalle Struik <kalle@kallestruik.nl>
Date: Sun, 10 Oct 2021 12:32:57 +0200
Subject: [PATCH 8/8] Fix cursor color in PlaylistCreationDialog

---
 .../org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
index 0f71e54d9..6664144cd 100644
--- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java
@@ -38,6 +38,7 @@ public final class PlaylistCreationDialog extends PlaylistDialog {
 
         final DialogEditTextBinding dialogBinding
                 = DialogEditTextBinding.inflate(getLayoutInflater());
+        dialogBinding.getRoot().getContext().setTheme(ThemeHelper.getDialogTheme(requireContext()));
         dialogBinding.dialogEditText.setHint(R.string.name);
         dialogBinding.dialogEditText.setInputType(InputType.TYPE_CLASS_TEXT);