LOOP-1486: add suspend threshold information screen + editor

TidepoolService.xcodeproj/project.pbxproj

@@ -64,12 +64,14 @@
 		A9DAAD6F22E7EA9700E76C9F /* NibLoadable.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DAAD6E22E7EA9700E76C9F /* NibLoadable.swift */; };
 		E916F56D24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */; };
 		E93BA05E24A14CBA00C5D7E6 /* PrescriptionReviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E93BA05D24A14CBA00C5D7E6 /* PrescriptionReviewViewModel.swift */; };
+		E916F56D24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */; };
 		E93BA06024A15FA800C5D7E6 /* PrescriptionDeviceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E93BA05F24A15FA800C5D7E6 /* PrescriptionDeviceView.swift */; };
 		E93BA06224A29C9C00C5D7E6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E93BA06124A29C9C00C5D7E6 /* Assets.xcassets */; };
 		E9692172249BC73600D9BE3B /* MockPrescriptionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9692171249BC73600D9BE3B /* MockPrescriptionManager.swift */; };
 		E9692174249BF2A100D9BE3B /* MockPrescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9692173249BF2A100D9BE3B /* MockPrescription.swift */; };
 		E9692176249C1AE700D9BE3B /* PrescriptionReviewUICoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = E9692175249C1AE700D9BE3B /* PrescriptionReviewUICoordinator.swift */; };
 		E96AEB98249C2FF1003797B4 /* PrescriptionCodeEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96AEB97249C2FF1003797B4 /* PrescriptionCodeEntryView.swift */; };
+		E96DCB5C24AF7723007117BC /* SuspendThresholdReview.swift in Sources */ = {isa = PBXBuildFile; fileRef = E96DCB5B24AF7723007117BC /* SuspendThresholdReview.swift */; };
 		E991F1B724A548580059281B /* AdaptiveKeyboardPadding.swift in Sources */ = {isa = PBXBuildFile; fileRef = E991F1B624A548580059281B /* AdaptiveKeyboardPadding.swift */; };
 		E991F1BB24A654CC0059281B /* TimeInterval.swift in Sources */ = {isa = PBXBuildFile; fileRef = E991F1BA24A654CC0059281B /* TimeInterval.swift */; };
 		E991F1C524AAB25C0059281B /* CorrectionRangeReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E991F1C424AAB25C0059281B /* CorrectionRangeReviewView.swift */; };
@@ -181,12 +183,14 @@
 		A9DAAD6E22E7EA9700E76C9F /* NibLoadable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NibLoadable.swift; sourceTree = "<group>"; };
 		E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CorrectionRangeOverrideReview.swift; sourceTree = "<group>"; };
 		E93BA05D24A14CBA00C5D7E6 /* PrescriptionReviewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrescriptionReviewViewModel.swift; sourceTree = "<group>"; };
+		E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CorrectionRangeOverrideReview.swift; sourceTree = "<group>"; };
 		E93BA05F24A15FA800C5D7E6 /* PrescriptionDeviceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrescriptionDeviceView.swift; sourceTree = "<group>"; };
 		E93BA06124A29C9C00C5D7E6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		E9692171249BC73600D9BE3B /* MockPrescriptionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPrescriptionManager.swift; sourceTree = "<group>"; };
 		E9692173249BF2A100D9BE3B /* MockPrescription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPrescription.swift; sourceTree = "<group>"; };
 		E9692175249C1AE700D9BE3B /* PrescriptionReviewUICoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrescriptionReviewUICoordinator.swift; sourceTree = "<group>"; };
 		E96AEB97249C2FF1003797B4 /* PrescriptionCodeEntryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrescriptionCodeEntryView.swift; sourceTree = "<group>"; };
+		E96DCB5B24AF7723007117BC /* SuspendThresholdReview.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuspendThresholdReview.swift; sourceTree = "<group>"; };
 		E991F1B624A548580059281B /* AdaptiveKeyboardPadding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdaptiveKeyboardPadding.swift; sourceTree = "<group>"; };
 		E991F1BA24A654CC0059281B /* TimeInterval.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeInterval.swift; sourceTree = "<group>"; };
 		E991F1C424AAB25C0059281B /* CorrectionRangeReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CorrectionRangeReviewView.swift; sourceTree = "<group>"; };
@@ -420,6 +424,7 @@
 				E991F1B624A548580059281B /* AdaptiveKeyboardPadding.swift */,
 				E991F1C424AAB25C0059281B /* CorrectionRangeReviewView.swift */,
 				E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */,
