wip

Gwamegis · Jun 24, 2023 · 51b876d · 51b876d
1 parent bc869af
commit 51b876d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/Halmap/Persistence.swift b/Halmap/Persistence.swift
@@ -52,6 +52,23 @@ struct PersistenceController {
         }
     }
 
+    func createCollectedSong(song: SongInfo, playListTitle: String?) -> CollectedSong {
+        let context = container.viewContext
+        let collectedSong = CollectedSong(context: context)
+        collectedSong.id = song.id
+        collectedSong.title = song.title
+        collectedSong.info = song.info
+        collectedSong.lyrics = song.lyrics
+        collectedSong.url = song.url
+        collectedSong.type = song.type
+        collectedSong.playListTitle = playListTitle
+        collectedSong.team = song.team
+        collectedSong.date = Date()
+
+        print("collectedSong", collectedSong, song.title)
+        return collectedSong
+    }
+
     func deleteSongs(song: CollectedSong) {
 
         container.viewContext.delete(song)

diff --git a/Halmap/View/HalfSheetView.swift b/Halmap/View/HalfSheetView.swift
@@ -13,9 +13,14 @@ struct HalfSheetView: View {
     @ObservedObject var collectedSong: CollectedSong
     @State var songData: Song
     @State var song: CollectedSong = CollectedSong()
+
     var team: String
     @Binding var showSheet: Bool
 
+//    @Binding var showSheet: Bool
+    @Binding var collectedSongData: CollectedSong?
+
+
     var body: some View {
         VStack(spacing: 0) {
             HStack(spacing: 16) {
@@ -43,7 +48,7 @@ struct HalfSheetView: View {
             Spacer()
         }
         .onAppear() {
-            print("****\(songData)")
+            print("****\(collectedSongData?.title)")
         }
     }
 }

diff --git a/Halmap/View/MainSongListTabView.swift b/Halmap/View/MainSongListTabView.swift
@@ -26,6 +26,9 @@ struct MainSongListTabView: View {
     @Environment(\.dismiss) private var sheetDismiss
     @Environment(\.dismiss) private var navigationLinkDismiss
 
+    let persistence = PersistenceController.shared
+    @State var temp: CollectedSong?
+
     init() {
         Color.setColor(selectedTeam)
     }
@@ -105,13 +108,16 @@ struct MainSongListTabView: View {
                                             isActivateNavigationLink = false
                                             sheetDismiss()
 
+                                            temp = persistence.createCollectedSong(song: songInfo, playListTitle: "playList")
+
+
                                         } label: {
                                             Image(systemName: "ellipsis").foregroundColor(.customDarkGray)
                                         }
                                         .sheet(isPresented: $isShowingSheet) {
                                             HalfSheet{
                                                 let collectedSong = CollectedSong(context: viewContext)
-                                                HalfSheetView(collectedSong: collectedSong, songData: music, team: selectedTeam, showSheet: $isShowingSheet)
+                                                HalfSheetView(collectedSong: collectedSong, songData: music, team: selectedTeam, showSheet: $isShowingSheet, collectedSongData: $temp)
                                             }
                                         }
                                     }.frame(width: 20, height: 20)
@@ -188,14 +194,16 @@ struct MainSongListTabView: View {
                                             isShowingSheet = true
                                             isActivateNavigationLink = false
                                             sheetDismiss()
+
+                                            temp = persistence.createCollectedSong(song: songInfo, playListTitle: "playList")
 
                                         } label: {
                                             Image(systemName: "ellipsis").foregroundColor(.customDarkGray)
                                         }
                                         .sheet(isPresented: $isShowingSheet) {
                                             HalfSheet{
                                                 let collectedSong = CollectedSong(context: viewContext)
-                                                HalfSheetView(collectedSong: collectedSong, songData: music, team: selectedTeam, showSheet: $isShowingSheet)
+                                                HalfSheetView(collectedSong: collectedSong, songData: music, team: selectedTeam, showSheet: $isShowingSheet, collectedSongData: $temp)
                                             }
                                         }
                                     }.frame(width: 20, height: 20)