Integrated dynamic type sizing accessibility

ENGAGEHF/Bluetooth/MeasurementManager.swift

@@ -33,6 +33,18 @@ class MeasurementManager: Module, EnvironmentAccessible {
         return manager
     }
 
+    var showSheet: Bool {
+        get {
+            newMeasurement != nil
+        }
+        set {
+            if !newValue {
+                self.newMeasurement = nil
+            }
+        }
+    }
+
+
     @ObservationIgnored @StandardActor private var standard: ENGAGEHFStandard
     private let logger = Logger(subsystem: "ENGAGEHF", category: "MeasurementManager")
 
@@ -42,10 +54,6 @@ class MeasurementManager: Module, EnvironmentAccessible {
 
     var newMeasurement: HKQuantitySample?
 
-    var showSheet: Bool {
-        newMeasurement != nil
-    }
-
 
     init() {
         MeasurementManager._manager = self
@@ -60,7 +68,6 @@ class MeasurementManager: Module, EnvironmentAccessible {
         self.deviceName = nil
     }
 
-
     // Called by WeightScaleDevice on change of WeightMeasurement Characteristic
     func loadMeasurement(_ measurement: WeightMeasurement) {
         // Convert to HKQuantitySample after downloading from Firestore
@@ -71,7 +78,7 @@ class MeasurementManager: Module, EnvironmentAccessible {
     // Called by UI Sheet View to save the newMeasurement to firestore
     func saveMeasurement() async throws {
         if ProcessInfo.processInfo.isPreviewSimulator {
-            try await Task.sleep(nanoseconds: 10_000_000_000)
+            try await Task.sleep(for: .seconds(5))
             return
         }
 

ENGAGEHF/Bluetooth/Views/ConfirmMeasurementButton.swift

@@ -31,6 +31,7 @@ struct DiscardButton: View {
 
 
 struct ConfirmMeasurementButton: View {
+    @ScaledMetric private var buttonHeight: CGFloat = 38
     @Binding var viewState: ViewState
 
 
@@ -43,7 +44,7 @@ struct ConfirmMeasurementButton: View {
                },
                label: {
                    Text("Save")
-                       .frame(maxWidth: .infinity, maxHeight: 38)
+                       .frame(maxWidth: .infinity, maxHeight: buttonHeight)
                        .font(.title2)
                        .bold()
                }

ENGAGEHF/Bluetooth/Views/MeasurementLayer.swift

@@ -9,40 +9,42 @@
 import SwiftUI
 
 
-private struct PreviewWrapperMeasurementLayer: View {
-    @Environment(MeasurementManager.self) private var measurementManager
-
-
-    var body: some View {
-        MeasurementLayer()
-            .onAppear {
-                measurementManager.loadMockMeasurement()
-            }
-    }
-}
-
-
 struct MeasurementLayer: View {
     @Environment(MeasurementManager.self) private var measurementManager
+    @Environment(\.dynamicTypeSize) private var dynamicTypeSize
     @ScaledMetric private var measurementTextSize: CGFloat = 60
 
 
     var body: some View {
         VStack(spacing: 15) {
-            Text(measurementManager.newMeasurement?.quantity.description ?? "???")
+            Text(measurementManager.newMeasurement?.quantity.description ?? "")
                 .font(.system(size: measurementTextSize, weight: .bold, design: .rounded))
                 .multilineTextAlignment(.center)
-            Text("Measurement Recorded")
-                .font(.title3)
-                .foregroundStyle(.secondary)
-                .multilineTextAlignment(.center)
+            if dynamicTypeSize < .accessibility4 {
+                Text("Measurement Recorded")
+                    .font(.title3)
+                    .foregroundStyle(.secondary)
+                    .multilineTextAlignment(.center)
+            }
         }
     }
 }
 
 
 #Preview {
-    PreviewWrapperMeasurementLayer()
+    struct PreviewWrapperMeasurementLayer: View {
+        @Environment(MeasurementManager.self) private var measurementManager
+
+
+        var body: some View {
+            MeasurementLayer()
+                .onAppear {
+                    measurementManager.loadMockMeasurement()
+                }
+        }
+    }
+
+    return PreviewWrapperMeasurementLayer()
         .previewWith(standard: ENGAGEHFStandard()) {
             MeasurementManager()
         }

ENGAGEHF/Bluetooth/Views/MeasurementRecordedView.swift

@@ -12,26 +12,24 @@ import SpeziViews
 import SwiftUI
 
 
-private struct MeasurementRecordedViewPreviewWrapper: View {
-    @Environment(MeasurementManager.self) private var measurementManager
-    @State private var viewState: ViewState = .idle
-
-
-    var body: some View {
-        @Bindable var measurementManager = measurementManager
-
-        Button("Mock Measurement") {
-            measurementManager.loadMockMeasurement()
+struct MeasurementRecordedView: View {
+    private var dynamicDetente: PresentationDetent {
+        switch dynamicTypesize {
+        case .xSmall, .small:
+            return .fraction(0.35)
+        case .medium, .large:
+            return .fraction(0.45)
+        case .xLarge, .xxLarge, .xxxLarge:
+            return .fraction(0.65)
+        case .accessibility1, .accessibility2, .accessibility3, .accessibility4, .accessibility5:
+            return .large
+        default:
+            return .fraction(0.45)
         }
-            .sheet(isPresented: $measurementManager.showSheet) {
-                MeasurementRecordedView()
-                    .presentationDetents([.fraction(0.4)])
-            }
     }
-}
-
+
 
-struct MeasurementRecordedView: View {
+    @Environment(\.dynamicTypeSize) private var dynamicTypesize
     @State var viewState = ViewState.idle
 
 
@@ -42,15 +40,32 @@ struct MeasurementRecordedView: View {
             MeasurementLayer()
             Spacer()
             ConfirmMeasurementButton(viewState: $viewState)
-                .padding()
         }
+            .presentationDetents([dynamicDetente])
             .interactiveDismissDisabled(viewState != .idle)
     }
 }
 
 
 #Preview {
-    MeasurementRecordedViewPreviewWrapper()
+    struct MeasurementRecordedViewPreviewWrapper: View {
+        @Environment(MeasurementManager.self) private var measurementManager
+        @State private var viewState: ViewState = .idle
+
+
+        var body: some View {
+            @Bindable var measurementManager = measurementManager
+
+            Button("Mock Measurement") {
+                measurementManager.loadMockMeasurement()
+            }
+                .sheet(isPresented: $measurementManager.showSheet) {
+                    MeasurementRecordedView()
+                }
+        }
+    }
+
+    return MeasurementRecordedViewPreviewWrapper()
         .previewWith(standard: ENGAGEHFStandard()) {
             MeasurementManager()
         }

ENGAGEHF/Bluetooth/Views/ViewElements.swift

@@ -14,6 +14,7 @@ struct CloseButtonLayer: View {
     @Environment(\.dismiss) private var dismiss
     @Binding private var viewState: ViewState
 
+
     var body: some View {
         HStack {
             Button(action: {
@@ -30,6 +31,7 @@ struct CloseButtonLayer: View {
         .padding()
     }
 
+
     init(viewState: Binding<ViewState>) {
         self._viewState = viewState
     }

ENGAGEHF/Home.swift

@@ -24,7 +24,8 @@ struct HomeView: View {
     private var bluetoothEnabled: Bool {
         !ProcessInfo.processInfo.isPreviewSimulator
     }
-
+
+
     @Environment(MeasurementManager.self) private var measurementManager
     @Environment(WeightScaleDevice.self) private var weightScale: WeightScaleDevice?
     @Environment(Bluetooth.self) private var bluetooth
@@ -43,20 +44,23 @@ struct HomeView: View {
                     Label("Home", systemImage: "house")
                 }
         }
-            .autoConnect(enabled: weightScale == nil && bluetoothEnabled, with: bluetooth)
+            .autoConnect(enabled: bluetoothEnabled, with: bluetooth)
             .sheet(isPresented: $presentingAccount) {
                 AccountSheet()
             }
             .accountRequired(Self.accountEnabled) {
                 AccountSheet()
             }
             .verifyRequiredAccountDetails(Self.accountEnabled)
-            .sheet(isPresented: $measurementManager.showSheet, onDismiss: {
-                MeasurementManager.manager.clear()
-            }) {
-                MeasurementRecordedView()
-                    .presentationDetents([.fraction(0.45)])
-            }
+            .sheet(
+                isPresented: $measurementManager.showSheet,
+                onDismiss: {
+                    measurementManager.clear()
+                },
+                content: {
+                    MeasurementRecordedView()
+                }
+            )
     }
 }