LOOP-1485: add temporary correction range instructional screen + editor

TidepoolService.xcodeproj/project.pbxproj

@@ -62,6 +62,7 @@
 		A9DAAD6A22E7E81E00E76C9F /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9DAAD6922E7E81E00E76C9F /* LoopKitUI.framework */; };
 		A9DAAD6D22E7EA8F00E76C9F /* IdentifiableClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = A9DAAD6C22E7EA8F00E76C9F /* IdentifiableClass.swift */; };
 		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 */; };
 		E93BA06024A15FA800C5D7E6 /* PrescriptionDeviceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E93BA05F24A15FA800C5D7E6 /* PrescriptionDeviceView.swift */; };
 		E93BA06224A29C9C00C5D7E6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E93BA06124A29C9C00C5D7E6 /* Assets.xcassets */; };
@@ -178,6 +179,7 @@
 		A9DAAD6922E7E81E00E76C9F /* LoopKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A9DAAD6C22E7EA8F00E76C9F /* IdentifiableClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IdentifiableClass.swift; sourceTree = "<group>"; };
 		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>"; };
 		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>"; };
@@ -417,6 +419,7 @@
 				E93BA05F24A15FA800C5D7E6 /* PrescriptionDeviceView.swift */,
 				E991F1B624A548580059281B /* AdaptiveKeyboardPadding.swift */,
 				E991F1C424AAB25C0059281B /* CorrectionRangeReviewView.swift */,
+				E916F56C24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -790,10 +793,11 @@
 				A9DAAD3422E7CA1A00E76C9F /* LocalizedString.swift in Sources */,
 				A9DAAD3922E7DEE000E76C9F /* TidepoolService+UI.swift in Sources */,
 				A9DAAD6F22E7EA9700E76C9F /* NibLoadable.swift in Sources */,
-				E991F1C524AAB25C0059281B /* CorrectionRangeReviewView.swift in Sources */,
 				E93BA05E24A14CBA00C5D7E6 /* PrescriptionReviewViewModel.swift in Sources */,
+				E991F1C524AAB25C0059281B /* CorrectionRangeReviewView.swift in Sources */,
 				A92E770122E9181500591027 /* TidepoolServiceSetupViewController.swift in Sources */,
 				A9DAAD3B22E7DEF100E76C9F /* TidepoolServiceSettingsViewController.swift in Sources */,