+				E96DCB5B24AF7723007117BC /* SuspendThresholdReview.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -796,6 +801,7 @@
 				E93BA05E24A14CBA00C5D7E6 /* PrescriptionReviewViewModel.swift in Sources */,
 				E991F1C524AAB25C0059281B /* CorrectionRangeReviewView.swift in Sources */,
 				A92E770122E9181500591027 /* TidepoolServiceSetupViewController.swift in Sources */,
+				E96DCB5C24AF7723007117BC /* SuspendThresholdReview.swift in Sources */,
 				A9DAAD3B22E7DEF100E76C9F /* TidepoolServiceSettingsViewController.swift in Sources */,
 				E916F56D24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift in Sources */,
 			);

TidepoolServiceKit/Mocks/MockPrescription.swift

@@ -45,65 +45,20 @@ public struct MockPrescription: Codable {
     public let cgm: CGMType // CGM type (manufacturer & model)
     public let pump: PumpType // Pump type (manufacturer & model)
     public let bloodGlucoseUnit: BGUnit
-    public let basalRateSchedule: BasalRateSchedule
-    public let glucoseTargetRangeSchedule: GlucoseRangeSchedule
-    public let carbRatioSchedule: CarbRatioSchedule
-    public let insulinSensitivitySchedule: InsulinSensitivitySchedule
-    public let maximumBasalRatePerHour: Double
-    public let maximumBolus: Double
-    public let suspendThreshold: GlucoseThreshold
-    public let insulinModel: InsulinModel
-    public let preMealTargetRange: DoubleRange
-    public let workoutTargetRange: DoubleRange
+    public let therapySettings: TherapySettings
 
     public init(datePrescribed: Date,
                 providerName: String,
                 cgmType: CGMType,
                 pumpType: PumpType,
                 bloodGlucoseUnit: BGUnit,
-                basalRateSchedule: BasalRateSchedule,
-                glucoseTargetRangeSchedule: GlucoseRangeSchedule,
-                carbRatioSchedule: CarbRatioSchedule,
-                insulinSensitivitySchedule: InsulinSensitivitySchedule,
-                maximumBasalRatePerHour: Double,
-                maximumBolus: Double,
-                suspendThreshold: GlucoseThreshold,
-                insulinModel: InsulinModel,
-                preMealTargetRange: DoubleRange,
-                workoutTargetRange: DoubleRange) {
+                therapySettings: TherapySettings
+    ) {
         self.datePrescribed = datePrescribed
         self.providerName = providerName
         self.cgm = cgmType
         self.pump = pumpType
         self.bloodGlucoseUnit = bloodGlucoseUnit
-        self.basalRateSchedule = basalRateSchedule
-        self.glucoseTargetRangeSchedule = glucoseTargetRangeSchedule
-        self.carbRatioSchedule = carbRatioSchedule
-        self.insulinSensitivitySchedule = insulinSensitivitySchedule
-        self.maximumBasalRatePerHour = maximumBasalRatePerHour
-        self.maximumBolus = maximumBolus
-        self.suspendThreshold = suspendThreshold
-        self.insulinModel = insulinModel
-        self.preMealTargetRange = preMealTargetRange
-        self.workoutTargetRange = workoutTargetRange
-    }
-
-    public struct InsulinModel: Codable, Equatable {
-        public enum ModelType: String, Codable {
-            case fiasp
-            case rapidAdult
-            case rapidChild
-            case walsh
-        }
-
-        public let modelType: ModelType
-        public let actionDuration: TimeInterval
-        public let peakActivity: TimeInterval?
-
-        public init(modelType: ModelType, actionDuration: TimeInterval, peakActivity: TimeInterval? = nil) {
-            self.modelType = modelType
-            self.actionDuration = actionDuration
-            self.peakActivity = peakActivity
-        }
+        self.therapySettings = therapySettings
     }
 }

TidepoolServiceKit/Mocks/MockPrescriptionManager.swift

@@ -60,24 +60,29 @@ public class MockPrescriptionManager {
                              RepeatingScheduleValue(startTime: .hours(16), value: 12.0),
                              RepeatingScheduleValue(startTime: .hours(18), value: 8.0),
                              RepeatingScheduleValue(startTime: .hours(21), value: 10.0)],
