feat: Styles views for macos

Sources/PressureEstimationsFeature/EquipmentMeasurementForm.swift

@@ -284,9 +284,10 @@ public struct EquipmentMeasurementFormView: View {
       if store.allowEquipmentTypeSelection {
         Section {
         } header: {
-          Text("Equipment Type")
+          SectionHeaderLabel("Equipment Type")
         } footer: {
           EquipmentTypePicker(selection: $store.equipmentType)
+            .dynamicBottomPadding()
             .pickerStyle(.segmented)
             .labelsHidden()
         }
@@ -295,9 +296,10 @@ public struct EquipmentMeasurementFormView: View {
         Grid(alignment: .leading, horizontalSpacing: 40) {
           ForEach(store.pressureFields, content: gridRow(for:))
         }
+        .dynamicBottomPadding()
       } header: {
         HStack {
-          Text("Static Measurements")
+          SectionHeaderLabel("Static Measurements")
           Spacer()
           InfoButton { send(.infoButtonTapped) }
         }
@@ -310,7 +312,7 @@ public struct EquipmentMeasurementFormView: View {
       } header: {
         HStack {
           Spacer()
-          Text(store.sharedSettings.equipmentMetadata.coolingCapacity.description)
+          SectionHeaderLabel(store.sharedSettings.equipmentMetadata.coolingCapacity.description)
         }
       } footer: {
         HStack {
@@ -348,7 +350,8 @@ public struct EquipmentMeasurementFormView: View {
   }
   
   private func gridRow(for field: EquipmentMeasurementForm.State.Field) -> some View {
-    TextLabeledContent(store.label(field: field)) {
+    GridRow {
+      TextLabel(store.label(field: field))
       textField(for: field)
     }
   }

Sources/PressureEstimationsFeature/EquipmentSettingsForm.swift

@@ -133,18 +133,19 @@ public struct EquipmentSettingsFormView: View {
     Form {
       Section {
         EquipmentTypePicker(selection: $store.equipmentType)
+          .dynamicBottomPadding()
           .pickerStyle(.segmented)
-        EmptyView()
       } header: {
-        Text("Equipment Type")
+        SectionHeaderLabel("Equipment Type")
       }
       .listRowBackground(Color.clear)
       
       Section {
         FanTypePicker(selection: $store.sharedSettings.fanType)
+          .dynamicBottomPadding()
           .pickerStyle(.segmented)
       } header: {
-        Text("Fan Type")
+        SectionHeaderLabel("Fan Type")
       }
       .listRowBackground(Color.clear)
       
@@ -175,11 +176,13 @@ public struct EquipmentSettingsFormView: View {
             }
           }
         }
+        .dynamicBottomPadding()
+//        .applyPadding()
       } header: {
         if store.equipmentType == .airHandler {
           EmptyView()
         } else {
-          Text("Capacities")
+          SectionHeaderLabel("Capacities")
         }
       }
 
@@ -187,6 +190,7 @@ public struct EquipmentSettingsFormView: View {
         Grid(alignment: .leading, horizontalSpacing: 40) {
           ForEach(RatingsField.allCases, content: ratingsRow(for:))
         }
+        .dynamicBottomPadding()
         .labeledContentStyle(.gridRow)
       } header: {
         header("Rated Static Pressure", infoView: .ratedStaticPressures)
@@ -262,7 +266,7 @@ public struct EquipmentSettingsFormView: View {
     label: @escaping () -> Label
   ) -> some View {
     HStack {
-      label()
+      SectionHeaderLabel { label() }
       Spacer()
       InfoButton { send(.infoButtonTapped(infoView)) }
     }
@@ -285,6 +289,17 @@ public struct EquipmentSettingsFormView: View {
   }
 }
 
+fileprivate extension View {
+  @ViewBuilder
+  func applyPadding() -> some View {
+    #if os(macOS)
+    self.padding(.bottom, 20)
+    #else
+    self
+    #endif
+  }
+}
+
 fileprivate struct BudgetFlagViewStyle: FlaggedViewStyle {
 
   func makeBody(configuration: Configuration) -> some View {

Sources/PressureEstimationsFeature/PressureEstimations.swift

@@ -108,9 +108,11 @@ public struct PressureEstimationsView: View {
   }
   
   public var body: some View {
-    EquipmentSettingsFormView(
-      store: store.scope(state: \.equipmentSettings, action: \.equipmentSettings)
-    )
+    ScrollView {
+      EquipmentSettingsFormView(
+        store: store.scope(state: \.equipmentSettings, action: \.equipmentSettings)
+      )
+    }
     .navigationTitle("Equipment Settings")
     .toolbar {
       NextButton { send(.nextButtonTapped) }
@@ -123,10 +125,11 @@ public struct PressureEstimationsView: View {
         action: \.destination.equipmentMeasurements
       )
     ) { measurementStore in
-      EquipmentMeasurementFormView(store: measurementStore)
-        .navigationTitle("Existing Measurements")
+      ScrollView {
+        EquipmentMeasurementFormView(store: measurementStore)
+          .navigationTitle("Existing Measurements")
+      }
     }
-
   }
 }