[iOS] Feat: TrackRow 선택 시 UpNext에 곡 추가 #34

boostcamp-2020 · Dec 8, 2020 · fa91b17 · fa91b17
1 parent 6998d1b
commit fa91b17
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 2 deletions.
diff --git a/MiniVibe/MiniVibe/Models/NowPlaying.swift b/MiniVibe/MiniVibe/Models/NowPlaying.swift
@@ -10,8 +10,7 @@ import Foundation
 class NowPlaying: ObservableObject {
     @Published var isPlaying: Bool = false
     @Published var isPlayerPresented: Bool = false
-    @Published var upNext = [Track]()
+    @Published var upNext = [Int]() // Track.id
 }
 
-
 // 비어있다면? 기본 값을 보여주어야 하지 않을까
diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowA.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowA.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TrackRowA: View {
+    @EnvironmentObject private var nowPlaying: NowPlaying
     @Binding var isMenuOpen: Bool
 
     let order: Int
@@ -34,6 +35,11 @@ struct TrackRowA: View {
                         .font(.subheadline)
                         .foregroundColor(.secondary)
                 }
+                // let track: TrackInfo 와 같이 생기면 아래 onTapGesture 추가하기
+                    // upnext에 추가하는 코드임
+//                .onTapGesture {
+//                    nowPlaying.upNext.append(track.id)
+//                }
             }
             .scaledToFit()
 

diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowB.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowB.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TrackRowB: View {
+    @EnvironmentObject private var nowPlaying: NowPlaying
     let track: TrackInfo
 
     var body: some View {
@@ -25,6 +26,9 @@ struct TrackRowB: View {
                     .font(.system(size: 13))
                     .foregroundColor(.secondary)
             }
+            .onTapGesture {
+                nowPlaying.upNext.append(track.id)
+            }
 
             Spacer()
         }

diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowC.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowC.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TrackRowC: View {
+    @EnvironmentObject private var nowPlaying: NowPlaying
     let title: String
     let artist: String
     let menuButtonAction: () -> Void
@@ -26,6 +27,11 @@ struct TrackRowC: View {
                     .font(.subheadline)
                     .foregroundColor(.secondary)
             }
+            // let track: TrackInfo 와 같이 생기면 아래 onTapGesture 추가하기
+                // upnext에 추가하는 코드임
+//            .onTapGesture {
+//                nowPlaying.upNext.append(track.id)
+//            }
 
             Spacer()
 

diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowD.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowD.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TrackRowD: View {
+    @EnvironmentObject private var nowPlaying: NowPlaying
     let order: Int
     let title: String
     let artist: String
@@ -25,6 +26,11 @@ struct TrackRowD: View {
                     .font(.title3)
             }
             .padding(.vertical, 10)
+            // let track: TrackInfo 와 같이 생기면 아래 onTapGesture 추가하기
+                // upnext에 추가하는 코드임
+//            .onTapGesture {
+//                nowPlaying.upNext.append(track.id)
+//            }
 
             Spacer()
 

diff --git a/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowE.swift b/MiniVibe/MiniVibe/Views/Common/TrackRows/TrackRowE.swift
@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TrackRowE: View {
+    @EnvironmentObject private var nowPlaying: NowPlaying
     let order: Int
     let title: String
     let artist: String
@@ -34,6 +35,11 @@ struct TrackRowE: View {
                 }
             }
             .scaledToFit()
+            // let track: TrackInfo 와 같이 생기면 아래 onTapGesture 추가하기
+                // upnext에 추가하는 코드임
+//            .onTapGesture {
+//                nowPlaying.upNext.append(track.id)
+//            }
 
             Spacer()
         }