-                timeZone: timeZone)!            
+                timeZone: timeZone)!
+
+            let therapySettings = TherapySettings(
+                glucoseTargetRangeSchedule: glucoseTargetRangeSchedule,
+                preMealTargetRange: DoubleRange(minValue: 80.0, maxValue: 90.0),
+                workoutTargetRange: DoubleRange(minValue: 130.0, maxValue: 140.0),
+                maximumBasalRatePerHour: 3,
+                maximumBolus: 5,
+                suspendThreshold: GlucoseThreshold(unit: .milligramsPerDeciliter, value: 80),
+                insulinSensitivitySchedule: insulinSensitivitySchedule,
+                carbRatioSchedule: carbRatioSchedule,
+                basalRateSchedule: basalRateSchedule,
+                insulinModel: StoredSettings.InsulinModel(modelType: .rapidAdult, actionDuration: .hours(6), peakActivity: .hours(3))
+            )
 
             self.prescription = MockPrescription(
                 datePrescribed: Date(),
                 providerName: "Sally Seastar",
                 cgmType: CGMType.g6,
                 pumpType: PumpType.dash,
                 bloodGlucoseUnit: .mgdl,
-                basalRateSchedule: basalRateSchedule,
-                glucoseTargetRangeSchedule: glucoseTargetRangeSchedule,
-                carbRatioSchedule: carbRatioSchedule,
-                insulinSensitivitySchedule: insulinSensitivitySchedule,
-                maximumBasalRatePerHour: 3.0,
-                maximumBolus: 5.0,
-                suspendThreshold: GlucoseThreshold(unit: .milligramsPerDeciliter, value: 70),
-                insulinModel: MockPrescription.InsulinModel(modelType: .rapidAdult, actionDuration: .hours(6), peakActivity: .hours(3)),
-                preMealTargetRange: DoubleRange(minValue: 80.0, maxValue: 90.0),
-                workoutTargetRange: DoubleRange(minValue: 130.0, maxValue: 140.0))
+                therapySettings: therapySettings
+            )
         }
     }
 

TidepoolServiceKitUI/View Controllers/PrescriptionReviewUICoordinator.swift

@@ -18,6 +18,8 @@ enum PrescriptionReviewScreen {
     case correctionRangeEditor
     case correctionRangeOverrideInfo
     case correctionRangeOverrideEditor
+    case suspendThresholdInfo
+    case suspendThresholdEditor
 
     func next() -> PrescriptionReviewScreen? {
         switch self {
@@ -32,6 +34,10 @@ enum PrescriptionReviewScreen {
         case .correctionRangeOverrideInfo:
             return .correctionRangeOverrideEditor
         case .correctionRangeOverrideEditor:
+            return .suspendThresholdInfo
+        case .suspendThresholdInfo:
+            return .suspendThresholdEditor
+        case .suspendThresholdEditor:
             return nil
         }
     }
@@ -124,6 +130,25 @@ class PrescriptionReviewUICoordinator: UINavigationController, CompletionNotifyi
             let hostedView = DismissibleHostingController(rootView: view)
             hostedView.navigationItem.largeTitleDisplayMode = .never // TODO: hack to fix jumping, will be removed once editors have titles
             return hostedView
+        case .suspendThresholdInfo:
+            let exiting: (() -> Void) = { [weak self] in
+                self?.stepFinished()
+            }
+            let view = SuspendThresholdInformationView(onExit: exiting)
+            let hostedView = DismissibleHostingController(rootView: view)
+            hostedView.navigationItem.largeTitleDisplayMode = .always // TODO: hack to fix jumping, will be removed once editors have titles
+            hostedView.title = LocalizedString("Suspend Threshold", comment: "Title for suspend threshold informational screen")
+            return hostedView
+        case .suspendThresholdEditor:
+            guard let prescription = viewModel.prescription else {
+                // Go back to code entry step if we don't have prescription
+                let view = PrescriptionCodeEntryView(viewModel: viewModel)
+                return DismissibleHostingController(rootView: view)
+            }
+            let view = SuspendThresholdReview(model: viewModel, prescription: prescription)
+            let hostedView = DismissibleHostingController(rootView: view)
+            hostedView.navigationItem.largeTitleDisplayMode = .never // TODO: hack to fix jumping, will be removed once editors have titles
+            return hostedView
         }
     }
 

TidepoolServiceKitUI/View Models/PrescriptionReviewViewModel.swift

