[#440] 맥으로 Todo를 작성 혹은 수정 시 시트 대신 새 창이 뜨도록 수정한다

Application/DevLogApp/Sources/App/DevLogApp.swift

@@ -16,6 +16,7 @@ struct DevLogApp: App {
     @UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
     @Environment(\.diContainer) var container: DIContainer
     @Environment(\.scenePhase) var scenePhase
+    @State private var windowEvent = TodoEditorWindowEvent()
 
     init() {
         AppAssembler().assemble(AppDIContainer.shared)
@@ -33,10 +34,23 @@ struct DevLogApp: App {
                 clearPushNotificationRoute: { PushNotificationRoute.shared.clear() }
             )
             .autocorrectionDisabled()
+            .environment(windowEvent)
             .onChange(of: scenePhase) { _, phase in
                 guard phase == .background else { return }
                 container.resolve(WidgetSyncEventBus.self).publish(.syncRequested)
             }
         }
+        WindowGroup(id: TodoEditorWindowValue.sceneId, for: TodoEditorWindowValue.self) { value in
+            if let value = value.wrappedValue {
+                TodoEditorWindowView(value: value)
+                .autocorrectionDisabled()
+                .environment(windowEvent)
+            } else {
+                ContentUnavailableView(
+                    String(localized: "todo_edit"),
+                    systemImage: "square.and.pencil"
+                )
+            }
+        }
     }
 }

Application/DevLogPresentation/Sources/Extension/EnvironmentValues+.swift

@@ -21,6 +21,10 @@ extension EnvironmentValues {
         self[SceneHeightKey.self]
     }
 
+    var isiOSAppOnMac: Bool {
+        self[IOSAppOnMacKey.self]
+    }
+
     private struct SafeAreaInsetsKey: EnvironmentKey {
         static var defaultValue: EdgeInsets {
             guard let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
@@ -48,6 +52,12 @@ extension EnvironmentValues {
             return windowScene.screen.bounds.height
         }
     }
+
+    private struct IOSAppOnMacKey: EnvironmentKey {
+        static var defaultValue: Bool {
+            ProcessInfo.processInfo.isiOSAppOnMac
+        }
+    }
 }
 
 extension UIEdgeInsets {

Application/DevLogPresentation/Sources/Home/Home/HomeView.swift

@@ -9,6 +9,9 @@ import SwiftUI
 import DevLogDomain
 
 struct HomeView: View {
+    @Environment(TodoEditorWindowEvent.self) private var windowEvent
+    @Environment(\.openWindow) private var openWindow
+    @Environment(\.isiOSAppOnMac) private var isiOSAppOnMac
     @ScaledMetric(relativeTo: .largeTitle) private var labelWidth = CGFloat(34)
     let coordinator: HomeViewCoordinator
     let isCompactLayout: Bool
@@ -87,6 +90,9 @@ struct HomeView: View {
                 LoadingView()
             }
         }
+        .onChange(of: windowEvent.submitted) { _, submitted in
+            handleTodoEditorSubmit(submitted)
+        }
     }
 
     @ViewBuilder
@@ -272,6 +278,7 @@ struct HomeView: View {
             } label: {
                 RecentTodoRow(todo: item)
                     .frame(maxWidth: .infinity, alignment: .leading)
+                    .contentShape(.rect)
             }
             .buttonStyle(.plain)
         }
@@ -290,6 +297,7 @@ struct HomeView: View {
                 } label: {
                     WebItemRow(item: item, showsChevron: false)
                         .frame(maxWidth: .infinity, alignment: .leading)
+                        .contentShape(.rect)
                 }
                 .buttonStyle(.plain)
             }