+				E916F56D24AD3DA600BE3547 /* CorrectionRangeOverrideReview.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

TidepoolServiceKit/Mocks/MockPrescriptionManager.swift

@@ -77,7 +77,7 @@ public class MockPrescriptionManager {
                 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: 80.0, maxValue: 90.0))
+                workoutTargetRange: DoubleRange(minValue: 130.0, maxValue: 140.0))
         }
     }
 

TidepoolServiceKitUI/View Controllers/PrescriptionReviewUICoordinator.swift

@@ -16,6 +16,8 @@ enum PrescriptionReviewScreen {
     case reviewDevices
     case correctionRangeInfo
     case correctionRangeEditor
+    case correctionRangeOverrideInfo
+    case correctionRangeOverrideEditor
 
     func next() -> PrescriptionReviewScreen? {
         switch self {
@@ -26,6 +28,10 @@ enum PrescriptionReviewScreen {
         case .correctionRangeInfo:
             return .correctionRangeEditor
         case .correctionRangeEditor:
+            return .correctionRangeOverrideInfo
+        case .correctionRangeOverrideInfo:
+            return .correctionRangeOverrideEditor
+        case .correctionRangeOverrideEditor:
             return nil
         }
     }
@@ -96,7 +102,27 @@ class PrescriptionReviewUICoordinator: UINavigationController, CompletionNotifyi
             }
             let view = CorrectionRangeReviewView(model: viewModel, prescription: prescription)
             let hostedView = DismissibleHostingController(rootView: view)
-            hostedView.navigationItem.largeTitleDisplayMode = .never // fix for jumping
+            hostedView.navigationItem.largeTitleDisplayMode = .never // TODO: hack to fix jumping, will be removed once editors have titles
+            return hostedView
+        case .correctionRangeOverrideInfo:
+            let exiting: (() -> Void) = { [weak self] in
+                self?.stepFinished()
+            }
+            let view = CorrectionRangeOverrideInformationView(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("Temporary Ranges", comment: "Title for temporary correction range informational screen") // TODO: make this title be "Temporary Correction Ranges" when SwiftUI supports multi-line titles
+            return hostedView
+        case .correctionRangeOverrideEditor:
+            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 = CorrectionRangeOverrideReview(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
         }
     }
@@ -136,8 +162,8 @@ class PrescriptionReviewUICoordinator: UINavigationController, CompletionNotifyi
         if let nextStep = currentScreen.next() {
             navigate(to: nextStep)
         } else {
-            if let settingDelegate = onReviewFinished {
-                settingDelegate(viewModel.settings)
+            if let onReviewFinished = onReviewFinished {
+                onReviewFinished(viewModel.settings)
             }
             completionDelegate?.completionNotifyingDidComplete(self)
         }

TidepoolServiceKitUI/View Models/PrescriptionReviewViewModel.swift

@@ -9,6 +9,8 @@
 import Foundation
 import TidepoolServiceKit
 import LoopKit
+import LoopKitUI
+import HealthKit
 
 class PrescriptionReviewViewModel: ObservableObject {
     var didFinishStep: (() -> Void)
@@ -58,4 +60,9 @@ class PrescriptionReviewViewModel: ObservableObject {
     func saveCorrectionRange(range: GlucoseRangeSchedule) {
         settings.glucoseTargetRangeSchedule = range
     }
+
+    func saveCorrectionRangeOverrides(overrides: CorrectionRangeOverrides, unit: HKUnit) {
+        settings.preMealTargetRange = overrides.preMeal?.doubleRange(for: unit)
+        settings.workoutTargetRange = overrides.workout?.doubleRange(for: unit)
+    }
 }

TidepoolServiceKitUI/Views/CorrectionRangeOverrideReview.swift

@@ -0,0 +1,44 @@
+//
+//  CorrectionRangeOverrideReviewView.swift
+//  TidepoolServiceKitUI
+//
+//  Created by Anna Quinlan on 7/1/20.
+//  Copyright © 2020 LoopKit Authors. All rights reserved.
+//
+
+import SwiftUI
+import TidepoolServiceKit
+import LoopKit
+import LoopKitUI
+
+struct CorrectionRangeOverrideReview: View {
+    @ObservedObject var viewModel: PrescriptionReviewViewModel
+    let prescription: MockPrescription
+
+    init(
+        model: PrescriptionReviewViewModel,
+        prescription: MockPrescription
+    ) {
+        self.viewModel = model
+        self.prescription = prescription
+    }
+
+    var body: some View {
+        CorrectionRangeOverridesEditor(
+            value: CorrectionRangeOverrides(
+                preMeal: prescription.preMealTargetRange,
+                workout: prescription.workoutTargetRange,
+                unit: prescription.bloodGlucoseUnit.hkUnit
+            ),
+            unit: prescription.bloodGlucoseUnit.hkUnit,
+            correctionRangeScheduleRange: prescription.glucoseTargetRangeSchedule.scheduleRange(),
+            minValue: prescription.suspendThreshold.quantity,
+            onSave: { overrides in
+                self.viewModel.saveCorrectionRangeOverrides(overrides: overrides, unit: self.prescription.bloodGlucoseUnit.hkUnit)
+                self.viewModel.didFinishStep()
+            },
+            sensitivityOverridesEnabled: false,
+            mode: .flow
+        )
+    }
+}

TidepoolServiceKitUI/Views/CorrectionRangeReview.swift

@@ -0,0 +1,38 @@
+//
+//  CorrectionRangeReview.swift
+//  TidepoolServiceKitUI
+//
+//  Created by Anna Quinlan on 6/29/20.
+//  Copyright © 2020 LoopKit Authors. All rights reserved.
+//
+import SwiftUI
+import LoopKitUI
+import LoopKit
+import HealthKit
+import TidepoolServiceKit
+
+struct CorrectionRangeReview: View {
+    @ObservedObject var viewModel: PrescriptionReviewViewModel
+    let prescription: MockPrescription
+
+    init(
+        model: PrescriptionReviewViewModel,
+        prescription: MockPrescription
+    ) {
+        self.viewModel = model
+        self.prescription = prescription
+    }
+
+    var body: some View {
+        CorrectionRangeScheduleEditor(
+            schedule: prescription.glucoseTargetRangeSchedule,
+            unit: prescription.bloodGlucoseUnit.hkUnit,
+            minValue: prescription.suspendThreshold.quantity,
+            onSave: { newSchedule in
+                self.viewModel.saveCorrectionRange(range: newSchedule)
+                self.viewModel.didFinishStep()
+            },
+            mode: .flow
+        )
+    }
+}