@@ -65,4 +65,8 @@ class PrescriptionReviewViewModel: ObservableObject {
         settings.preMealTargetRange = overrides.preMeal?.doubleRange(for: unit)
         settings.workoutTargetRange = overrides.workout?.doubleRange(for: unit)
     }
+
+    func saveSuspendThreshold(value: GlucoseThreshold) {
+        settings.suspendThreshold = value
+    }
 }

TidepoolServiceKitUI/Views/CorrectionRangeOverrideReview.swift

@@ -26,13 +26,13 @@ struct CorrectionRangeOverrideReview: View {
     var body: some View {
         CorrectionRangeOverridesEditor(
             value: CorrectionRangeOverrides(
-                preMeal: prescription.preMealTargetRange,
-                workout: prescription.workoutTargetRange,
+                preMeal: prescription.therapySettings.preMealTargetRange,
+                workout: prescription.therapySettings.workoutTargetRange,
                 unit: prescription.bloodGlucoseUnit.hkUnit
             ),
             unit: prescription.bloodGlucoseUnit.hkUnit,
-            correctionRangeScheduleRange: prescription.glucoseTargetRangeSchedule.scheduleRange(),
-            minValue: prescription.suspendThreshold.quantity,
+            correctionRangeScheduleRange: (prescription.therapySettings.glucoseTargetRangeSchedule?.scheduleRange())!,
+            minValue: prescription.therapySettings.suspendThreshold?.quantity,
             onSave: { overrides in
                 self.viewModel.saveCorrectionRangeOverrides(overrides: overrides, unit: self.prescription.bloodGlucoseUnit.hkUnit)
                 self.viewModel.didFinishStep()

TidepoolServiceKitUI/Views/CorrectionRangeReviewView.swift

@@ -26,9 +26,9 @@ struct CorrectionRangeReviewView: View {
 
     var body: some View {
         CorrectionRangeScheduleEditor(
-            schedule: prescription.glucoseTargetRangeSchedule,
+            schedule: prescription.therapySettings.glucoseTargetRangeSchedule,
             unit: prescription.bloodGlucoseUnit.hkUnit,
-            minValue: prescription.suspendThreshold.quantity,
+            minValue: prescription.therapySettings.suspendThreshold?.quantity,
             onSave: { newSchedule in
                 self.viewModel.saveCorrectionRange(range: newSchedule)
                 self.viewModel.didFinishStep()

TidepoolServiceKitUI/Views/PrescriptionCodeEntryView.swift

@@ -63,8 +63,7 @@ struct PrescriptionCodeEntryView: View, HorizontalSizeClassOverride {
                 InstructionList(instructions: [
                     LocalizedString("Prescription activation code", comment: "Label text for the first needed prescription activation item"),
                     LocalizedString("Configuration settings for glucose targets and insulin delivery from your healthcare provider", comment: "Label text for the second needed prescription activation item")
-                    ],
-                    stepsColor: .secondary
+                    ]
                 )
                 .foregroundColor(.secondary)
             }

TidepoolServiceKitUI/Views/SuspendThresholdReview.swift

@@ -0,0 +1,41 @@
+//
+//  SuspendThresholdReview.swift
+//  TidepoolServiceKitUI
+//
+//  Created by Anna Quinlan on 7/3/20.
+//  Copyright © 2020 LoopKit Authors. All rights reserved.
+//
+
+import SwiftUI
+import LoopKitUI
+import LoopKit
+import HealthKit
+import TidepoolServiceKit
+
+
+struct SuspendThresholdReview: View {
+    @ObservedObject var viewModel: PrescriptionReviewViewModel
+    let prescription: MockPrescription
+
+    init(
+        model: PrescriptionReviewViewModel,
+        prescription: MockPrescription
+    ) {
+        self.viewModel = model
+        self.prescription = prescription
+    }
+
+    var body: some View {
+        SuspendThresholdEditor(
+            value: prescription.therapySettings.suspendThreshold?.quantity,
+            unit: prescription.bloodGlucoseUnit.hkUnit,
+            maxValue: prescription.therapySettings.glucoseTargetRangeSchedule?.minLowerBound(),
+            onSave: { newValue in
+                let unit = self.prescription.bloodGlucoseUnit.hkUnit
+                self.viewModel.saveSuspendThreshold(value: GlucoseThreshold(unit: unit, value: newValue.doubleValue(for: unit)))
+                self.viewModel.didFinishStep()
+            },
+            mode: .flow
+        )
+    }
+}