Support dynamic type sizes and longer timeout for required account modifier

.github/workflows/build-and-test.yml

@@ -31,6 +31,7 @@ jobs:
       runsonlabels: '["macOS", "self-hosted"]'
       path: 'Tests/UITests'
       scheme: TestApp
+      setupSimulators: true
   uploadcoveragereport:
     name: Upload Coverage Report
     needs: [buildandtest, buildandtestuitests]

Package.swift

@@ -22,8 +22,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/StanfordSpezi/SpeziFoundation.git", from: "1.0.0"),
-        .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.0.0"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.0.0"),
+        .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.2.0"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.3.0"),
         .package(url: "https://github.com/StanfordBDHG/XCTRuntimeAssertions", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.4")
     ],

Sources/SpeziAccount/AccountValue/Keys/DateOfBirthKey.swift

@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+import SpeziViews
 import SwiftUI
 
 
@@ -58,7 +59,7 @@
         }
 
         public var body: some View {
-            SimpleTextRow(name: Key.name) {
+            ListRow(Key.name) {
                 Text(value.formatted(formatStyle))
             }
         }

Sources/SpeziAccount/AccountValue/Keys/PersonNameKey.swift

@@ -49,7 +49,7 @@
         private let value: PersonNameComponents
 
         public var body: some View {
-            SimpleTextRow(name: Key.name) {
+            ListRow(Key.name) {
                 Text(value.formatted(.name(style: .long)))
             }
         }

Sources/SpeziAccount/AccountValue/Keys/UserIdKey.swift

@@ -8,6 +8,7 @@
 
 import SpeziFoundation
 import SpeziValidation
+import SpeziViews
 import SwiftUI
 
 
@@ -68,7 +69,7 @@
         @Environment(\.accountServiceConfiguration) private var configuration
 
         public var body: some View {
-            SimpleTextRow(name: configuration.userIdConfiguration.idType.localizedStringResource) {
+            ListRow(configuration.userIdConfiguration.idType.localizedStringResource) {
                 Text(verbatim: value)
             }
         }

Sources/SpeziAccount/Resources/Localizable.xcstrings

@@ -882,29 +882,6 @@
         }
       }
     },
