sujileelea: Model, View 수정 및 Asset 추가

DragDrop/DragDrop.xcodeproj/project.pbxproj

@@ -63,6 +63,7 @@
 		09B062AF2BAC1D7500C79B1D /* TaskEditModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskEditModal.swift; sourceTree = "<group>"; };
 		09B062B12BAC1D7C00C79B1D /* TaskAddModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskAddModal.swift; sourceTree = "<group>"; };
 		09B062B32BAC202500C79B1D /* TaskCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskCard.swift; sourceTree = "<group>"; };
+		09E6637B2BD7904400530EE8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		09F0859A2BB2A84300EDB6C2 /* Board.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Board.swift; sourceTree = "<group>"; };
 		09F0859C2BB2C5A200EDB6C2 /* CategoryListSidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryListSidebar.swift; sourceTree = "<group>"; };
 		09F0859E2BB2C5C400EDB6C2 /* CategoryAddModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CategoryAddModal.swift; sourceTree = "<group>"; };
@@ -116,6 +117,7 @@
 		09B062742BAC186400C79B1D /* DragDrop */ = {
 			isa = PBXGroup;
 			children = (
+				09E6637B2BD7904400530EE8 /* Info.plist */,
 				09B0627B2BAC186500C79B1D /* Assets.xcassets */,
 				09B062752BAC186400C79B1D /* DragDropApp.swift */,
 				09B062772BAC186400C79B1D /* ContentView.swift */,
@@ -496,6 +498,7 @@
 				DEVELOPMENT_TEAM = 53DAD6BN6X;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = DragDrop/Info.plist;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -525,6 +528,7 @@
 				DEVELOPMENT_TEAM = 53DAD6BN6X;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
+				INFOPLIST_FILE = DragDrop/Info.plist;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;

DragDrop/DragDrop.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,24 @@
+{
+  "originHash" : "f85ec36b55e6c3bddc4e146f4fc996922ed5c902954d863dc9c50577c5aae4c9",
+  "pins" : [
+    {
+      "identity" : "popupview",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/exyte/PopupView.git",
+      "state" : {
+        "revision" : "8c85ff09d474dd3cfb69aba33046395bcf365573",
+        "version" : "2.9.1"
+      }
+    },
+    {
+      "identity" : "swiftui-introspect",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/siteline/swiftui-introspect",
+      "state" : {
+        "revision" : "0cd2a5a5895306bc21d54a2254302d24a9a571e4",
+        "version" : "1.1.3"
+      }
+    }
+  ],
+  "version" : 3
+}

DragDrop/DragDrop/ContentView.swift

@@ -17,22 +17,11 @@ struct ContentView: View {
     var body: some View {
         var _: Category = Category(name: "test")
         NavigationStack {
-            MainPage()
+            BoardPage()
         }
     }
 }
 
-extension Category {
-    // TO DO :  move to MainPage.swift
-    func addCategory(name: String) {
-        withAnimation {
-            let newCategory = Category(name: name)
-            modelContext?.insert(newCategory)
-        }
-    }
-}
-
-
 //struct ContentView: View {
 //    @Environment(\.modelContext) private var modelContext
 //    @Query private var items: [Item]

DragDrop/DragDrop/DragDropApp.swift

@@ -12,7 +12,7 @@ import SwiftData
 struct DragDropApp: App {
     var sharedModelContainer: ModelContainer = {
         let schema = Schema([
-            Category.self, Task.self
+            Category.self, TaskData.self
         ])
         let modelConfiguration = ModelConfiguration(schema: schema, isStoredInMemoryOnly: false)
 

DragDrop/DragDrop/Info.plist

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>com.public.data</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>TaskItem</string>
+			<key>UTTypeIconFiles</key>
+			<array/>
+			<key>UTTypeIdentifier</key>
+			<string>com.sujileelea.DragDrop.taskItem</string>
+			<key>UTTypeTagSpecification</key>
+			<dict/>
+		</dict>
+	</array>
+</dict>
+</plist>

DragDrop/DragDrop/Model/Board.swift

@@ -10,11 +10,10 @@ import SwiftData
 
 @Model
 final class Board {
-    var pinnedTasks: [Task]
+    var pinnedTasks: [TaskItem]
     var categories: [Category] = [Category(name: "board")]
 
-    init(pinnedTasks: [Task]) {
+    init(pinnedTasks: [TaskItem]) {
         self.pinnedTasks = pinnedTasks
     }
 }
-

DragDrop/DragDrop/Model/Category.swift

@@ -11,7 +11,7 @@ import SwiftData
 @Model
 final class Category {
     @Attribute(.unique) var name: String
-    @Relationship(deleteRule: .cascade) var tasks: [Task]?
+    @Relationship(deleteRule: .cascade) var taskItems: [TaskItem]?
 
     init(name: String) {
         self.name = name

DragDrop/DragDrop/Model/Task.swift

@@ -7,22 +7,33 @@
 
 import Foundation
 import SwiftData
+import UniformTypeIdentifiers
+import SwiftUI
+
 
 @Model
-class Task {
+class TaskData {
+    var taskItems: [TaskItem]?
+
+    init(taskItems: [TaskItem]? = nil) {
+        self.taskItems = taskItems
+    }
+}
+
+struct TaskItem: Equatable, Identifiable, Codable, Transferable {
+    static var transferRepresentation: some TransferRepresentation {
+        CodableRepresentation(for: TaskItem.self, contentType: .taskItem)
+    }
+    var id: String
     var name: String
-    @Attribute(.unique) var category: String
+    var category: String
     var isPinned: Bool {
-        if category == "board" {
-            return true
-        } else {
-            return  false
-        }
-    }
-    var isDone: Bool = false
-
-    init(name: String, category: String) {
-        self.name = name
-        self.category = category
+        return category == "board"
     }
+    var isDone: Bool
 }
+
+extension UTType {
+    static var taskItem = UTType(exportedAs: "com.sujileelea.DragDrop.taskItem")
+}
+

DragDrop/DragDrop/View/BoardEditPage.swift

@@ -1,18 +1,20 @@
 //
-//  EditPage.swift
+//  BoardEditPage.swift
 //  DragDrop
 //
 //  Created by Suji Lee on 3/21/24.
 //
 
 import SwiftUI
 
-struct EditPage: View {
+struct BoardEditPage: View {
+    @Environment(\.modelContext) private var modelContext
+
     var body: some View {
         Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
     }
 }
 
 #Preview {
-    EditPage()
+    BoardEditPage()
 }

DragDrop/DragDrop/View/BoardPage.swift

@@ -1,5 +1,5 @@
 //
-//  MainPage.swift
+//  BoardPage.swift
 //  DragDrop
 //
 //  Created by Suji Lee on 3/21/24.
@@ -8,10 +8,12 @@
 import SwiftUI
 import SwiftData
 
-struct MainPage: View {
+struct BoardPage: View {
+    @Environment(\.modelContext) private var modelContext
     //    @Query private var tasks: [Task]
     let today = Date().formatted(.iso8601.year().month().day())
-    var tasks: [Task] = [Task(name: "one", category: "One"), Task(name: "two", category: "Two")]
+    @State var taskItems: [TaskItem] = [TaskItem(id: "1", name: "one", category: "iOS", isDone: false), TaskItem(id: "2", name: "two", category: "Year", isDone: false), TaskItem(id: "3", name: "three", category: "iOS", isDone: false)]
+    @State private var draggingItem: TaskItem?
 
     var body: some View {
         NavigationView {
@@ -34,12 +36,33 @@ struct MainPage: View {
                 }
                 //Board List
                     VStack {
-                        List {
-                            ForEach(tasks) { task in
-                                TaskCard(task: task, isOnBoard: true)
+                        ScrollView {
+                            ForEach(taskItems) { taskItem in
+                                TaskCard(task: taskItem, isOnBoard: true)
                                     .listRowBackground(Color.clear)
+                                    .draggable(taskItem) {
+                                        /// Custom Preview View
+                                        EmptyView()
+                                            .onAppear {
+                                                draggingItem = taskItem
+                                            }
+                                    }
+                                    .dropDestination(for: TaskItem.self) { items, location in
+                                        draggingItem = nil
+                                        return false
+                                    } isTargeted: { status in
+                                        if let draggingItem, status, draggingItem != taskItem {
+                                            /// Moving Color from source to destination
+                                            if let sourceIndex = taskItems.firstIndex(of: draggingItem),
+                                               let destinationIndex = taskItems.firstIndex(of: taskItem) {
+                                                withAnimation(.bouncy) {
+                                                    let sourceItem = taskItems.remove(at: sourceIndex)
+                                                    taskItems.insert(sourceItem, at: destinationIndex)
+                                                }
+                                            }
+                                        }
+                                    }
                             }
-                            .listRowSeparator(.hidden)
                         }
                         .cornerRadius(10)
                     }
@@ -59,5 +82,5 @@ struct MainPage: View {
 }
 
 #Preview {
-    MainPage()
+    BoardPage()
 }

DragDrop/DragDrop/View/CategoryAddModal.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct CategoryAddModal: View {
+    @Environment(\.modelContext) private var modelContext
+
     var body: some View {
         Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
     }

DragDrop/DragDrop/View/CategoryListSidebar.swift

@@ -8,9 +8,18 @@
 import SwiftUI
 
 struct CategoryListSidebar: View {
+    @Environment(\.modelContext) private var modelContext
+
     var body: some View {
         Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
     }
+
+    func addCategory(name: String) {
+        withAnimation {
+            let newCategory = Category(name: name)
+            modelContext.insert(newCategory)
+        }
+    }
 }
 
 #Preview {

DragDrop/DragDrop/View/Components/TaskCard.swift

@@ -8,7 +8,8 @@
 import SwiftUI
 
 struct TaskCard: View {
-    var task: Task
+
+    var task: TaskItem
     var isOnBoard: Bool
 
     var body: some View {
@@ -42,6 +43,6 @@ struct TaskCard: View {
     }
 }
 
-#Preview {
-    TaskCard(task: Task(name: "preview", category: "Preview"), isOnBoard: false)
-}
+//#Preview {
+//    TaskCard(task: TaskItem(name: "preview", category: "Preview"), isOnBoard: false)
+//}

DragDrop/DragDrop/View/TaskAddModal.swift

@@ -8,6 +8,7 @@
 import SwiftUI
 
 struct TaskAddModal: View {
+    @Environment(\.modelContext) private var modelContext
     @State private var title: String = ""
     @State private var isPinned: Bool = false
     @State private var isCompleted: Bool = false

DragDrop/DragDrop/View/TaskEditModal.swift

@@ -8,6 +8,8 @@
 import SwiftUI
 
 struct TaskEditModal: View {
+    @Environment(\.modelContext) private var modelContext
+
     var body: some View {
         Text(/*@START_MENU_TOKEN@*/"Hello, World!"/*@END_MENU_TOKEN@*/)
     }