[#10] 기본 탭에서 '하는 중'/'완료' 구분하기

Author: hiddenparts

Todo/Model/TaskManager.swift

@@ -9,7 +9,7 @@ import Foundation
 
 
 protocol Manager {
-    var tasks: [TaskModel] { get }
+    var tasks: [TaskModel] { get set }
 
     func load() -> [TaskModel]
     func save(task: TaskModel)
@@ -19,7 +19,7 @@ protocol Manager {
 
 @Observable
 class TaskManager: Manager {
-    private(set) var tasks: [TaskModel]
+    var tasks: [TaskModel]
 
     init() {
         tasks = []

Todo/View/Main/MainView.swift

@@ -10,6 +10,9 @@ import SwiftUI
 struct MainView: View {
     @Environment(TaskManager.self) var taskManager
 
+    var tasks: [TaskModel] { taskManager.tasks.filter { $0.isDone == false } }
+    var doneTasks: [TaskModel] {taskManager.tasks.filter { $0.isDone == true } }
+    
     var body: some View {
         @Bindable var taskManager = taskManager
 
@@ -19,7 +22,7 @@ struct MainView: View {
                     if taskManager.tasks.isEmpty {
                         TaskEmptyView()
                     } else {
-                        ForEach(taskManager.tasks) {
+                        ForEach(tasks) {
                             TaskListItemView(task: $0)
                                 .swipeActions {
                                     Button("삭제") {
@@ -34,11 +37,19 @@ struct MainView: View {
                 }
 
                 Section {
-                    
+                    ForEach(doneTasks) {
+                        TaskListItemView(task: $0)
+                            .swipeActions {
+                                Button("삭제") {
+                                    
+                                }.tint(Color.Todo.red)
+                            }
+                    }
                 } header: {
                     Text("완료")
                 }
             }
+            .buttonStyle(.borderless) // 리스트에서 아이템을 탭했을때 모든 버튼들이 이벤트를 동시에 받는 것을 방지
             .toolbar {
                 ToolbarItem(placement: .topBarLeading) {
                     Text("Todoo")

Todo/View/Main/TaskListItemView.swift

@@ -8,36 +8,56 @@
 import SwiftUI
 
 struct TaskListItemView: View {
+    @Environment(TaskManager.self) var taskManager
     var task: TaskModel
 
-    @State private var isDone: Bool = false
-    @State private var isFavorite: Bool = false
-    
+    var taskIndex: Int {
+        taskManager.tasks.firstIndex(where: { $0.id == task.id })!
+    }
+
     var body: some View {
+        @Bindable var taskManager = taskManager
+        
         HStack {
-            Button {
-                isDone.toggle()
-            } label: {
-                Image(isDone ? "ic_notyet_fill" : "ic_notyet")
-                    .resizable()
-                    .frame(width: 30, height: 30)
-            }
+            DoneButton(isDone: $taskManager.tasks[taskIndex].isDone)
 
             Text(task.task)
                 .font(.Todo.r16)
                 .lineLimit(1)
 
             Spacer()
 
-            Button {
-                isFavorite.toggle()
-            } label: {
-                Image(isFavorite ? "ic_tap_star_fill" : "ic_tap_star")
-                    .foregroundStyle(isFavorite ? Color.Todo.red : Color.Todo.black)
-            }
-            
+            FavoriteButton(isFavorite: $taskManager.tasks[taskIndex].isFavorite)
+        }
+    }
+}
+
+struct DoneButton: View {
+    @Binding var isDone: Bool
+    
+    var body: some View {
+        Button {
+            print("done button")
+            isDone.toggle()
+        } label: {
+            Image(isDone ? "ic_notyet_fill" : "ic_notyet")
+                .resizable()
+                .frame(width: 30, height: 30)
+        }
+    }
+}
+
+struct FavoriteButton: View {
+    @Binding var isFavorite: Bool
+    
+    var body: some View {
+        Button {
+            print("favorite button")
+            isFavorite.toggle()
+        } label: {
+            Image(isFavorite ? "ic_tap_star_fill" : "ic_tap_star")
+                .foregroundStyle(isFavorite ? Color.Todo.red : Color.Todo.black)
         }
-        .buttonStyle(.borderless) // 리스트에서 아이템을 탭했을때 모든 버튼들이 이벤트를 동시에 받는 것을 방지
     }
 }