@@ -314,7 +322,7 @@ struct HomeView: View {
                         ForEach(preferences, id: \.id) { item in
                             Button {
                                 DispatchQueue.main.async {
-                                    coordinator.viewModel.send(.tapTodoCategory(item.category))
+                                    openTodoEditor(for: item.category)
                                 }
                             } label: {
                                 labelImage(
@@ -384,6 +392,24 @@ struct HomeView: View {
         .contentShape(.rect)
     }
 
+    private func openTodoEditor(for todoCategory: TodoCategory) {
+        if isiOSAppOnMac {
+            coordinator.viewModel.send(.setPresentation(.contentPicker, false))
+            openWindow(
+                id: TodoEditorWindowValue.sceneId,
+                value: TodoEditorWindowValue(todoCategory: todoCategory, source: .home)
+            )
+        } else {
+            coordinator.viewModel.send(.tapTodoCategory(todoCategory))
+        }
+    }
+
+    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {
+        guard let submit,
+              submit.value.matchesCreate(source: .home) else { return }
+        coordinator.viewModel.send(.addTodo(submit.todo))
+    }
+
 }
 
 enum HomeRoute: Hashable {

Application/DevLogPresentation/Sources/Home/TodoDetailView.swift

@@ -11,6 +11,9 @@ import DevLogDomain
 
 struct TodoDetailView: View {
     @Environment(\.diContainer) private var container: DIContainer
+    @Environment(TodoEditorWindowEvent.self) private var windowEvent
+    @Environment(\.openWindow) private var openWindow
+    @Environment(\.isiOSAppOnMac) private var isiOSAppOnMac
     @State var viewModel: TodoDetailViewModel
 
     var body: some View {
@@ -29,6 +32,9 @@ struct TodoDetailView: View {
             }
         }
         .onAppear { viewModel.send(.onAppear) }
+        .onChange(of: windowEvent.submitted) { _, submitted in
+            handleTodoEditorSubmit(submitted)
+        }
         .navigationBarTitleDisplayMode(.inline)
         .sheet(isPresented: Binding(
             get: { viewModel.state.showInfo },
@@ -90,14 +96,32 @@ struct TodoDetailView: View {
             }
             ToolbarItem(placement: .topBarTrailing) {
                 Button {
-                    viewModel.send(.setShowEditor(true))
+                    openTodoEditor()
                 } label: {
                     Text(String(localized: "todo_edit"))
                 }
             }
         }
     }
 
+    private func openTodoEditor() {
+        if isiOSAppOnMac {
+            guard let todo = viewModel.state.todo else { return }
+            openWindow(
+                id: TodoEditorWindowValue.sceneId,
+                value: TodoEditorWindowValue(todo: todo)
+            )
+        } else {
+            viewModel.send(.setShowEditor(true))
+        }
+    }
+
+    private func handleTodoEditorSubmit(_ submit: TodoEditorWindowSubmit?) {
+        guard let submit,
+              submit.value.matchesEdit(todoId: viewModel.todoId) else { return }
+        viewModel.send(.upsertTodo(submit.todo))
+    }
+
     @ViewBuilder
     private var sheetContent: some View {
         if let todo = viewModel.state.todo {

Application/DevLogPresentation/Sources/Home/TodoEditorView.swift

@@ -15,15 +15,17 @@ struct TodoEditorView: View {
     @State var viewModel: TodoEditorViewModel
     @Environment(\.diContainer) private var container: DIContainer
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.isiOSAppOnMac) private var isiOSAppOnMac
     @FocusState private var field: Field?
     private let calendar = Calendar.current
     var onSubmit: ((Todo) -> Void)?
+    var onClose: (() -> Void)?
 
     var body: some View {
         NavigationStack {
             ScrollView {
                 LazyVStack(spacing: 10) {
-                    titleField
+                    titleSection
                     LazyVStack(
                         alignment: .leading,
                         spacing: 0,
@@ -32,7 +34,10 @@ struct TodoEditorView: View {
                         Section {
                             tabView
                         } header: {
-                            tabViewSelector
+                            if !isiOSAppOnMac {
+                                tabPicker
+                                    .padding(.horizontal)
+                            }
                         }
                     }
                 }
@@ -74,7 +79,9 @@ struct TodoEditorView: View {
                 .presentationDragIndicator(.visible)
             }
             .toolbar {
-                ToolbarLeadingButton { dismiss() }
+                if !isiOSAppOnMac {
+                    ToolbarLeadingButton { close() }
+                }
                 ToolbarItem(placement: .topBarTrailing) {
                     Button {
                         viewModel.send(.setShowInfo(true))
@@ -90,6 +97,22 @@ struct TodoEditorView: View {
         }
     }
 
+    @ViewBuilder
+    private var titleSection: some View {
+        Group {
+            if isiOSAppOnMac {
+                HStack(spacing: 12) {
+                    titleField
+                    tabPicker
+                        .frame(width: 180)
+                }
+            } else {
+                titleField
+            }
+        }
+        .padding(.horizontal)
+    }
+
     private var titleField: some View {
         TextField(
             "",
@@ -102,10 +125,9 @@ struct TodoEditorView: View {
         .font(.title2)
         .frame(height: 30)
         .focused($field, equals: .title)
-        .padding(.horizontal)
     }
 
-    private var tabViewSelector: some View {
+    private var tabPicker: some View {
         Picker(
             "",
             selection: Binding(
@@ -126,7 +148,6 @@ struct TodoEditorView: View {
                 .tag(TodoEditorViewModel.Tag.preview)
         }
         .pickerStyle(.segmented)
-        .padding(.horizontal)
     }
 
     private var tabView: some View {
@@ -180,7 +201,15 @@ struct TodoEditorView: View {
     private func submit() {
         let todo = viewModel.makeTodo()
         onSubmit?(todo)
-        dismiss()
+        close()
+    }
+
+    private func close() {
+        if let onClose {
+            onClose()
+        } else {
+            dismiss()
+        }
     }
 
     private func transitionToPreview() {

Application/DevLogPresentation/Sources/Home/TodoEditorWindowEvent.swift

@@ -0,0 +1,24 @@
+//
+//  TodoEditorWindowEvent.swift
+//  DevLogPresentation
+//
+//  Created by opfic on 5/31/26.
+//
+
+import Foundation
+import DevLogDomain
+
+@MainActor
+@Observable
+public final class TodoEditorWindowEvent {
+    var submitted: TodoEditorWindowSubmit?
+
+    public init() { }
+
+    func submit(
+        value: TodoEditorWindowValue,
+        todo: Todo
+    ) {
+        submitted = TodoEditorWindowSubmit(value: value, todo: todo)
+    }
+}