Recommendation Bolus Breakdown

Common/FeatureFlags.swift

@@ -39,7 +39,8 @@ struct FeatureFlagConfiguration: Decodable {
     let profileExpirationSettingsViewEnabled: Bool
     let missedMealNotifications: Bool
     let allowAlgorithmExperiments: Bool
-
+    let correctionWithCarbBolus: Bool
+    let bgCorrectionWithCarbBolus: Bool
 
     fileprivate init() {
         // Swift compiler config is inverse, since the default state is enabled.
@@ -232,6 +233,18 @@ struct FeatureFlagConfiguration: Decodable {
         #else
         self.allowAlgorithmExperiments = false
         #endif
+
+        #if DISABLE_CORRECTION_WITH_CARB_BOLUS
+        self.correctionWithCarbBolus = false
+        #else
+        self.correctionWithCarbBolus = true
+        #endif
+
+        #if DISABLE_BG_CORRECTION_WITH_CARB_BOLUS
+        self.bgCorrectionWithCarbBolus = false
+        #else
+        self.bgCorrectionWithCarbBolus = true
+        #endif
     }
 }
 

Common/Models/BuildDetails.swift

@@ -16,8 +16,8 @@ class BuildDetails {
 
     init() {
         guard let url = Bundle.main.url(forResource: "BuildDetails", withExtension: ".plist"),
-           let data = try? Data(contentsOf: url),
-           let parsed = try? PropertyListSerialization.propertyList(from: data, format: nil) as? [String: Any] else
+              let data = try? Data(contentsOf: url),
+              let parsed = try? PropertyListSerialization.propertyList(from: data, format: nil) as? [String: Any] else
         {
             dict = [:]
             return
@@ -63,7 +63,7 @@ class BuildDetails {
     }
 
     var workspaceGitBranch: String? {
-       return dict["com-loopkit-LoopWorkspace-git-branch"] as? String
-   }
+        return dict["com-loopkit-LoopWorkspace-git-branch"] as? String
+    }
 }
 

Loop.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		12F04F012D19791B002B2121 /* AutoBolusCarbsSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12F04F002D197907002B2121 /* AutoBolusCarbsSelectionView.swift */; };
 		1419606428D9550400BA86E0 /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 437AFEE6203688CF008C4892 /* LoopKitUI.framework */; };
 		1419606928D9554E00BA86E0 /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 437AFEE6203688CF008C4892 /* LoopKitUI.framework */; };
 		1419606A28D955BC00BA86E0 /* MockKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C101947127DD473C004E7EB8 /* MockKitUI.framework */; };
@@ -743,6 +744,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		12F04F002D197907002B2121 /* AutoBolusCarbsSelectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoBolusCarbsSelectionView.swift; sourceTree = "<group>"; };
 		142CB7582A60BF2E0075748A /* EditMode.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EditMode.swift; sourceTree = "<group>"; };
 		142CB75A2A60BFC30075748A /* FavoriteFoodsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FavoriteFoodsView.swift; sourceTree = "<group>"; };
 		1452F4A82A851C9400F8B9E4 /* AddEditFavoriteFoodViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddEditFavoriteFoodViewModel.swift; sourceTree = "<group>"; };
@@ -2244,6 +2246,7 @@
 		43F5C2CF1B92A2ED003EB13D /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				12F04F002D197907002B2121 /* AutoBolusCarbsSelectionView.swift */,
 				1452F4AA2A851EDF00F8B9E4 /* AddEditFavoriteFoodView.swift */,
 				B4001CED28CBBC82002FB414 /* AlertManagementView.swift */,
 				897A5A9524C2175B00C4E71D /* BolusEntryView.swift */,
@@ -3736,6 +3739,7 @@
 				149A28E42A8A63A700052EDF /* FavoriteFoodDetailView.swift in Sources */,
 				1DDE274024AEA4F200796622 /* NotificationsCriticalAlertPermissionsView.swift in Sources */,
 				A9A056B524B94123007CF06D /* CriticalEventLogExportViewModel.swift in Sources */,
