Add AccountKeyRequirement.manual

Sources/SpeziAccount/AccountValue/Configuration/AccountKeyConfigurationImpl.swift

@@ -30,9 +30,9 @@ struct AccountKeyConfigurationImpl<Key: AccountKey>: AccountKeyConfiguration {
 
     let keyPathDescription: String
 
-    init(_ keyPath: KeyPath<AccountKeys, Key.Type>, type: AccountKeyRequirement) {
+    init(_ keyPath: KeyPath<AccountKeys, Key.Type>, requirement: AccountKeyRequirement) {
         self.key = Key.self
-        self.requirement = type
+        self.requirement = requirement
         self.keyPathDescription = keyPath.shortDescription
     }
 }
@@ -58,6 +58,8 @@ extension AccountKeyConfigurationImpl {
             return ".collects(\(keyPathDescription))"
         case .supported:
             return ".supports(\(keyPathDescription))"
+        case .hidden:
+            return ".hidden(\(keyPathDescription))"
         }
     }
 

Sources/SpeziAccount/AccountValue/Configuration/AccountKeyRequirement.swift

@@ -23,6 +23,10 @@ public enum AccountKeyRequirement {
     /// The account value is **not** collected at signup. However, it is displayed in the account overview
     /// and a user can supply a value by editing their account details.
     case supported
+    /// The associated account value **can** be provided by the user at a later point in time.
+    ///
+    /// The account value is **not** collected at signup. It is also not displayed in the account overview.
+    case hidden
 }
 
 

Sources/SpeziAccount/AccountValue/Configuration/ConfiguredAccountKey.swift

@@ -38,23 +38,31 @@ public struct ConfiguredAccountKey {
     /// - Parameter keyPath: The `KeyPath` referencing the ``AccountKey``.
     /// - Returns: Returns the ``AccountKey`` configuration.
     public static func requires<Key: AccountKey>(_ keyPath: KeyPath<AccountKeys, Key.Type>) -> ConfiguredAccountKey {
-        .init(configuration: AccountKeyConfigurationImpl(keyPath, type: .required))
+        .init(configuration: AccountKeyConfigurationImpl(keyPath, requirement: .required))
     }
 
     /// Configure an ``AccountKey`` as ``AccountKeyRequirement/collected``.
     /// - Parameter keyPath: The `KeyPath` referencing the ``AccountKey``.
     /// - Returns: Returns the ``AccountKey`` configuration.
     @_disfavoredOverload
     public static func collects<Key: AccountKey>(_ keyPath: KeyPath<AccountKeys, Key.Type>) -> ConfiguredAccountKey {
-        .init(configuration: AccountKeyConfigurationImpl(keyPath, type: .collected))
+        .init(configuration: AccountKeyConfigurationImpl(keyPath, requirement: .collected))
     }
 
     /// Configure an ``AccountKey`` as ``AccountKeyRequirement/supported``.
     /// - Parameter keyPath: The `KeyPath` referencing the ``AccountKey``.
     /// - Returns: Returns the ``AccountKey`` configuration.
     @_disfavoredOverload
     public static func supports<Key: AccountKey>(_ keyPath: KeyPath<AccountKeys, Key.Type>) -> ConfiguredAccountKey {
-        .init(configuration: AccountKeyConfigurationImpl(keyPath, type: .supported))
+        .init(configuration: AccountKeyConfigurationImpl(keyPath, requirement: .supported))
+    }
+
+    /// Configure an ``AccountKey`` as ``AccountKeyRequirement/hidden``.
+    /// - Parameter keyPath: The `KeyPath` referencing the ``AccountKey``.
+    /// - Returns: Returns the ``AccountKey`` configuration.
+    @_disfavoredOverload
+    public static func hidden<Key: AccountKey>(_ keyPath: KeyPath<AccountKeys, Key.Type>) -> ConfiguredAccountKey {
+        .init(configuration: AccountKeyConfigurationImpl(keyPath, requirement: .hidden))
     }
 
     /// Configure an ``AccountKey`` as ``AccountKeyRequirement/required`` as ``RequiredAccountKey`` can only be configured as required.

Sources/SpeziAccount/Resources/Localizable.xcstrings

@@ -582,6 +582,9 @@
           }
         }
       }
+    },
+    "Date of Birth" : {
+
     },
     "DELETE" : {
       "localizations" : {
@@ -664,6 +667,9 @@
           }
         }
       }
+    },
+    "E-Mail and Password" : {
+
     },
     "EDIT" : {
       "localizations" : {

Sources/SpeziAccount/ViewModel/AccountOverviewFormViewModel.swift

@@ -46,7 +46,7 @@ class AccountOverviewFormViewModel {
 
 
     init(_ valueConfiguration: AccountValueConfiguration, _ serviceConfiguration: AccountServiceConfiguration) {
-        self.categorizedAccountKeys = valueConfiguration.allCategorized()
+        self.categorizedAccountKeys = valueConfiguration.allCategorized(filteredBy: [.required, .collected, .supported])
         self.accountServiceConfiguration = serviceConfiguration
     }
 

Sources/SpeziAccount/ViewModifier/AccountRequiredModifier.swift

@@ -10,7 +10,7 @@
 import SwiftUI
 
 
-private let logger = Logger(subsystem: "edu.stanford.sepzi.SepziAccount", category: "AccountRequiredModifier")
+private let logger = Logger(subsystem: "edu.stanford.spezi.SpeziAccount", category: "AccountRequiredModifier")
 
 
 struct AccountRequiredModifier<SetupSheet: View>: ViewModifier {

Tests/UITests/TestApp/AccountTestsView.swift

@@ -92,6 +92,11 @@ struct AccountTestsView: View {
                 } label: {
                     Text(verbatim: "License Information")
                 }
+                if let invitationCode = account.details?.invitationCode {
+                    LabeledContent("Invitation Code") {
+                        Text(invitationCode)
+                    }
+                }
             }
         }
     }

Tests/UITests/TestApp/TestAppDelegate.swift

@@ -32,7 +32,8 @@
                 .collects(\.name),
                 .collects(\.genderIdentity),
                 .collects(\.dateOfBirth),
-                .supports(\.biography)
+                .supports(\.biography),
+                .hidden(\.invitationCode)
             ]
         case .allRequired:
 #if os(visionOS)

Tests/UITests/TestApp/Utils/InvitationCodeKey.swift

@@ -0,0 +1,19 @@
+//
+// This source file is part of the Spezi open-source project
+//
+// SPDX-FileCopyrightText: 2023 Stanford University and the project authors (see CONTRIBUTORS.md)
+//
+// SPDX-License-Identifier: MIT
+//
+
+import SpeziAccount
+import SwiftUI
+
+extension AccountDetails {
+    @AccountKey(name: "Invitation Code", category: .other, as: String.self)
+    var invitationCode: String?
+}
+
+
+@KeyEntry(\.invitationCode)
+extension AccountKeys {}