Subdivide button now opens the Subdivide page

neoneye · neoneye · commit c7c186f1d30f · 2023-01-12T11:34:29.000+01:00
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuSubdivideView.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuSubdivideView.swift
@@ -2,26 +2,46 @@
 import SwiftUI
 
 struct HCMenuSubdivideView: View {
-    @State private var divisionSize: UInt = 2
+    let applySubdivide: (_ n: UInt8) -> Void
+    @State private var divisionSize: UInt8 = 2
+    let pickerValues: [UInt8] = [2, 3, 4, 5, 6, 7]
 
     var body: some View {
         Form {
-            Text("Split up all triangles into smaller triangles")
-            Picker("Divisions", selection: $divisionSize) {
-                Text("2").tag(2)
-                Text("3").tag(3)
-                Text("4").tag(4)
-                Text("5").tag(5)
-                Text("6").tag(6)
-                Text("7").tag(7)
-            }.pickerStyle(.wheel)
-            Button("Apply") {}
+            Section() {
+                HStack {
+                    Spacer()
+                    Text("Split up all triangles\ninto smaller triangles")
+                        .multilineTextAlignment(.center)
+                        .font(.title2)
+                    Spacer()
+                }
+            }
+            Section() {
+                Text("Select number of divisions")
+
+                Picker("Subdivide", selection: $divisionSize) {
+                    ForEach(pickerValues, id: \.self) { i in
+                        Text(String(i))
+                    }
+                }
+                .id(pickerValues)
+                .pickerStyle(.wheel)
+
+                Button("Apply") {
+                    self.applySubdivide(divisionSize)
+                }
+                .fontWeight(.bold)
+                .frame(maxWidth: .infinity, alignment: .center)
+            }
         }
+        .navigationTitle("Subdivide")
+        .navigationBarTitleDisplayMode(.inline)
     }
 }
 
 struct HCMenuSubdivideView_Previews: PreviewProvider {
     static var previews: some View {
-        HCMenuSubdivideView()
+        HCMenuSubdivideView() { _ in }
     }
 }
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuView.swift
@@ -9,7 +9,7 @@ struct HCMenuView: View {
     @State private var symmetryMode: SymmetryMode = SymmetryMode.noSymmetry
 
     var body: some View {
-        NavigationView {
+        NavigationStack {
             Form {
                 Section(header: Text("Grid system")) {
                     Picker("Format", selection: $gridMode) {
@@ -22,7 +22,12 @@ struct HCMenuView: View {
                             Text(value.localizedDisplayName).tag(value)
                         }
                     }
-                    Button("Subdivide") {}
+                    NavigationLink("Subdivide") {
+                        HCMenuSubdivideView() { n in
+                            model.delegate?.hcMenuViewController_applySubdivide(n: n)
+                            dismiss()
+                        }
+                    }
                 }
                 Section(header: Text("Export")) {
                     Button("Bitmap PNG") {}
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewController.swift
@@ -54,6 +54,7 @@ class HCMenuViewController: RFFormViewController {
 
     static func create(document: HexagonCanvasMenuDocument, delegate: HCMenuViewControllerDelegate?) -> UIViewController {
         let model = HCMenuViewModel.create()
+        model.delegate = delegate
         return UIHostingController(rootView: HCMenuView(model: model))
     }
 
diff --git a/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift b/Source/TriangleDrawMain/Canvas/Menu/HCMenuViewModel.swift
@@ -4,6 +4,8 @@ import Combine
 import SwiftUI
 
 public class HCMenuViewModel: ObservableObject {
+    weak var delegate: HCMenuViewControllerDelegate?
+
     static func create() -> HCMenuViewModel {
         let instance = HCMenuViewModel()
         return instance

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class HCMenuViewController: RFFormViewController {`
`54`	`54`
`55`	`55`	`static func create(document: HexagonCanvasMenuDocument, delegate: HCMenuViewControllerDelegate?) -> UIViewController {`
`56`	`56`	`let model = HCMenuViewModel.create()`
	`57`	`+ model.delegate = delegate`
`57`	`58`	`return UIHostingController(rootView: HCMenuView(model: model))`
`58`	`59`	`}`
`59`	`60`