post-trial activity nudge toggle (#156)

Author: lukaskollmer

MyHeartCounts.xcodeproj/project.pbxproj

@@ -1450,8 +1450,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/apple/FHIRModels.git";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 0.7.0;
+				kind = upToNextMinorVersion;
+				minimumVersion = 0.8.0;
 			};
 		};
 		80BE064E2DCF3A2D00171114 /* XCRemoteSwiftPackageReference "swift-package-list" */ = {

MyHeartCounts.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -79,48 +79,8 @@ struct AccountSheet: View {
             }
         }
         if let enrollment = enrollments.first {
-            Section("Study Participation") { // swiftlint:disable:this closure_body_length
-                Button {
-                    openUrl(MyHeartCounts.website())
-                } label: {
-                    HStack {
-                        makeEnrolledStudyRow(for: enrollment)
-                        Spacer()
-                        DisclosureIndicator()
-                    }
-                    .contentShape(Rectangle())
-                    .foregroundStyle(colorScheme.textLabelForegroundStyle)
-                }
-                NavigationLink("Review Consent Forms") {
-                    SignedConsentForms()
-                }
-                if let text = { () -> LocalizedStringResource? in
-                    switch (isProcessingHealthData, isProcessingSensorKitData) {
-                    case (true, true):
-                        "Processing Health and SensorKit Data…"
-                    case (true, false):
-                        "Processing Health Data…"
-                    case (false, true):
-                        "Processing SensorKit Data…"
-                    case (false, false):
-                        nil
-                    }
-                }() {
-                    let label = HStack {
-                        Text(text)
-                        Spacer()
-                        ProgressView()
-                    }
-                    if debugModeEnabled {
-                        NavigationLink {
-                            DataProcessingDebugView()
-                        } label: {
-                            label
-                        }
-                    } else {
-                        label
-                    }
-                }
+            Section("Study Participation") {
+                studyParticipationSection(enrollment)
             }
         }
         Section {
@@ -170,6 +130,52 @@ struct AccountSheet: View {
     }
 
 
+    @ViewBuilder
+    private func studyParticipationSection(_ enrollment: StudyEnrollment) -> some View {
+        Button {
+            openUrl(MyHeartCounts.website())
+        } label: {
+            HStack {
+                makeEnrolledStudyRow(for: enrollment)
+                Spacer()
+                DisclosureIndicator()
+            }
+            .contentShape(Rectangle())
+            .foregroundStyle(colorScheme.textLabelForegroundStyle)
+        }
+        PostTrialNudgesToggle()
+        NavigationLink("Review Consent Forms") {
+            SignedConsentForms()
+        }
+        if let text = { () -> LocalizedStringResource? in
+            switch (isProcessingHealthData, isProcessingSensorKitData) {
+            case (true, true):
+                "Processing Health and SensorKit Data…"
+            case (true, false):
+                "Processing Health Data…"
+            case (false, true):
+                "Processing SensorKit Data…"
+            case (false, false):
+                nil
+            }
+        }() {
+            let label = HStack {
+                Text(text)
+                Spacer()
+                ProgressView()
+            }
+            if debugModeEnabled {
+                NavigationLink {
+                    DataProcessingDebugView()
+                } label: {
+                    label
+                }
+            } else {
+                label
+            }
+        }
+    }
+    
     @ViewBuilder
     private func makeEnrolledStudyRow(for enrollment: StudyEnrollment) -> some View {
         if let studyInfo = enrollment.studyBundle?.studyDefinition.metadata {
@@ -198,6 +204,49 @@ struct AccountSheet: View {
 }
 
 
+extension AccountSheet {
+    private struct PostTrialNudgesToggle: View {
+        @Environment(Account.self)
+        private var account
+        
+        @State private var value = false
+        @State private var updateTask: Task<Void, Never>?
+        @State private var shouldHandleUpdates = true
+        
+        var body: some View {
+            Toggle(isOn: $value) {
+                VStack(alignment: .leading) {
+                    Text("POST_TRIAL_ACTIVITY_NUDGES_TOGGLE_TITLE")
+                    Text("POST_TRIAL_ACTIVITY_NUDGES_TOGGLE_SUBTITLE")
+                        .font(.footnote)
+                        .foregroundStyle(.secondary)
+                }
+            }
+            .onChange(of: account.details?.postTrialNudgesOptIn ?? false, initial: true) { _, newValue in
+                shouldHandleUpdates = false
+                value = newValue
+                shouldHandleUpdates = true
+            }
+            .onChange(of: value) { _, newValue in
+                updateTask?.cancel()
+                guard shouldHandleUpdates else {
+                    return
+                }
+                updateTask = Task {
+                    do {
+                        try await Task.sleep(for: .seconds(0.25))
+                        var details = AccountDetails()
+                        details.postTrialNudgesOptIn = newValue
+                        try await account.accountService.updateAccountDetails(AccountModifications(modifiedDetails: details))
+                    } catch {
+                        // we silently ignore the error here
+                    }
+                }
+            }
+        }
+    }
+}
+
 extension AccountSheet {
     private struct AboutRow: View {
         // swiftlint:disable attributes

MyHeartCounts/Account/AccountSheet.swift

@@ -132,6 +132,9 @@ extension AccountDetails {
     @AccountKey(id: "preferredMeasurementSystem", name: "Preferred Measurement System", as: String.self)
     var preferredMeasurementSystem: String?
 
+    @AccountKey(id: "extendedActivityNudgesOptIn", name: "Post-Trial Nudges Opt-In", as: Bool.self)
+    var postTrialNudgesOptIn: Bool?
+    
     @AccountKey(
         id: "mostRecentOnboardingStep",
         name: "",
@@ -148,7 +151,7 @@ extension AccountDetails {
     \.hasWithdrawnFromStudy,
     \.dateOfEnrollment, \.lastSignedConsentVersion, \.lastSignedConsentDate, \.didOptInToTrial,
     \.fcmToken, \.enableDebugMode, \.timeZone, \.language, \.preferredMeasurementSystem, \.lastActiveDate,
-    \.mostRecentOnboardingStep, \.preferredWorkoutTypes, \.preferredNudgeNotificationTime
+    \.mostRecentOnboardingStep, \.preferredWorkoutTypes, \.preferredNudgeNotificationTime, \.postTrialNudgesOptIn
 )
 extension AccountKeys {}
 

MyHeartCounts/Account/MHCAccountKeys.swift

@@ -239,6 +239,7 @@ enum DeferredConfigLoading {
                         .manual(\.preferredWorkoutTypes),
                         .manual(\.preferredNudgeNotificationTime),
                         .manual(\.stageOfChange),
+                        .manual(\.postTrialNudgesOptIn),
                         // demographics
                         .manual(\.mhcGenderIdentity),
                         .manual(\.usRegion),

MyHeartCounts/Modules/DeferredConfigLoading.swift

@@ -6289,6 +6289,53 @@
           }
         }
       }
+    },
+    "POST_TRIAL_ACTIVITY_NUDGES_TOGGLE_SUBTITLE" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enable to continue receiving periodic activity nudges after the initial trial period."
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Enable to continue receiving periodic activity nudges after the initial trial period."
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Habilitar la opción para seguir recibiendo recordatorios periódicos de actividad después del período de prueba inicial."
+          }
+        }
+      }
+    },
+    "POST_TRIAL_ACTIVITY_NUDGES_TOGGLE_TITLE" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Post-Trial Activity Nudges"
+          }
+        },
+        "en-GB" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Post-Trial Activity Nudges"
+          }
+        },
+        "es" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Incentivos para la actividad posterior al ensayo"
+          }
+        }
+      }
+    },
+    "Post-Trial Nudges Opt-In" : {
+
     },
     "Prefer not to state" : {
       "localizations" : {

MyHeartCounts/Resources/Localizable.xcstrings

@@ -21,8 +21,10 @@ var packageDeps: [Package.Dependency] = [
 #if !os(Linux)
 packageDeps += [
     .package(url: "https://github.com/StanfordSpezi/SpeziStudy.git", from: "0.1.20"),
-    .package(url: "https://github.com/StanfordSpezi/SpeziStorage.git", from: "2.1.4"), // not actually used but we need to force the version until we update SpeziStudy
-    .package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols.git", from: "7.0.0")
+    .package(url: "https://github.com/SFSafeSymbols/SFSafeSymbols.git", from: "7.0.0"),
+    // not actually used but we need to force the version until we update SpeziStudy
+    .package(url: "https://github.com/StanfordSpezi/SpeziStorage.git", from: "2.1.4"),
+    .package(url: "https://github.com/StanfordSpezi/SpeziScheduler.git", from: "1.2.20")
 ]
 #endif