Moved symmetryMode to ViewModel

neoneye · neoneye · commit 9ed882cba3d7 · 2023-01-12T13:06:01.000+01:00
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift
@@ -8,10 +8,10 @@ struct HCMenuView: View {
     @State private var gridMode: CanvasGridMode
     @State private var symmetryMode: SymmetryMode
 
-    init(model: HCMenuViewModel, symmetryMode: SymmetryMode) {
+    init(model: HCMenuViewModel) {
         self.model = model
         self._gridMode = State(initialValue: model.initialGridMode)
-        self._symmetryMode = State(initialValue: symmetryMode)
+        self._symmetryMode = State(initialValue: model.initialSymmetryMode)
     }
 
     var body: some View {
@@ -63,6 +63,6 @@ struct HCMenuView: View {
 
 struct HCMenuView_Previews: PreviewProvider {
     static var previews: some View {
-        HCMenuView(model: HCMenuViewModel(), symmetryMode: .noSymmetry)
+        HCMenuView(model: HCMenuViewModel())
     }
 }
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift
@@ -55,7 +55,7 @@ class HCMenuViewController: RFFormViewController {
     static func create(document: HexagonCanvasMenuDocument, delegate: HCMenuViewControllerDelegate?) -> UIViewController {
         let model = HCMenuViewModel.create()
         model.delegate = delegate
-        let rootView = HCMenuView(model: model, symmetryMode: globalSymmetryMode)
+        let rootView = HCMenuView(model: model)
         return UIHostingController(rootView: rootView)
     }
 
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift
@@ -7,15 +7,18 @@ import TriangleDrawLibrary
 public class HCMenuViewModel: ObservableObject {
     weak var delegate: HCMenuViewControllerDelegate?
     var initialGridMode: CanvasGridMode
+    var initialSymmetryMode: SymmetryMode
 
     init() {
         self.delegate = nil
         self.initialGridMode = CanvasGridMode.smallFixedSizeDots
+        self.initialSymmetryMode = SymmetryMode.noSymmetry
     }
 
     static func create() -> HCMenuViewModel {
         let instance = HCMenuViewModel()
         instance.initialGridMode = CanvasGridModeController().currentCanvasGridMode
+        instance.initialSymmetryMode = globalSymmetryMode
         return instance
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ struct HCMenuView: View {`
`8`	`8`	`@State private var gridMode: CanvasGridMode`
`9`	`9`	`@State private var symmetryMode: SymmetryMode`
`10`	`10`
`11`		`- init(model: HCMenuViewModel, symmetryMode: SymmetryMode) {`
	`11`	`+ init(model: HCMenuViewModel) {`
`12`	`12`	`self.model = model`
`13`	`13`	`self._gridMode = State(initialValue: model.initialGridMode)`
`14`		`- self._symmetryMode = State(initialValue: symmetryMode)`
	`14`	`+ self._symmetryMode = State(initialValue: model.initialSymmetryMode)`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`var body: some View {`
`@@ -63,6 +63,6 @@ struct HCMenuView: View {`
`63`	`63`
`64`	`64`	`struct HCMenuView_Previews: PreviewProvider {`
`65`	`65`	`static var previews: some View {`
`66`		`- HCMenuView(model: HCMenuViewModel(), symmetryMode: .noSymmetry)`
	`66`	`+ HCMenuView(model: HCMenuViewModel())`
`67`	`67`	`}`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class HCMenuViewController: RFFormViewController {`
`55`	`55`	`static func create(document: HexagonCanvasMenuDocument, delegate: HCMenuViewControllerDelegate?) -> UIViewController {`
`56`	`56`	`let model = HCMenuViewModel.create()`
`57`	`57`	`model.delegate = delegate`
`58`		`- let rootView = HCMenuView(model: model, symmetryMode: globalSymmetryMode)`
	`58`	`+ let rootView = HCMenuView(model: model)`
`59`	`59`	`return UIHostingController(rootView: rootView)`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -7,15 +7,18 @@ import TriangleDrawLibrary`
`7`	`7`	`public class HCMenuViewModel: ObservableObject {`
`8`	`8`	`weak var delegate: HCMenuViewControllerDelegate?`
`9`	`9`	`var initialGridMode: CanvasGridMode`
	`10`	`+ var initialSymmetryMode: SymmetryMode`
`10`	`11`
`11`	`12`	`init() {`
`12`	`13`	`self.delegate = nil`
`13`	`14`	`self.initialGridMode = CanvasGridMode.smallFixedSizeDots`
	`15`	`+ self.initialSymmetryMode = SymmetryMode.noSymmetry`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`static func create() -> HCMenuViewModel {`
`17`	`19`	`let instance = HCMenuViewModel()`
`18`	`20`	`instance.initialGridMode = CanvasGridModeController().currentCanvasGridMode`
	`21`	`+ instance.initialSymmetryMode = globalSymmetryMode`
`19`	`22`	`return instance`
`20`	`23`	`}`
`21`	`24`	`}`