feat: add tool and grid commands

Memola/Canvas/Core/Canvas.swift

@@ -181,6 +181,19 @@ extension Canvas {
             try context.saveIfNeeded()
         }
     }
+
+    func toggleGridMode() {
+        let _gridMode: GridMode
+        switch gridMode {
+        case .none:
+            _gridMode = .point
+        case .point:
+            _gridMode = .line
+        case .line:
+            _gridMode = .none
+        }
+        setGridMode(_gridMode)
+    }
 }
 
 // MARK: - Stroke

Memola/Canvas/Tool/Core/Tool.swift

@@ -35,6 +35,7 @@ final class Tool: NSObject, ObservableObject {
     }
 
     func selectTool(_ selection: ToolSelection) {
+        guard self.selection != selection else { return }
         self.selection = selection
         withPersistence(\.viewContext) { [weak object] context in
             object?.selection = selection.rawValue

Memola/Features/Memo/Memo/MemoView.swift

@@ -61,6 +61,8 @@ struct MemoView: View {
                 loadingIndicator("Loading photo...")
             }
         }
+        .focusedSceneObject(tool)
+        .focusedSceneObject(canvas)
         .focusedSceneObject(history)
         .focusedSceneValue(\.activeSceneKey, .memo)
     }

Memola/Features/Memo/Toolbar/Toolbar.swift

@@ -142,14 +142,7 @@ struct Toolbar: View {
     private var gridModeControl: some View {
         #if os(macOS)
         Button {
-            switch canvas.gridMode {
+            canvas.toggleGridMode()
-            case .none:
-                canvas.gridMode = .point
-            case .point:
-                canvas.gridMode = .line
-            case .line:
-                canvas.gridMode = .none
-            }
         } label: {
             Image(systemName: canvas.gridMode.icon)
                 .frame(width: size, height: size)

Memola/Shortcut/Commands/EditCommands.swift

@@ -10,25 +10,49 @@ import SwiftUI
 struct EditCommands: Commands {
     @FocusedValue(\.activeSceneKey) private var appScene
 
+    @FocusedObject var tool: Tool?
     @FocusedObject var history: History?
 
     var body: some Commands {
         CommandGroup(replacing: .undoRedo) {
-            if appScene == .memo, let history {
+            if appScene == .memo {
-                Button {
+                if let history {
-                    history.historyPublisher.send(.undo)
+                    Button {
-                } label: {
+                        history.historyPublisher.send(.undo)
-                    Text("Undo")
+                    } label: {
+                        Text("Undo")
+                    }
+                    .keyboardShortcut("z", modifiers: [.command])
+                    .disabled(history.undoDisabled)
+                    Button {
+                        history.historyPublisher.send(.redo)
+                    } label: {
+                        Text("Redo")
+                    }
+                    .keyboardShortcut("z", modifiers: [.command, .shift])
+                    .disabled(history.redoDisabled)
                 }
-                .keyboardShortcut("z", modifiers: [.command])
+                Divider()
-                .disabled(history.undoDisabled)
+                if let tool {
-                Button {
+                    Button {
-                    history.historyPublisher.send(.redo)
+                        tool.selectTool(.hand)
-                } label: {
+                    } label: {
-                    Text("Redo")
+                        Text("Hand Tool")
+                    }
+                    .keyboardShortcut("h", modifiers: [.option])
+                    Button {
+                        tool.selectTool(.pen)
+                    } label: {
+                        Text("Pen Tool")
+                    }
+                    .keyboardShortcut("p", modifiers: [.option])
+                    Button {
+                        tool.selectTool(.photo)
+                    } label: {
+                        Text("Photo Tool")
+                    }
+                    .keyboardShortcut("p", modifiers: [.option, .shift])
                 }
-                .keyboardShortcut("z", modifiers: [.command, .shift])
-                .disabled(history.redoDisabled)
             }
         }
         CommandGroup(replacing: .pasteboard) { }

Memola/Shortcut/Commands/ViewCommands.swift

@@ -9,23 +9,25 @@ import SwiftUI
 
 struct ViewCommands: Commands {
     @ObservedObject private var application: Application
+    
     @FocusedValue(\.activeSceneKey) private var appScene
 
+    @FocusedObject var canvas: Canvas?
+
     init(application: Application) {
         self.application = application
     }
 
     var body: some Commands {
         CommandGroup(replacing: .toolbar) {
-            if appScene == .memos || appScene == .trash {
+            switch appScene {
+            case .memos, .trash:
                 Button {
                     application.activateSearchBar()
                 } label: {
                     Text("Find Memo")
                 }
                 .keyboardShortcut("f", modifiers: [.command])
-            }
-            if appScene == .memos || appScene == .trash {
                 Button {
                     application.toggleSidebar()
                 } label: {
@@ -37,6 +39,15 @@ struct ViewCommands: Commands {
                     }
                 }
                 .keyboardShortcut("o", modifiers: [.command])
+            case .memo:
+                Button {
+                    canvas?.toggleGridMode()
+                } label: {
+                    Text("Change Grid Layout")
+                }
+                .keyboardShortcut("g", modifiers: [.option])
+            default:
+                EmptyView()
             }
         }
     }