From 9b48adbc752e4503b3b550cd8302226e0f4fa00c Mon Sep 17 00:00:00 2001
From: Siddhesh Naik <siddheshnaik20@protonmail.com>
Date: Sat, 23 Sep 2023 18:29:45 +0530
Subject: [PATCH] Address review comments

- Removed the setting item to update the playlist sharing preference.
- Removed the option to save user's playlist sharing preference.

Video demo:
- https://github.com/TeamNewPipe/NewPipe/assets/87667048/5ac5ab6f-163d-4407-bd67-a078a8b55bbb

PR Commit Message
Add playlist name and video name in playlist sharing content

- Currently, only a list of videos separated by newline are added in
  the share content.
- This makes it difficult to identify a specific video in a list of
  Urls.
- Used string resources for the sharing content formats.
- Added a confirmation dialog for users to choose between sharing
  playlist formats.
- Added Playlist name as the header and corresponding video name for
  each video url in following format.

Playlist
- Music1: https://media-url1
- Music2: https://media-url2
- Music3: https://media-url3

Screenshots:
| Before | After |
| --- | --- |
| <img src="https://github.com/TeamNewPipe/NewPipe/assets/87667048/fa7b27b2-91d6-491d-8f93-a8b447263de6" width=320> | <img src="https://github.com/TeamNewPipe/NewPipe/assets/87667048/e7ddde18-1d3a-4ccb-8c35-f5bf14e48bec" width=320> |

Video demo:
- https://github.com/TeamNewPipe/NewPipe/assets/87667048/5ac5ab6f-163d-4407-bd67-a078a8b55bbb
---
 .../local/playlist/LocalPlaylistFragment.java | 49 +++++--------------
 .../main/res/layout/dialog_share_playlist.xml | 28 -----------
 app/src/main/res/values/settings_keys.xml     |  2 -
 app/src/main/res/values/strings.xml           |  2 -
 app/src/main/res/xml/video_audio_settings.xml |  8 ---
 5 files changed, 12 insertions(+), 77 deletions(-)
 delete mode 100644 app/src/main/res/layout/dialog_share_playlist.xml

diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
index 5a4eab6e8..560ea4654 100644
--- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java
@@ -5,7 +5,6 @@ import static org.schabi.newpipe.ktx.ViewUtils.animate;
 import static org.schabi.newpipe.util.ThemeHelper.shouldUseGridLayout;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.text.InputType;
@@ -23,7 +22,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewbinding.ViewBinding;
@@ -38,7 +36,6 @@ import org.schabi.newpipe.database.playlist.PlaylistStreamEntry;
 import org.schabi.newpipe.database.playlist.model.PlaylistEntity;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.databinding.DialogEditTextBinding;
-import org.schabi.newpipe.databinding.DialogSharePlaylistBinding;
 import org.schabi.newpipe.databinding.LocalPlaylistHeaderBinding;
 import org.schabi.newpipe.databinding.PlaylistControlBinding;
 import org.schabi.newpipe.error.ErrorInfo;
@@ -54,8 +51,8 @@ import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.OnClickGesture;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
 import org.schabi.newpipe.util.PlayButtonHelper;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -102,8 +99,6 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     /* Flag to prevent simultaneous rewrites of the playlist */
     private boolean isRewritingPlaylist = false;
 
-    private SharedPreferences sharedPreferences;
-
     public static LocalPlaylistFragment getInstance(final long playlistId, final String name) {
         final LocalPlaylistFragment instance = new LocalPlaylistFragment();
         instance.setInitialData(playlistId, name);
@@ -124,7 +119,6 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
 
         isLoadingComplete = new AtomicBoolean();
         isModified = new AtomicBoolean();
-        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext());
     }
 
     @Override
@@ -352,12 +346,7 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == R.id.menu_item_share_playlist) {
-            if (!sharedPreferences.getBoolean(requireContext().getString(
-                    R.string.remember_local_playlist_sharing_option_key), false)) {
-                createShareConfirmationDialog();
-            } else {
-                sharePlaylist();
-            }
+            createShareConfirmationDialog();
         } else if (item.getItemId() == R.id.menu_item_rename_playlist) {
             createRenameDialog();
         } else if (item.getItemId() == R.id.menu_item_remove_watched) {
@@ -385,16 +374,19 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
     }
 
     /**
-     * Share the playlist as a newline-separated list of stream URLs and video names.
+     * Shares the playlist as a list of stream URLs if {@code shouldSharePlaylistDetails} is
+     * set to {@code false}. Shares the playlist name along with a list of video titles and URLs
+     * if {@code shouldSharePlaylistDetails} is set to {@code true}.
+     *
+     * @param shouldSharePlaylistDetails Whether the playlist details should be included in the
+     *                                   shared content.
      */
