[LOOP-452] Carb Ratio Guardrails (#91)

* Integrate CarbRatioScheduleEditor

* Update correction range overrides copy

* Feedback from previous PR

* Remove outdated comment

Author: mpangburn

Loop/View Controllers/SettingsTableViewController.swift

@@ -244,8 +244,7 @@ final class SettingsTableViewController: UITableViewController {
                     configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
             case .correctionRangeOverrides:
-                // TODO: Copy not final.
-                configCell.textLabel?.text = NSLocalizedString("Correction Range Overrides", comment: "The title text for the correction range overrides")
+                configCell.textLabel?.text = NSLocalizedString("Temporary Correction Ranges", comment: "The title text for the correction range overrides")
                 if dataManager.loopManager.settings.preMealTargetRange == nil {
                     configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 } else {
@@ -438,21 +437,20 @@ final class SettingsTableViewController: UITableViewController {
             let row = ConfigurationRow(rawValue: indexPath.row)!
             switch row {
             case .carbRatio:
-                let scheduleVC = DailyQuantityScheduleTableViewController()
-
-                scheduleVC.delegate = self
-                scheduleVC.title = NSLocalizedString("Carb Ratios", comment: "The title of the carb ratios schedule screen")
-                scheduleVC.unit = .gram()
-
-                if let schedule = dataManager.loopManager.carbRatioSchedule {
-                    scheduleVC.timeZone = schedule.timeZone
-                    scheduleVC.scheduleItems = schedule.items
-                    scheduleVC.unit = schedule.unit
-                } else if let timeZone = dataManager.pumpManager?.status.timeZone {
-                    scheduleVC.timeZone = timeZone
-                }
+                let editor = CarbRatioScheduleEditor(
+                    schedule: dataManager.loopManager.carbRatioSchedule,
+                    onSave: { [dataManager] newSchedule in
+                        dataManager?.loopManager.carbRatioSchedule = newSchedule
+                        dataManager?.analyticsServicesManager.didChangeCarbRatioSchedule()
+                        tableView.reloadRows(at: [indexPath], with: .automatic)
+                    }
+                )
+
+                let hostingController = DismissibleHostingController(rootView: editor, onDisappear: {
+                    tableView.deselectRow(at: indexPath, animated: true)
+                })
 
-                show(scheduleVC, sender: sender)
+                present(hostingController, animated: true)
             case .insulinSensitivity:
                 let glucoseUnit = dataManager.loopManager.insulinSensitivitySchedule?.unit ?? dataManager.loopManager.glucoseStore.preferredUnit ?? HKUnit.milligramsPerDeciliter
 
@@ -510,7 +508,7 @@ final class SettingsTableViewController: UITableViewController {
                     tableView.deselectRow(at: indexPath, animated: true)
                 })
 
-                self.present(hostingController, animated: true)
+                present(hostingController, animated: true)
             case .suspendThreshold:
                 func presentSuspendThresholdEditor(initialValue: HKQuantity?, unit: HKUnit) {
                     let editor = SuspendThresholdEditor(
@@ -528,7 +526,7 @@ final class SettingsTableViewController: UITableViewController {
                         tableView.deselectRow(at: indexPath, animated: true)
                     })
 
-                    self.present(hostingController, animated: true)
+                    present(hostingController, animated: true)
                 }
 
                 if let minBGGuard = dataManager.loopManager.settings.suspendThreshold {
@@ -795,16 +793,8 @@ extension SettingsTableViewController: DailyValueScheduleTableViewControllerDele
                 if let controller = controller as? BasalScheduleTableViewController {
                     dataManager.loopManager.basalRateSchedule = BasalRateSchedule(dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
                 }
-            case let row:
-                if let controller = controller as? DailyQuantityScheduleTableViewController {
-                    switch row {
-                    case .carbRatio:
-                        dataManager.loopManager.carbRatioSchedule = CarbRatioSchedule(unit: controller.unit, dailyItems: controller.scheduleItems, timeZone: controller.timeZone)
-                        dataManager.analyticsServicesManager.didChangeCarbRatioSchedule()
-                    default:
-                        break
-                    }
-                }
+            default:
+                break
             }
         default:
             break

Loop/Views/CorrectionRangeOverridesEditor.swift

@@ -64,8 +64,7 @@ struct CorrectionRangeOverridesEditor: View {
 
     var body: some View {
         ConfigurationPage(
-            // TODO: Copy not final.
-            title: Text("Correction Range Overrides", comment: "Title for correction range overrides page"),
+            title: Text("Temporary\nCorrection Ranges", comment: "Title for temporary correction ranges page"),
             isSaveButtonEnabled: value != initialValue,
             cards: {
                 card(for: .preMeal)
@@ -114,7 +113,7 @@ struct CorrectionRangeOverridesEditor: View {
                         forceDisableAnimations: true
                     )
                 },
-                valuePicker: {
+                expandedContent: {
                     GlucoseRangePicker(
                         range: Binding(
                             get: { self.value.ranges[preset] ?? self.guardrail(for: preset).recommendedBounds },
@@ -134,12 +133,11 @@ struct CorrectionRangeOverridesEditor: View {
     }
 
     private func description(of preset: CorrectionRangeOverrides.Preset) -> Text {
-        // TODO: Copy not final.
         switch preset {
         case .preMeal:
-            return Text("When Pre-Meal Mode is active, the app adjusts insulin delivery in an effort to bring your glucose into your pre-meal correction range.", comment: "Description of pre-meal mode")
+            return Text("Temporarily lower your glucose target before a meal to impact post-meal glucose spikes.", comment: "Description of pre-meal mode")
         case .workout:
-            return Text("When Workout Mode is active, the app adjusts insulin delivery in an effort to bring your glucose into your workout correction range.", comment: "Description of workout mode")
+            return Text("Temporarily raise your glucose target before, during, or after physical activity to reduce the risk of low glucose events.", comment: "Description of workout mode")
         }
     }
 

Loop/Views/SuspendThresholdEditor.swift

@@ -75,7 +75,7 @@ struct SuspendThresholdEditor: View {
                                     forceDisableAnimations: true
                                 )
                             },
-                            valuePicker: {
+                            expandedContent: {
                                 GlucoseValuePicker(
                                     value: $value.animation(),
                                     unit: unit,