Merge pull request #521 from insidegui/hotfix-install-config-save

Fix VM configuration not saved during setup

Author: insidegui

VirtualUI/Source/Installer/VMInstallationWizard.swift

@@ -53,9 +53,9 @@ public struct VMInstallationWizard: View {
 
     private var hideBottomBar: Bool {
         switch viewModel.step {
-        case .systemType, .restoreImageInput, .restoreImageSelection, .name, .configuration:
+        case .systemType, .restoreImageInput, .restoreImageSelection, .name:
             false
-        case .download, .install, .done:
+        case .configuration, .download, .install, .done:
             true
         }
     }
@@ -194,10 +194,7 @@ public struct VMInstallationWizard: View {
                 nextButton
             }
         }
-        .controlSize(.large)
-        .padding()
-        .background(Material.bar)
-        .overlay(alignment: .top) { Divider() }
+        .virtualBuddyBottomBarStyle()
     }
 
     @ViewBuilder
@@ -285,6 +282,17 @@ extension VMInstallationStep {
     }
 }
 
+extension View {
+    @ViewBuilder
+    func virtualBuddyBottomBarStyle() -> some View {
+        frame(maxWidth: .infinity)
+            .controlSize(.large)
+            .padding()
+            .background(Material.bar)
+            .overlay(alignment: .top) { Divider() }
+    }
+}
+
 #if DEBUG
 extension VMInstallationWizard {
     @ViewBuilder

VirtualUI/Source/VM Configuration/VMConfigurationSheet.swift

@@ -57,7 +57,7 @@ public struct VMConfigurationSheet: View {
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .safeAreaInset(edge: .bottom, spacing: 0) {
-            if !isInstall { buttons }
+            buttons
         }
         .resizableSheet(minWidth: Self.minWidth, maxWidth: .infinity, minHeight: 500, maxHeight: .infinity)
     }
@@ -84,14 +84,9 @@ public struct VMConfigurationSheet: View {
                 }
                 .keyboardShortcut(.defaultAction)
                 .disabled(showValidationErrors)
-                .controlSize(viewModel.context == .preInstall ? .large : .regular)
             }
         }
-        .frame(maxWidth: .infinity)
-        .padding(.horizontal)
-        .padding(.vertical, 12)
-        .background(Material.regular, in: Rectangle())
-        .overlay(alignment: .top) { Divider() }
+        .virtualBuddyBottomBarStyle()
         .onChange(of: viewModel.config) { newValue in
             guard showValidationErrors else { return }