-    private void sharePlaylist() {
+    private void sharePlaylist(final boolean shouldSharePlaylistDetails) {
         final Context context = getContext();
         if (context == null) {
             return;
         }
 
-        final boolean shouldSharePlaylistDetails = sharedPreferences.getBoolean(
-                context.getString(R.string.share_playlist_with_details_key), false);
         disposables.add(playlistManager.getPlaylistStreams(playlistId)
                 .flatMapSingle(playlist -> Single.just(playlist.stream()
                         .map(PlaylistStreamEntry::getStreamEntity)
@@ -875,34 +867,17 @@ public class LocalPlaylistFragment extends BaseLocalListFragment<List<PlaylistSt
             return;
         }
 
-        final DialogSharePlaylistBinding dialogBinding = DialogSharePlaylistBinding
-                .inflate(getLayoutInflater());
-
         new AlertDialog.Builder(getContext())
                 .setTitle(R.string.share_playlist)
+                .setMessage(R.string.share_playlist_with_details_message)
                 .setCancelable(true)
-                .setView(dialogBinding.getRoot())
                 .setPositiveButton(R.string.share_playlist_with_details, (dialog, which) -> {
-                    savePreferencesAndSharePlaylist(
-                            dialogBinding.rememberChoiceCheckBox.isChecked(), true);
+                    sharePlaylist(/* shouldSharePlaylistDetails= */ true);
                 })
                 .setNegativeButton(R.string.share_playlist_with_list, (dialog, which) -> {
-                    savePreferencesAndSharePlaylist(
-                            dialogBinding.rememberChoiceCheckBox.isChecked(), false);
+                    sharePlaylist(/* shouldSharePlaylistDetails= */ false);
                 })
                 .show();
     }
-
-    private void savePreferencesAndSharePlaylist(final boolean rememberPlaylistSharingOption,
-                                                 final boolean sharePlaylistWithDetails) {
-        sharedPreferences.edit()
-                .putBoolean(requireContext().getString(
-                        R.string.remember_local_playlist_sharing_option_key),
-                        rememberPlaylistSharingOption)
-                .putBoolean(requireContext().getString(
-                        R.string.share_playlist_with_details_key), sharePlaylistWithDetails)
-                .apply();
-        sharePlaylist();
-    }
 }
 
diff --git a/app/src/main/res/layout/dialog_share_playlist.xml b/app/src/main/res/layout/dialog_share_playlist.xml
deleted file mode 100644
index 571264e57..000000000
--- a/app/src/main/res/layout/dialog_share_playlist.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/itemRoot"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="false"
-    android:paddingStart="@dimen/video_item_search_padding"
-    android:paddingTop="@dimen/video_item_search_padding"
-    android:paddingEnd="@dimen/video_item_search_padding">
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/sharePlaylistMessageText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:scrollHorizontally="true"
-        android:text="@string/share_playlist_with_details_message"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/channel_item_detail_title_text_size" />
-
-    <CheckBox
-        android:id="@+id/rememberChoiceCheckBox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/sharePlaylistMessageText"
-        android:layout_alignParentEnd="true"
-        android:text="@string/remember_my_choice" />
-</RelativeLayout>
diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml
index 42c2639c2..880fa92da 100644
--- a/app/src/main/res/values/settings_keys.xml
+++ b/app/src/main/res/values/settings_keys.xml
@@ -24,8 +24,6 @@
     <string name="screen_brightness_timestamp_key">screen_brightness_timestamp_key</string>
     <string name="clear_queue_confirmation_key">clear_queue_confirmation_key</string>
     <string name="ignore_hardware_media_buttons_key">ignore_hardware_media_buttons_key</string>
-    <string name="share_playlist_with_details_key">share_playlist_with_details_key</string>
-    <string name="remember_local_playlist_sharing_option_key">remember_local_playlist_sharing_option_key</string>
 
     <string name="popup_saved_width_key">popup_saved_width</string>
     <string name="popup_saved_x_key">popup_saved_x</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 317de1a92..d956ba5ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -836,8 +836,6 @@
     <string name="share_playlist_with_details_message">Share playlist with details such as playlist name and video titles or as a simple list of video URLs</string>
     <string name="share_playlist_with_details">Share with details</string>
     <string name="share_playlist_with_list">Share URL list</string>
-    <string name="remember_my_choice">Remember my choice</string>
-    <string name="share_playlist_with_details_settings_item">Share playlist with details such as playlist name and video titles</string>
     <string name="video_details_list_item">- %s: %s</string>
     <string name="share_playlist_content_details">%s\n%s</string>
 </resources>
diff --git a/app/src/main/res/xml/video_audio_settings.xml b/app/src/main/res/xml/video_audio_settings.xml
index 87d895942..727ce4df4 100644
--- a/app/src/main/res/xml/video_audio_settings.xml
+++ b/app/src/main/res/xml/video_audio_settings.xml
@@ -249,13 +249,5 @@
             android:title="@string/ignore_hardware_media_buttons_title"
             app:singleLineTitle="false"
             app:iconSpaceReserved="false" />
-
-        <SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="@string/share_playlist_with_details_key"
-            android:summary="@string/share_playlist_with_details_settings_item"
-            android:title="@string/share_playlist"
-            app:singleLineTitle="false"
-            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 </PreferenceScreen>