The gridMode is now updating UserDefaults as in the UIKit code

neoneye · neoneye · commit 9e907a6a12bc · 2023-01-12T13:02:45.000+01:00
diff --git a/Source/TriangleDrawMain/Canvas/CanvasViewController.swift b/Source/TriangleDrawMain/Canvas/CanvasViewController.swift
@@ -530,7 +530,8 @@ extension CanvasViewController: HCMenuViewControllerDelegate {
 		self.subdivide(n: n)
 	}
 
-	func hcMenuViewController_canvasGridModeDidChange() {
+	func hcMenuViewController_canvasGridModeDidChange(gridMode: CanvasGridMode) {
+        CanvasGridModeController().changeCanvasGridMode(to: gridMode)
 		hcView?.canvasGridModeDidChange()
 	}
 }
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift
@@ -5,11 +5,12 @@ import TriangleDrawLibrary
 struct HCMenuView: View {
     @ObservedObject var model: HCMenuViewModel
     @Environment(\.dismiss) var dismiss
-    @State private var gridMode: CanvasGridMode = CanvasGridMode.smallFixedSizeDots
+    @State private var gridMode: CanvasGridMode
     @State private var symmetryMode: SymmetryMode
 
     init(model: HCMenuViewModel, symmetryMode: SymmetryMode) {
         self.model = model
+        self._gridMode = State(initialValue: model.initialGridMode)
         self._symmetryMode = State(initialValue: symmetryMode)
     }
 
@@ -21,13 +22,15 @@ struct HCMenuView: View {
                         ForEach(CanvasGridMode.allCases, id: \.self) { value in
                             Text(value.localizedDisplayName).tag(value)
                         }
+                    }.onChange(of: gridMode) { newValue in
+                        self.model.delegate?.hcMenuViewController_canvasGridModeDidChange(gridMode: newValue)
                     }
                     Picker("Symmetry", selection: $symmetryMode) {
                         ForEach(SymmetryMode.allCases, id: \.self) { value in
                             Text(value.localizedDisplayName).tag(value)
                         }
-                    }.onChange(of: symmetryMode) { tag in
-                        globalSymmetryMode = tag
+                    }.onChange(of: symmetryMode) { newValue in
+                        globalSymmetryMode = newValue
                     }
                     NavigationLink("Subdivide") {
                         HCMenuSubdivideView() { n in
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift
@@ -8,7 +8,7 @@ import SwiftUI
 
 protocol HCMenuViewControllerDelegate: AnyObject {
 	func hcMenuViewController_applySubdivide(n: UInt8)
-	func hcMenuViewController_canvasGridModeDidChange()
+	func hcMenuViewController_canvasGridModeDidChange(gridMode: CanvasGridMode)
 }
 
 enum HexagonCanvasMenuDocument {
@@ -88,8 +88,7 @@ class HCMenuViewController: RFFormViewController {
 		instance.selected = CanvasGridMode.allCases.firstIndex(of: currentGridMode) ?? 0
 		instance.valueDidChangeBlock = { [weak self] value in
 			let gridMode: CanvasGridMode = CanvasGridMode.allCases[value]
-			CanvasGridModeController().changeCanvasGridMode(to: gridMode)
-			self?.delegate?.hcMenuViewController_canvasGridModeDidChange()
+			self?.delegate?.hcMenuViewController_canvasGridModeDidChange(gridMode: gridMode)
 		}
 		return instance
 	}()
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift
@@ -2,12 +2,20 @@
 import Foundation
 import Combine
 import SwiftUI
+import TriangleDrawLibrary
 
 public class HCMenuViewModel: ObservableObject {
     weak var delegate: HCMenuViewControllerDelegate?
+    var initialGridMode: CanvasGridMode
+
+    init() {
+        self.delegate = nil
+        self.initialGridMode = CanvasGridMode.smallFixedSizeDots
+    }
 
     static func create() -> HCMenuViewModel {
         let instance = HCMenuViewModel()
+        instance.initialGridMode = CanvasGridModeController().currentCanvasGridMode
         return instance
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,8 @@ extension CanvasViewController: HCMenuViewControllerDelegate {`
`530`	`530`	`self.subdivide(n: n)`
`531`	`531`	`}`
`532`	`532`
`533`		`- func hcMenuViewController_canvasGridModeDidChange() {`
	`533`	`+ func hcMenuViewController_canvasGridModeDidChange(gridMode: CanvasGridMode) {`
	`534`	`+ CanvasGridModeController().changeCanvasGridMode(to: gridMode)`
`534`	`535`	`hcView?.canvasGridModeDidChange()`
`535`	`536`	`}`
`536`	`537`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,12 @@ import TriangleDrawLibrary`
`5`	`5`	`struct HCMenuView: View {`
`6`	`6`	`@ObservedObject var model: HCMenuViewModel`
`7`	`7`	`@Environment(\.dismiss) var dismiss`
`8`		`- @State private var gridMode: CanvasGridMode = CanvasGridMode.smallFixedSizeDots`
	`8`	`+ @State private var gridMode: CanvasGridMode`
`9`	`9`	`@State private var symmetryMode: SymmetryMode`
`10`	`10`
`11`	`11`	`init(model: HCMenuViewModel, symmetryMode: SymmetryMode) {`
`12`	`12`	`self.model = model`
	`13`	`+ self._gridMode = State(initialValue: model.initialGridMode)`
`13`	`14`	`self._symmetryMode = State(initialValue: symmetryMode)`
`14`	`15`	`}`
`15`	`16`
`@@ -21,13 +22,15 @@ struct HCMenuView: View {`
`21`	`22`	`ForEach(CanvasGridMode.allCases, id: \.self) { value in`
`22`	`23`	`Text(value.localizedDisplayName).tag(value)`
`23`	`24`	`}`
	`25`	`+ }.onChange(of: gridMode) { newValue in`
	`26`	`+ self.model.delegate?.hcMenuViewController_canvasGridModeDidChange(gridMode: newValue)`
`24`	`27`	`}`
`25`	`28`	`Picker("Symmetry", selection: $symmetryMode) {`
`26`	`29`	`ForEach(SymmetryMode.allCases, id: \.self) { value in`
`27`	`30`	`Text(value.localizedDisplayName).tag(value)`
`28`	`31`	`}`
`29`		`- }.onChange(of: symmetryMode) { tag in`
`30`		`- globalSymmetryMode = tag`
	`32`	`+ }.onChange(of: symmetryMode) { newValue in`
	`33`	`+ globalSymmetryMode = newValue`
`31`	`34`	`}`
`32`	`35`	`NavigationLink("Subdivide") {`
`33`	`36`	`HCMenuSubdivideView() { n in`