LOOP-1492: New therapy settings screen (#155)

Rick Pasetto · web-flow · commit 11333eecbf09 · 2020-07-14T14:07:30.000-07:00
* checkpoint

* PR Feedback
diff --git a/Loop/Managers/LoopDataManager.swift b/Loop/Managers/LoopDataManager.swift
@@ -1816,3 +1816,16 @@ extension LoopDataManager {
         }
     }
 }
+
+extension LoopDataManager {
+    public var therapySettings: TherapySettings {
+        TherapySettings(glucoseTargetRangeSchedule: settings.glucoseTargetRangeSchedule,
+                        preMealTargetRange: settings.preMealTargetRange,
+                        workoutTargetRange: settings.legacyWorkoutTargetRange,
+                        maximumBasalRatePerHour: settings.maximumBasalRatePerHour,
+                        maximumBolus: settings.maximumBolus,
+                        suspendThreshold: settings.suspendThreshold,
+                        insulinSensitivitySchedule: insulinSensitivitySchedule,
+                        carbRatioSchedule: carbRatioSchedule)
+    }
+}
diff --git a/Loop/View Controllers/SettingsTableViewController.swift b/Loop/View Controllers/SettingsTableViewController.swift
@@ -743,6 +743,7 @@ final class SettingsTableViewController: UITableViewController, IdentifiableClas
                                           notificationsCriticalAlertPermissionsViewModel: notificationsCriticalAlertPermissionsViewModel,
                                           pumpManagerSettingsViewModel: pumpViewModel,
                                           cgmManagerSettingsViewModel: cgmViewModel,
+                                          therapySettings: dataManager.loopManager.therapySettings,
                                           initialDosingEnabled: dataManager.loopManager.settings.dosingEnabled,
                                           setDosingEnabled: { [weak self] in
                                             self?.setDosingEnabled($0)
diff --git a/Loop/Views/SettingsView.swift b/Loop/Views/SettingsView.swift
@@ -6,6 +6,7 @@
 //  Copyright © 2020 LoopKit Authors. All rights reserved.
 //
 
+import LoopKit
 import LoopKitUI
 import SwiftUI
 
@@ -73,7 +74,7 @@ extension SettingsView {
         
     private var therapySettingsSection: some View {
         Section(header: SectionHeader(label: NSLocalizedString("Configuration", comment: "The title of the Configuration section in settings"))) {
-            NavigationLink(destination: Text("Therapy Settings")) {
+            NavigationLink(destination: TherapySettingsView(viewModel: TherapySettingsViewModel(therapySettings: viewModel.therapySettings))) {
                 LargeButton(action: { },
                             includeArrow: false,
                             imageView: AnyView(Image("Therapy Icon")),
@@ -191,6 +192,7 @@ public struct SettingsView_Previews: PreviewProvider {
                                           notificationsCriticalAlertPermissionsViewModel: NotificationsCriticalAlertPermissionsViewModel(),
                                           pumpManagerSettingsViewModel: DeviceViewModel(),
                                           cgmManagerSettingsViewModel: DeviceViewModel(),
+                                          therapySettings: TherapySettings(),
                                           initialDosingEnabled: true)
         return Group {
             SettingsView(viewModel: viewModel)
diff --git a/Loop/Views/SettingsViewModel.swift b/Loop/Views/SettingsViewModel.swift
@@ -49,13 +49,15 @@ public class SettingsViewModel: ObservableObject {
 
     var pumpManagerSettingsViewModel: DeviceViewModel
     var cgmManagerSettingsViewModel: DeviceViewModel
+    var therapySettings: TherapySettings
     
     lazy private var cancellables = Set<AnyCancellable>()
 
     public init(appNameAndVersion: String,
                 notificationsCriticalAlertPermissionsViewModel: NotificationsCriticalAlertPermissionsViewModel,
                 pumpManagerSettingsViewModel: DeviceViewModel,
                 cgmManagerSettingsViewModel: DeviceViewModel,
+                therapySettings: TherapySettings,
                 // TODO: This is temporary until I can figure out something cleaner
                 initialDosingEnabled: Bool,
                 setDosingEnabled: ((Bool) -> Void)? = nil
@@ -66,7 +68,8 @@ public class SettingsViewModel: ObservableObject {
         self.cgmManagerSettingsViewModel = cgmManagerSettingsViewModel
         self.setDosingEnabled = setDosingEnabled
         self.dosingEnabled = initialDosingEnabled
-        
+        self.therapySettings = therapySettings
+
         // This strangeness ensures the composed ViewModels' (ObservableObjects') changes get reported to this ViewModel (ObservableObject)
         notificationsCriticalAlertPermissionsViewModel.objectWillChange.sink { [weak self] in
             self?.objectWillChange.send()

Original file line number	Diff line number	Diff line change
`@@ -1816,3 +1816,16 @@ extension LoopDataManager {`
`1816`	`1816`	`}`
`1817`	`1817`	`}`
`1818`	`1818`	`}`
	`1819`	`+`
	`1820`	`+extension LoopDataManager {`
	`1821`	`+ public var therapySettings: TherapySettings {`
	`1822`	`+ TherapySettings(glucoseTargetRangeSchedule: settings.glucoseTargetRangeSchedule,`
	`1823`	`+ preMealTargetRange: settings.preMealTargetRange,`
	`1824`	`+ workoutTargetRange: settings.legacyWorkoutTargetRange,`
	`1825`	`+ maximumBasalRatePerHour: settings.maximumBasalRatePerHour,`
	`1826`	`+ maximumBolus: settings.maximumBolus,`
	`1827`	`+ suspendThreshold: settings.suspendThreshold,`
	`1828`	`+ insulinSensitivitySchedule: insulinSensitivitySchedule,`
	`1829`	`+ carbRatioSchedule: carbRatioSchedule)`
	`1830`	`+ }`
	`1831`	`+}`