[iOS] Feat: 곡 추가되는 형식 변경 #348

- 트랙 id의 배열 -> NowPlaying.UpNextTrack 구조체 배열
boostcamp-2020 · Dec 8, 2020 · 24e6c47 · 24e6c47
1 parent fa91b17
commit 24e6c47
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/MiniVibe/MiniVibe/Models/NowPlaying.swift b/MiniVibe/MiniVibe/Models/NowPlaying.swift
@@ -8,9 +8,14 @@
 import Foundation
 
 class NowPlaying: ObservableObject {
+    struct UpNextTrack {
+        let id: Int
+        let title: String
+        let artist: Artist
+        let imageUrl: String
+    }
+
     @Published var isPlaying: Bool = false
     @Published var isPlayerPresented: Bool = false
-    @Published var upNext = [Int]() // Track.id
+    @Published var upNext = [UpNextTrack]()
 }
-
-// 비어있다면? 기본 값을 보여주어야 하지 않을까
diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowB.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowB.swift
@@ -27,7 +27,10 @@ struct TrackRowB: View {
                     .foregroundColor(.secondary)
             }
             .onTapGesture {
-                nowPlaying.upNext.append(track.id)
+                nowPlaying.upNext.append(NowPlaying.UpNextTrack(id: track.id,
+                                                                title: track.title,
+                                                                artist: track.artist,
+                                                                imageUrl: track.album.imageUrl))
             }
 
             Spacer()

diff --git a/MiniVibe/MiniVibe/Views/Player/UpNextList.swift b/MiniVibe/MiniVibe/Views/Player/UpNextList.swift
@@ -18,6 +18,9 @@ struct UpNextList: View {
 
     @State private var isAutoPlay: Bool = true
     @State private var editMode = EditMode.active
+    @EnvironmentObject private var nowPlaying: NowPlaying
+
+
     @State private var tracks: [Item] = (0..<20).map {
         Item(title: "Track #\($0)")
     }
@@ -44,7 +47,7 @@ struct UpNextList: View {
 
             VStack(spacing: 0) {
                 List(selection: $selectedTracks) {
-                    ForEach(tracks, id: \.self) { track in
+                    ForEach(nowPlaying.upNext, id: \.id) { track in
                         Text(track.title)
                     }
                     .onMove(perform: onMove(source:destination:))