-    "Hello" : {
-      "comment" : "No need to translate, only used in Previews ...",
-      "localizations" : {
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hallo"
-          }
-        },
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hello"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Hola"
-          }
-        }
-      }
-    },
     "MISSING_ACCOUNT_DETAILS" : {
       "localizations" : {
         "de" : {

Sources/SpeziAccount/ViewModifier/AccountRequiredModifier.swift

@@ -30,7 +30,7 @@
                 }
             }
             .task {
-                try? await Task.sleep(for: .milliseconds(500))
+                try? await Task.sleep(for: .seconds(2))
                 if !account.signedIn {
                     presentingSheet = true
                 }

Sources/SpeziAccount/Views/DataDisplay/LocalizableStringBasedDisplayView.swift

@@ -7,6 +7,7 @@
 //
 
 import SpeziFoundation
+import SpeziViews
 import SwiftUI
 
 
@@ -17,7 +18,7 @@
     private let value: Key.Value
 
     public var body: some View {
-        SimpleTextRow(name: Key.name) {
+        ListRow(Key.name) {
             Text(value.localizedStringResource)
         }
     }
@@ -37,8 +38,8 @@
 
 
 #if DEBUG
-struct LocalizableStringBasedDisplayView_Previews: PreviewProvider {
-    static var previews: some View {
+#Preview {
+    Form {
         LocalizableStringBasedDisplayView<GenderIdentityKey>(.preferNotToState)
     }
 }

Sources/SpeziAccount/Views/DataDisplay/StringBasedDisplayView.swift

@@ -7,6 +7,7 @@
 //
 
 import SpeziFoundation
+import SpeziViews
 import SwiftUI
 
 
@@ -15,7 +16,7 @@
     private let value: Key.Value
 
     public var body: some View {
-        SimpleTextRow(name: Key.name) {
+        ListRow(Key.name) {
             Text(value)
         }
     }
@@ -27,8 +28,8 @@
 
 
 #if DEBUG
-struct StringDataDisplayView_Previews: PreviewProvider {
-    static var previews: some View {
+#Preview {
+    List {
         StringBasedDisplayView<UserIdKey>("andreas.bauer")
     }
 }

Sources/SpeziAccount/Views/Fields/DateOfBirthPicker.swift

@@ -6,6 +6,7 @@
 // SPDX-License-Identifier: MIT
 //
 
+import SpeziViews
 import SwiftUI
 
 
@@ -21,6 +22,8 @@
     @Binding private var date: Date
     @State private var dateAdded = false
 
+    @State private var layout: DynamicLayout?
+
     private var dateRange: ClosedRange<Date> {
         let calendar = Calendar.current
         let startDateComponents = DateComponents(year: 1800, month: 1, day: 1)
@@ -38,7 +41,7 @@
     ///  - The date is configured to be required.
     ///  - We are NOT entering new date. Showing existing data the user might want to change.
     ///  - If we are entering new data and the user pressed the add button.
-    private var showPicker: Bool {
+    @MainActor private var showPicker: Bool {
         account.configuration[Key.self]?.requirement == .required
             || viewType?.enteringNewData == false
             || dateAdded
@@ -47,30 +50,40 @@
 
     public var body: some View {
         HStack {
-            Text(titleLocalization)
-                .multilineTextAlignment(.leading)
-            Spacer()
-
-            if showPicker {
-                DatePicker(
-                    selection: $date,
-                    in: dateRange,
-                    displayedComponents: .date
-                ) {
-                    Text(titleLocalization)
+            DynamicHStack {
+                Text(titleLocalization)
+                    .multilineTextAlignment(.leading)
+
+                if layout == .horizontal {
+                    Spacer()
                 }
+
+                if showPicker {
+                    DatePicker(
+                        selection: $date,
+                        in: dateRange,
+                        displayedComponents: .date
+                    ) {
+                        Text(titleLocalization)
+                    }
                     .labelsHidden()
-            } else {
-                Button(action: addDateAction) {
-                    Text("ADD_DATE", bundle: .module)
-                        .multilineTextAlignment(.center)
-                        .foregroundColor(.primary)
-                        .frame(width: 110, height: 34)
-                }
+                } else {
+                    Button(action: addDateAction) {
+                        Text("ADD_DATE", bundle: .module)
+                            .multilineTextAlignment(.center)
+                            .foregroundColor(.primary)
+                            .padding([.leading, .trailing], 20)
+                            .padding([.top, .bottom], 7)
+                    }
                     .background(
                         RoundedRectangle(cornerRadius: 8)
                             .fill(Color(uiColor: .tertiarySystemFill))
                     )
+                }
+            }
+
+            if layout == .vertical {
+                Spacer()
             }
         }
             .accessibilityRepresentation {
@@ -86,6 +99,9 @@
                     }
                 }
             }
+            .onPreferenceChange(DynamicLayout.self) { value in
+                layout = value
+            }
     }
 
 
@@ -118,11 +134,10 @@
         @State private var date = Date.now
 
         var body: some View {
+            Form {
+                DateOfBirthPicker(date: $date)
+            }
             VStack {
-                Form {
-                    DateOfBirthPicker(date: $date)
-                }
-                    .frame(height: 200)
                 DateOfBirthPicker(date: $date)
                     .padding(32)
             }

Sources/SpeziAccount/Views/Fields/GenderIdentityPicker.swift

@@ -49,18 +49,16 @@
 
 
     static var previews: some View {
-        VStack {
-            Form {
-                Grid {
-                    GenderIdentityPicker(genderIdentity: $genderIdentity)
-                }
-            }
-                .frame(height: 200)
+        Form {
             Grid {
                 GenderIdentityPicker(genderIdentity: $genderIdentity)
             }
-                .padding(32)
         }
+
+        Grid {
+            GenderIdentityPicker(genderIdentity: $genderIdentity)
+        }
+            .padding(32)
             .background(Color(.systemGroupedBackground))
     }
 }

Sources/SpeziAccount/Views/SignupForm.swift

@@ -58,7 +58,7 @@
 
     @State private var presentingCloseConfirmation = false
 
-    private var accountKeyByCategory: OrderedDictionary<AccountKeyCategory, [any AccountKey.Type]> {
+    @MainActor private var accountKeyByCategory: OrderedDictionary<AccountKeyCategory, [any AccountKey.Type]> {
         var result = account.configuration.allCategorized(filteredBy: [.required, .collected])
 
         // patch the user configured account values with account values additionally required by

Tests/UITests/TestApp/AccountTests/AccountTestsView.swift

@@ -134,10 +134,16 @@ struct AccountTestsView_Previews: PreviewProvider {
 
     static var previews: some View {
         AccountTestsView()
-            .environment(Account(TestAccountService(TestAlertModel(), .emailAddress)))
+            .previewWith {
+                AccountConfiguration {
+                    TestAccountService(TestAlertModel(), .emailAddress)
+                }
+            }
 
         AccountTestsView()
-            .environment(Account(building: details, active: TestAccountService(TestAlertModel(), .emailAddress)))
+            .previewWith {
+                AccountConfiguration(building: details, active: TestAccountService(TestAlertModel(), .emailAddress))
+            }
 
         AccountTestsView()
             .environment(Account())

Tests/UITests/TestApp/AccountTests/TestAlertModifier.swift

@@ -10,7 +10,7 @@ import SwiftUI
 
 
 @Observable
-final class TestAlertModel: Sendable {
+final class TestAlertModel: @unchecked Sendable {
     var presentingAlert = false
     var continuation: CheckedContinuation<Void, Never>?
 }