feature: Added PlaybackState with additional states for better UX (#70)

muse-application · Apr 22, 2024 · cb05528 · cb05528
1 parent a3e2da5
commit cb05528
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 25 deletions.
diff --git a/mupl/Common/Components/Playbar/PlaybarSongControls.swift b/mupl/Common/Components/Playbar/PlaybarSongControls.swift
@@ -43,17 +43,26 @@ extension Playbar {
                             self.musicPlayer.skip(.backward)
                         }
 
-                    Image(systemName: self.musicPlayer.playbackStatus == .playing ? "pause.fill" : "play.fill")
-                        .foregroundStyle(Color.secondaryText)
-                        .tappable {
-                            Task {
-                                if self.musicPlayer.playbackStatus == .playing {
-                                    self.musicPlayer.pause()
-                                } else {
-                                    await self.musicPlayer.play()
+                    Group {
+                        if self.musicPlayer.playbackState == .loading {
+                            Image(systemName: "ellipsis")
+                                .foregroundStyle(Color.secondaryText)
+                                .symbolEffect(.variableColor.iterative.dimInactiveLayers, options: .repeating)
+                        } else {
+                            Image(systemName: self.musicPlayer.playbackState == .playing ? "pause.fill" : "play.fill")
+                                .foregroundStyle(Color.secondaryText)
+                                .tappable {
+                                    Task {
+                                        if self.musicPlayer.playbackState == .playing {
+                                            self.musicPlayer.pause()
+                                        } else {
+                                            await self.musicPlayer.play()
+                                        }
+                                    }
                                 }
-                            }
                         }
+                    }
+                    .frame(width: 20.0)
 
                     Image(systemName: "forward.fill")
                         .foregroundStyle(Color.secondaryText)

diff --git a/mupl/Common/Components/SongItem/SongItem.swift b/mupl/Common/Components/SongItem/SongItem.swift
@@ -34,12 +34,12 @@ struct SongItem<S: SongItemStyle>: View {
         )
         .onAppear {
             self.isCurrent = self.musicPlayer.currentSong?.id == self.song.id
-            self.isCurrentlyPlaying = self.isCurrent && self.musicPlayer.playbackStatus == .playing
+            self.isCurrentlyPlaying = self.isCurrent && self.musicPlayer.playbackState == .playing
         }
         .onChange(of: self.musicPlayer.currentSong) { _, value in
             self.isCurrent = value?.id == self.song.id
         }
-        .onChange(of: self.musicPlayer.playbackStatus) { _, value in
+        .onChange(of: self.musicPlayer.playbackState) { _, value in
             self.isCurrentlyPlaying = self.isCurrent && value == .playing
         }
         .onHover { hovering in

diff --git a/mupl/Common/Components/SongItem/Styles/GroupedSongItemStyle.swift b/mupl/Common/Components/SongItem/Styles/GroupedSongItemStyle.swift
@@ -52,7 +52,7 @@ struct GroupedSongItemStyle: SongItemStyle {
                 Text(duration)
                     .font(.system(size: 14.0, weight: .medium))
                     .foregroundStyle(Color.secondaryText)
-                    .frame(width: 40.0)
+                    .frame(width: 40.0, alignment: .leading)
             }
         }
         .padding(.all, 16.0)

diff --git a/mupl/Common/Components/SongItem/Styles/PlainSongItemStyle.swift b/mupl/Common/Components/SongItem/Styles/PlainSongItemStyle.swift
@@ -64,12 +64,11 @@ struct PlainSongItemStyle: SongItemStyle {
 
                 Spacer()
 
-                HStack {
-                    if let duration = song.duration?.minutesAndSeconds {
-                        Text(duration)
-                            .font(.system(size: 12.0, weight: .medium))
-                            .foregroundStyle(Color.secondaryText)
-                    }
+                if let duration = song.duration?.minutesAndSeconds {
+                    Text(duration)
+                        .font(.system(size: 12.0, weight: .medium))
+                        .foregroundStyle(Color.secondaryText)
+                        .frame(width: 40.0, alignment: .leading)
                 }
             }
             .animation(.easeIn(duration: 0.2), value: context.isHovered)

diff --git a/mupl/Common/Models/Services/Music/Base/Player/MusicPlayer.swift b/mupl/Common/Models/Services/Music/Base/Player/MusicPlayer.swift
@@ -21,6 +21,22 @@ final class MusicPlayer: ObservableObject {
         case backward
     }
 
+    enum PlaybackState {
+        case playing
+        case loading
+        case paused
+        case stopped
+
+        init(playbackStatus: PlaybackStatus) {
+            self = switch playbackStatus {
+            case .playing: .playing
+            case .paused: .paused
+            case .stopped: .stopped
+            default: .stopped
+            }
+        }
+    }
+
     private let manager: MusicManager = .shared
     private let player: ApplicationMusicPlayer = .shared
     private let audio: Audio = .init()
@@ -48,7 +64,7 @@ final class MusicPlayer: ObservableObject {
         }
     }
 
-    @Published private(set) var playbackStatus: PlaybackStatus = .stopped {
+    @Published private(set) var playbackState: PlaybackState = .stopped {
         didSet {
             self.updatePlaybackTimeObservation()
         }
@@ -93,8 +109,12 @@ final class MusicPlayer: ObservableObject {
             self.shuffleMode = shuffleMode
         }
 
+        self.playbackState = .loading
+
         try? await self.player.prepareToPlay()
         try? await self.player.play()
+
+        self.playbackState = .playing
     }
 
     func play(item: PlayableMusicItem, shuffleMode: ShuffleMode? = nil) async {
@@ -134,12 +154,12 @@ final class MusicPlayer: ObservableObject {
     }
 
     func pause() {
-        guard self.playbackStatus != .paused else { return }
+        guard self.playbackState != .paused else { return }
         self.player.pause()
     }
 
     func stop() {
-        guard self.playbackStatus != .stopped else { return }
+        guard self.playbackState != .stopped else { return }
         self.player.stop()
     }
 
@@ -192,20 +212,20 @@ final class MusicPlayer: ObservableObject {
     }
 
     private func updatePlaybackTimeObservation() {
-        switch self.playbackStatus {
+        switch self.playbackState {
         case .playing:
             self.runPlaybackTimeObservation()
-        case .paused, .interrupted, .seekingForward, .seekingBackward:
+        case .paused:
             self.pausePlaybackTimeObservation()
         case .stopped:
             self.stopPlaybackTimeObservation()
-        @unknown default:
+        default:
             break
         }
     }
 
     private func updateState() {
-        self.playbackStatus = self.player.state.playbackStatus
+        self.playbackState = .init(playbackStatus: self.player.state.playbackStatus)
         self.shuffleMode = self.player.state.shuffleMode ?? .off
         self.repeatMode = self.player.state.repeatMode ?? .none
     }