Add Play/Shuffle All for playlists (fixes #39)

Add Remove All from queue button on tvOS

Model/Player/PlayerQueue.swift

@@ -8,16 +8,30 @@ extension PlayerModel {
         currentItem?.video
     }
 
-    func playAll(_ videos: [Video]) {
+    func play(_ videos: [Video], shuffling: Bool = false, inNavigationView: Bool = false) {
-        let first = videos.first
+        let videosToPlay = shuffling ? videos.shuffled() : videos
 
-        videos.forEach { video in
+        guard let first = videosToPlay.first else {
-            enqueueVideo(video) { _, item in
+            return
+        }
+
+        enqueueVideo(first, prepending: true) { _, item in
+            self.advanceToItem(item)
+        }
+
+        videosToPlay.dropFirst().reversed().forEach { video in
+            enqueueVideo(video, prepending: true) { _, item in
                 if item.video == first {
                     self.advanceToItem(item)
                 }
             }
         }
+
+        if inNavigationView {
+            playerNavigationLinkActive = true
+        } else {
+            show()
+        }
     }
 
     func playNext(_ video: Video) {

Shared/Playlists/PlaylistsView.swift

@@ -100,12 +100,12 @@ struct PlaylistsView: View {
                                     Text("No Playlists")
                                         .foregroundColor(.secondary)
                                 } else {
-                                    Text("Current Playlist")
-                                        .foregroundColor(.secondary)
-
                                     selectPlaylistButton
                                 }
 
+                                playButton
+                                shuffleButton
+
                                 Spacer()
 
                                 newPlaylistButton
@@ -142,23 +142,14 @@ struct PlaylistsView: View {
                     selectPlaylistButton
                 }
 
-                Button {
-                    player.playAll(items.compactMap(\.video))
-                    player.show()
-                } label: {
-                    HStack(spacing: 15) {
-                        Image(systemName: "play.fill")
-                        Text("Play All")
-                    }
-                }
-
-                if currentPlaylist != nil {
-                    editPlaylistButton
-                }
-
                 if let playlist = currentPlaylist {
+                    editPlaylistButton
+
                     FavoriteButton(item: FavoriteItem(section: .playlist(playlist.id)))
                         .labelStyle(.iconOnly)
+
+                    playButton
+                    shuffleButton
                 }
 
                 Spacer()
@@ -265,6 +256,22 @@ struct PlaylistsView: View {
         }
     }
 
+    private var playButton: some View {
+        Button {
+            player.play(items.compactMap(\.video))
+        } label: {
+            Image(systemName: "play")
+        }
+    }
+
+    private var shuffleButton: some View {
+        Button {
+            player.play(items.compactMap(\.video), shuffling: true)
+        } label: {
+            Image(systemName: "shuffle")
+        }
+    }
+
     private var currentPlaylist: Playlist? {
         model.find(id: selectedPlaylistID) ?? model.all.first
     }

Shared/Views/ChannelPlaylistView.swift

@@ -10,13 +10,10 @@ struct ChannelPlaylistView: View {
     @StateObject private var store = Store<ChannelPlaylist>()
 
     @Environment(\.colorScheme) private var colorScheme
-
+    @Environment(\.inNavigationView) private var inNavigationView
-    #if os(iOS)
-        @Environment(\.inNavigationView) private var inNavigationView
-        @EnvironmentObject<PlayerModel> private var player
-    #endif
 
     @EnvironmentObject<AccountsModel> private var accounts
+    @EnvironmentObject<PlayerModel> private var player
 
     var items: [ContentItem] {
         ContentItem.array(of: store.item?.videos ?? [])
@@ -54,6 +51,11 @@ struct ChannelPlaylistView: View {
 
                     FavoriteButton(item: FavoriteItem(section: .channelPlaylist(playlist.id, playlist.title)))
                         .labelStyle(.iconOnly)
+
+                    playButton
+                        .labelStyle(.iconOnly)
+                    shuffleButton
+                        .labelStyle(.iconOnly)
                 }
             #endif
             VerticalCells(items: items)
@@ -70,7 +72,9 @@ struct ChannelPlaylistView: View {
             resource?.addObserver(store)
             resource?.loadIfNeeded()
         }
-        #if !os(tvOS)
+        #if os(tvOS)
+        .background(Color.background(scheme: colorScheme))
+        #else
         .toolbar {
             ToolbarItem(placement: .navigation) {
                 ShareButton(
@@ -80,19 +84,50 @@ struct ChannelPlaylistView: View {
                 )
             }
 
-            ToolbarItem {
+            ToolbarItem(placement: playlistButtonsPlacement) {
-                FavoriteButton(item: FavoriteItem(section: .channelPlaylist(playlist.id, playlist.title)))
+                HStack {
+                    FavoriteButton(item: FavoriteItem(section: .channelPlaylist(playlist.id, playlist.title)))
+
+                    playButton
+                    shuffleButton
+                }
             }
         }
         .navigationTitle(playlist.title)
             #if os(iOS)
                 .navigationBarHidden(player.playerNavigationLinkActive)
             #endif
-        #else
-                .background(Color.background(scheme: colorScheme))
         #endif
     }
 
+    private var playlistButtonsPlacement: ToolbarItemPlacement {
+        #if os(iOS)
+            .navigationBarTrailing
+        #else
+            .automatic
+        #endif
+    }
+
+    private var playButton: some View {
+        Button {
+            player.play(videos, inNavigationView: inNavigationView)
+        } label: {
+            Label("Play All", systemImage: "play")
+        }
+    }
+
+    private var shuffleButton: some View {
+        Button {
+            player.play(videos, shuffling: true, inNavigationView: inNavigationView)
+        } label: {
+            Label("Shuffle", systemImage: "shuffle")
+        }
+    }
+
+    private var videos: [Video] {
+        items.compactMap(\.video)
+    }
+
     private var contentItem: ContentItem {
         ContentItem(playlist: playlist)
     }

Shared/Views/PlaylistVideosView.swift

@@ -4,25 +4,54 @@ import SwiftUI
 struct PlaylistVideosView: View {
     let playlist: Playlist
 
-    var videos: [ContentItem] {
+    @Environment(\.inNavigationView) private var inNavigationView
+    @EnvironmentObject<PlayerModel> private var player
+
+    var contentItems: [ContentItem] {
         ContentItem.array(of: playlist.videos)
     }
 
+    var videos: [Video] {
+        contentItems.compactMap(\.video)
+    }
+
     init(_ playlist: Playlist) {
         self.playlist = playlist
     }
 
     var body: some View {
         PlayerControlsView {
-            VerticalCells(items: videos)
+            VerticalCells(items: contentItems)
             #if !os(tvOS)
                 .navigationTitle("\(playlist.title) Playlist")
             #endif
         }
         .toolbar {
-            ToolbarItem {
+            ToolbarItem(placement: playlistButtonsPlacement) {
-                FavoriteButton(item: FavoriteItem(section: .playlist(playlist.id)))
+                HStack {
+                    FavoriteButton(item: FavoriteItem(section: .channelPlaylist(playlist.id, playlist.title)))
+
+                    Button {
+                        player.play(videos, inNavigationView: inNavigationView)
+                    } label: {
+                        Label("Play All", systemImage: "play")
+                    }
+
+                    Button {
+                        player.play(videos, shuffling: true, inNavigationView: inNavigationView)
+                    } label: {
+                        Label("Shuffle", systemImage: "shuffle")
+                    }
+                }
             }
         }
     }
+
+    private var playlistButtonsPlacement: ToolbarItemPlacement {
+        #if os(iOS)
+            .navigationBarTrailing
+        #else
+            .automatic
+        #endif
+    }
 }

tvOS/NowPlayingView.swift

@@ -68,9 +68,13 @@ struct NowPlayingView: View {
                                 VideoBanner(video: item.video)
                             }
                             .contextMenu {
-                                Button("Delete", role: .destructive) {
+                                Button("Remove", role: .destructive) {
                                     player.remove(item)
                                 }
+
+                                Button("Remove All", role: .destructive) {
+                                    player.removeQueueItems()
+                                }
                             }
                         }
                     }