+				12F04F012D19791B002B2121 /* AutoBolusCarbsSelectionView.swift in Sources */,
 				434FF1EE1CF27EEF000DB779 /* UITableViewCell.swift in Sources */,
 				439BED2A1E76093C00B0AED5 /* CGMManager.swift in Sources */,
 				C16B983E26B4893300256B05 /* DoseEnactor.swift in Sources */,

Loop/View Controllers/StatusTableViewController.swift

@@ -601,6 +601,8 @@ final class StatusTableViewController: LoopChartsTableViewController {
             } else {
                 self.currentCOBDescription = nil
             }
+            // FIXME need to trigger an update of this value when the UserDefaults are changed
+            self.currentAutoBolusCarbsActive = self.deviceManager.loopManager.autoBolusCarbsEnabledAndActive
 
             self.tableView.beginUpdates()
             if let hudView = self.hudView {
@@ -677,6 +679,8 @@ final class StatusTableViewController: LoopChartsTableViewController {
     // MARK: COB
 
     private var currentCOBDescription: String?
+
+    private var currentAutoBolusCarbsActive = false
 
     // MARK: - Loop Status Section Data
 
@@ -1003,7 +1007,15 @@ final class StatusTableViewController: LoopChartsTableViewController {
                 cell.setChartGenerator(generator: { [weak self] (frame) in
                     return self?.statusCharts.cobChart(withFrame: frame)?.view
                 })
-                cell.setTitleLabelText(label: NSLocalizedString("Active Carbohydrates", comment: "The title of the Carbs On-Board graph"))
+
+                let label = NSLocalizedString("Active Carbohydrates", comment: "The title of the Carbs On-Board graph");
+
+                // FIXME need to put in place a proper image indicating AutoBolusCarbs
+                if currentAutoBolusCarbsActive {
+                    cell.setTitleLabelText(label: String(format: "%@ %@", label, "🔸"))
+                } else {
+                    cell.setTitleLabelText(label: label)
+                }
             }
 
             self.tableView(tableView, updateSubtitleFor: cell, at: indexPath)
@@ -1165,6 +1177,15 @@ final class StatusTableViewController: LoopChartsTableViewController {
                 } else {
                     cell.setSubtitleLabel(label: nil)
                 }
+
+                let label = NSLocalizedString("Active Carbohydrates", comment: "The title of the Carbs On-Board graph");
+
+                // FIXME need to put in place a proper image indicating AutoBolusCarbs
+                if currentAutoBolusCarbsActive {
+                    cell.setTitleLabelText(label: String(format: "%@ %@", label, "🔸"))
+                } else {
+                    cell.setTitleLabelText(label: label)
+                }
             }
         case .hud, .status, .alertWarning:
             break
@@ -1233,7 +1254,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
                     case .preMeal, .legacyWorkout:
                         break
                     default:
-                        let vc = AddEditOverrideTableViewController(glucoseUnit: statusCharts.glucose.glucoseUnit)
+                        let vc = AddEditOverrideTableViewController(glucoseUnit: statusCharts.glucose.glucoseUnit, autoBolusCarbsEnabled: UserDefaults.standard.autoBolusCarbsEnabled)
                         vc.inputMode = .editOverride(override)
                         vc.delegate = self
                         show(vc, sender: tableView.cellForRow(at: indexPath))
@@ -1342,6 +1363,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
             vc.glucoseUnit = statusCharts.glucose.glucoseUnit
             vc.overrideHistory = deviceManager.loopManager.overrideHistory.getEvents()
             vc.delegate = self
+            vc.autoBolusCarbsEnabled = UserDefaults.standard.autoBolusCarbsEnabled
         case let vc as PredictionTableViewController:
             vc.deviceManager = deviceManager
         default: