Merge pull request #8170 from Stypox/player-refactor

Refactor player and extract UI components

app/src/main/AndroidManifest.xml

@@ -44,7 +44,7 @@
         </receiver>
 
         <service
-            android:name=".player.MainPlayer"
+            android:name=".player.PlayerService"
             android:exported="false"
             android:foregroundServiceType="mediaPlayback">
             <intent-filter>

app/src/main/java/org/schabi/newpipe/RouterActivity.java

@@ -60,7 +60,7 @@
 import org.schabi.newpipe.extractor.stream.StreamInfo;
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
-import org.schabi.newpipe.player.MainPlayer;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.helper.PlayerHelper;
 import org.schabi.newpipe.player.helper.PlayerHolder;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
@@ -630,8 +630,8 @@ private boolean canHandleChoiceLikeShowInfo(final String selectedChoiceKey) {
         }
 
         // ...the player is not running or in normal Video-mode/type
-        final MainPlayer.PlayerType playerType = PlayerHolder.getInstance().getType();
-        return playerType == null || playerType == MainPlayer.PlayerType.VIDEO;
+        final PlayerType playerType = PlayerHolder.getInstance().getType();
+        return playerType == null || playerType == PlayerType.MAIN;
     }
 
     private void openAddToPlaylistDialog() {

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -43,7 +43,7 @@
 import org.schabi.newpipe.ktx.AnimationType;
 import org.schabi.newpipe.local.subscription.SubscriptionManager;
 import org.schabi.newpipe.local.feed.notifications.NotificationHelper;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.ChannelPlayQueue;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -43,7 +43,7 @@
 import org.schabi.newpipe.info_list.dialog.StreamDialogDefaultEntry;
 import org.schabi.newpipe.local.dialog.PlaylistDialog;
 import org.schabi.newpipe.local.playlist.RemotePlaylistManager;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue;
 import org.schabi.newpipe.util.ExtractorHelper;

app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java

@@ -9,15 +9,20 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentManager;
 
 import org.schabi.newpipe.NewPipeDatabase;
 import org.schabi.newpipe.database.stream.model.StreamEntity;
 import org.schabi.newpipe.local.playlist.LocalPlaylistManager;
+import org.schabi.newpipe.player.Player;
 import org.schabi.newpipe.util.StateSaver;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -131,13 +136,13 @@ protected void setStreamEntities(final List<StreamEntity> streamEntities) {
      * @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
+     * @return the disposable that was created
      */
     public static Disposable createCorrespondingDialog(
             final Context context,
             final List<StreamEntity> streamEntities,
-            final Consumer<PlaylistDialog> onExec
-    ) {
+            final Consumer<PlaylistDialog> onExec) {
+
         return new LocalPlaylistManager(NewPipeDatabase.getInstance(context))
                 .hasPlaylists()
                 .observeOn(AndroidSchedulers.mainThread())
@@ -147,4 +152,30 @@ public static Disposable createCorrespondingDialog(
                                 : PlaylistCreationDialog.newInstance(streamEntities))
                 );
     }
+
+    /**
+     * Creates a {@link PlaylistAppendDialog} when playlists exists,
+     * otherwise a {@link PlaylistCreationDialog}. If the player's play queue is null or empty, no
+     * dialog will be created.
+     *
+     * @param player          the player from which to extract the context and the play queue
+     * @param fragmentManager the fragment manager to use to show the dialog
+     * @return the disposable that was created
+     */
+    public static Disposable showForPlayQueue(
+            final Player player,
+            @NonNull final FragmentManager fragmentManager) {
+
+        final List<StreamEntity> streamEntities = Stream.of(player.getPlayQueue())
+                .filter(Objects::nonNull)
+                .flatMap(playQueue -> playQueue.getStreams().stream())
+                .map(StreamEntity::new)
+                .collect(Collectors.toList());
+        if (streamEntities.isEmpty()) {
+            return Disposable.empty();
+        }
+
+        return PlaylistDialog.createCorrespondingDialog(player.getContext(), streamEntities,
+                dialog -> dialog.show(fragmentManager, "PlaylistDialog"));
+    }
 }

app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java

@@ -44,7 +44,7 @@
 import org.schabi.newpipe.info_list.dialog.InfoItemDialog;
 import org.schabi.newpipe.local.BaseLocalListFragment;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.player.MainPlayer.PlayerType;
+import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.playqueue.PlayQueue;
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
 import org.schabi.newpipe.util.Localization;