[LOOP-4685] secret favorites foods feature unlock

Author: SwiftlyNoah

Loop/DefaultAssets.xcassets/meals.imageset/Contents.json renamed to Loop/DefaultAssets.xcassets/favorite-foods.imageset/Contents.json

@@ -109,7 +109,8 @@ class SettingsManager {
                 maximumBolus: latestSettings.maximumBolus,
                 suspendThreshold: latestSettings.suspendThreshold,
                 automaticDosingStrategy: latestSettings.automaticDosingStrategy,
-                defaultRapidActingModel: latestSettings.defaultRapidActingModel?.presetForRapidActingInsulin)
+                defaultRapidActingModel: latestSettings.defaultRapidActingModel?.presetForRapidActingInsulin,
+                favoriteFoodsEnabled: latestSettings.favoriteFoodsEnabled)
         }
     }
 
@@ -132,6 +133,7 @@ class SettingsManager {
                               deviceToken: deviceToken,
                               insulinType: deviceStatusProvider?.pumpManagerStatus?.insulinType,
                               defaultRapidActingModel: newLoopSettings.defaultRapidActingModel.map(StoredInsulinModel.init),
+                              favoriteFoodsEnabled: newLoopSettings.favoriteFoodsEnabled,
                               basalRateSchedule: newLoopSettings.basalRateSchedule,
                               insulinSensitivitySchedule: newLoopSettings.insulinSensitivitySchedule,
                               carbRatioSchedule: newLoopSettings.carbRatioSchedule,

Loop/DefaultAssets.xcassets/meals.imageset/meals.pdf renamed to Loop/DefaultAssets.xcassets/favorite-foods.imageset/meals.pdf

@@ -173,6 +173,8 @@ final class CarbEntryViewController: LoopChartsTableViewController, Identifiable
     }()
 
     private var lastContentHeight: CGFloat = 0
+    
+    public weak var favoriteFoodsDelegate: FavoriteFoodsFeatureUnlockDelegate?
 
     override func createChartsManager() -> ChartsManager {
         // Consider including a chart on this screen to demonstrate how absorption time affects prediction
@@ -552,6 +554,10 @@ final class CarbEntryViewController: LoopChartsTableViewController, Identifiable
         guard let updatedEntry = updatedCarbEntry else {
             return
         }
+        
+        if foodType == "🍞🥜🍫🥛" && quantity?.doubleValue(for: .gram()) == 63 {
+            favoriteFoodsDelegate?.featureAvailabilityChanged()
+        }
 
         let viewModel = BolusEntryViewModel(
             delegate: deviceManager,
@@ -784,3 +790,7 @@ extension CarbEntryViewController: EmojiInputControllerDelegate {
 extension DateAndDurationTableViewCell: NibLoadable {}
 
 extension DateAndDurationSteppableTableViewCell: NibLoadable {}
+
+protocol FavoriteFoodsFeatureUnlockDelegate: AnyObject {
+    func featureAvailabilityChanged()
+}

Loop/Managers/SettingsManager.swift

@@ -271,22 +271,40 @@ final class StatusTableViewController: LoopChartsTableViewController {
     private func setupToolbarItems() {
         let space = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: nil)
         let carbs = UIBarButtonItem(image: UIImage(named: "carbs"), style: .plain, target: self, action: #selector(userTappedAddCarbs))
-        let meals = UIBarButtonItem(image: UIImage(named: "meals"), style: .plain, target: self, action: #selector(presentMealsScreen))
         let bolus = UIBarButtonItem(image: UIImage(named: "bolus"), style: .plain, target: self, action: #selector(presentBolusScreen))
-        let presets = createPresetsButtonItem()
         let settings = UIBarButtonItem(image: UIImage(named: "settings"), style: .plain, target: self, action: #selector(onSettingsTapped))
 
-        toolbarItems = [
-            carbs,
-            space,
-            meals,
-            space,
-            bolus,
-            space,
-            presets,
-            space,
-            settings
-        ]
+        let favoriteFoodsEnabled = deviceManager.loopManager.settings.favoriteFoodsEnabled
+        if favoriteFoodsEnabled {
+            let meals = UIBarButtonItem(image: UIImage(named: "meals"), style: .plain, target: self, action: #selector(presentMealsScreen))
+            let presets = createPresetsButtonItem(selected: false, isEnabled: true)
+            toolbarItems = [
+                carbs,
+                space,
+                meals,
+                space,
+                bolus,
+                space,
+                presets,
+                space,
+                settings
+            ]
+        }
+        else {
+            let preMeal = createPreMealButtonItem(selected: false, isEnabled: true)
+            let workout = createWorkoutButtonItem(selected: false, isEnabled: true)
+            toolbarItems = [
+                carbs,
+                space,
+                preMeal,
+                space,
+                bolus,
+                space,
+                workout,
+                space,
+                settings
+            ]
+        }
     }
 
     private func updateToolbarItems() {
@@ -295,18 +313,23 @@ final class StatusTableViewController: LoopChartsTableViewController {
         toolbarItems![0].accessibilityLabel = NSLocalizedString("Enter Carbs", comment: "The label of the carb entry button")
         toolbarItems![0].isEnabled = isPumpOnboarded
         toolbarItems![0].tintColor = UIColor.carbTintColor
-        // TODO: - Fix localized string here
-        toolbarItems![0].accessibilityLabel = NSLocalizedString("Enter Carbs", comment: "The label of the carb entry button")
-        toolbarItems![2].isEnabled = isPumpOnboarded
-        toolbarItems![2].tintColor = UIColor.carbTintColor
         toolbarItems![4].accessibilityLabel = NSLocalizedString("Bolus", comment: "The label of the bolus entry button")
         toolbarItems![4].isEnabled = isPumpOnboarded
         toolbarItems![4].tintColor = UIColor.insulinTintColor
-        toolbarItems![6].accessibilityLabel = NSLocalizedString("Presets", comment: "The label of the presets button")
-        toolbarItems![6].isEnabled = isPumpOnboarded
-        toolbarItems![6].tintColor = UIColor.presetTintColor
         toolbarItems![8].accessibilityLabel = NSLocalizedString("Settings", comment: "The label of the settings button")
         toolbarItems![8].tintColor = UIColor.secondaryLabel
+        
+        let favoriteFoodsEnabled = deviceManager.loopManager.settings.favoriteFoodsEnabled
+        if favoriteFoodsEnabled {
+            toolbarItems![2] = createFavoriteFoodsButtonItem()
+            
+            let selected = (preMealMode == true && preMealModeAllowed) || (workoutMode == true && workoutModeAllowed)
+            toolbarItems![6] = createPresetsButtonItem(selected: selected, isEnabled: preMealModeAllowed || workoutModeAllowed)
+        }
+        else {
+            toolbarItems![2] = createPreMealButtonItem(selected: preMealMode == true && preMealModeAllowed, isEnabled: preMealModeAllowed)
+            toolbarItems![6] = createWorkoutButtonItem(selected: workoutMode == true && workoutModeAllowed, isEnabled: workoutModeAllowed)
+        }
     }
 
     public var basalDeliveryState: PumpManagerStatus.BasalDeliveryState? = nil {
@@ -837,35 +860,34 @@ final class StatusTableViewController: LoopChartsTableViewController {
             guard oldValue != preMealMode else {
                 return
             }
-//            updatePreMealModeAvailability(automaticDosingEnabled: automaticDosingStatus.automaticDosingEnabled)
-            
-            toolbarItems![6] = createPresetsButtonItem()
-            
-//            updatePreMealModeAvailability(automaticDosingEnabled: automaticDosingStatus.automaticDosingEnabled)
+            updatePreMealModeAvailability(automaticDosingEnabled: automaticDosingStatus.automaticDosingEnabled)
         }
     }
+    private lazy var preMealModeAllowed: Bool = {
+        onboardingManager.isComplete &&
+                (automaticDosingStatus.automaticDosingEnabled || !FeatureFlags.simpleBolusCalculatorEnabled)
+                && deviceManager.loopManager.settings.preMealTargetRange != nil
+    }()
 
     private func updatePreMealModeAvailability(automaticDosingEnabled: Bool) {
-        let allowed = onboardingManager.isComplete &&
+        preMealModeAllowed = onboardingManager.isComplete &&
                 (automaticDosingEnabled || !FeatureFlags.simpleBolusCalculatorEnabled)
                 && deviceManager.loopManager.settings.preMealTargetRange != nil
+        updateToolbarItems()
     }
 
     private var workoutMode: Bool? = nil {
         didSet {
             guard oldValue != workoutMode else {
                 return
             }
-//            if let workoutMode = workoutMode {
-//                let allowed = onboardingManager.isComplete
-//                toolbarItems![6] = createWorkoutButtonItem(selected: workoutMode, isEnabled: allowed)
-//            } else {
-//                toolbarItems![6].isEnabled = false
-//            }
-            
-            toolbarItems![6] = createPresetsButtonItem()
+            workoutModeAllowed = workoutMode != nil && onboardingManager.isComplete
+            updateToolbarItems()
         }
     }
+    private lazy var workoutModeAllowed: Bool = {
+        workoutMode != nil && onboardingManager.isComplete
+    }()
 
     // MARK: - Table view data source
 
@@ -1375,7 +1397,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
             hostingController.navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: navigationWrapper, action: #selector(dismissWithAnimation))
         } else {
             let carbEntryViewController = UIStoryboard(name: "Main", bundle: Bundle(for: AppDelegate.self)).instantiateViewController(withIdentifier: "CarbEntryViewController") as! CarbEntryViewController
-
+            carbEntryViewController.favoriteFoodsDelegate = self
             carbEntryViewController.deviceManager = deviceManager
             carbEntryViewController.defaultAbsorptionTimes = deviceManager.carbStore.defaultAbsorptionTimes
             carbEntryViewController.preferredCarbUnit = deviceManager.carbStore.preferredUnit
@@ -1421,11 +1443,17 @@ final class StatusTableViewController: LoopChartsTableViewController {
         deviceManager.analyticsServicesManager.didDisplayBolusScreen()
     }
 
-    private func createPresetsButtonItem() -> UIBarButtonItem {
-        let selected = workoutMode == true || preMealMode == true
-        
+    private func createFavoriteFoodsButtonItem() -> UIBarButtonItem {
+        let item = UIBarButtonItem(image: UIImage(named: "favorite-foods")!, style: .plain, target: self, action: #selector(presentMealsScreen))
+        item.accessibilityLabel = NSLocalizedString("Favorite Foods", comment: "The label of the favorite foods button")
+
+        item.tintColor = UIColor.carbTintColor
+
+        return item
+    }
+    
+    private func createPresetsButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
         let item = UIBarButtonItem(image: UIImage.presetsImage(selected: selected)!, style: .plain, target: self, action: #selector(onPresetsTapped))
-        // MARK: - Needs localization
         item.accessibilityLabel = NSLocalizedString("Presets", comment: "The label of the presets mode toggle button")
 
         if selected {
@@ -1436,43 +1464,44 @@ final class StatusTableViewController: LoopChartsTableViewController {
         }
 
         item.tintColor = UIColor.presetTintColor
+        item.isEnabled = isEnabled
 
         return item
     }
 
-//    private func createPreMealButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
-//        let item = UIBarButtonItem(image: UIImage.preMealImage(selected: selected), style: .plain, target: self, action: #selector(togglePreMealMode(_:)))
-//        item.accessibilityLabel = NSLocalizedString("Pre-Meal Targets", comment: "The label of the pre-meal mode toggle button")
-//
-//        if selected {
-//            item.accessibilityTraits.insert(.selected)
-//            item.accessibilityHint = NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled")
-//        } else {
-//            item.accessibilityHint = NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
-//        }
-//
-//        item.tintColor = UIColor.carbTintColor
-//        item.isEnabled = isEnabled
-//
-//        return item
-//    }
+    private func createPreMealButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
+        let item = UIBarButtonItem(image: UIImage.preMealImage(selected: selected), style: .plain, target: self, action: #selector(togglePreMealMode(_:)))
+        item.accessibilityLabel = NSLocalizedString("Pre-Meal Targets", comment: "The label of the pre-meal mode toggle button")
+
+        if selected {
+            item.accessibilityTraits.insert(.selected)
+            item.accessibilityHint = NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled")
+        } else {
+            item.accessibilityHint = NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
+        }
+
+        item.tintColor = UIColor.carbTintColor
+        item.isEnabled = isEnabled
+
+        return item
+    }
 
-//    private func createWorkoutButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
-//        let item = UIBarButtonItem(image: UIImage.workoutImage(selected: selected), style: .plain, target: self, action: #selector(toggleWorkoutMode(_:)))
-//        item.accessibilityLabel = NSLocalizedString("Workout Targets", comment: "The label of the workout mode toggle button")
-//
-//        if selected {
-//            item.accessibilityTraits.insert(.selected)
-//            item.accessibilityHint = NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled")
-//        } else {
-//            item.accessibilityHint = NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
-//        }
-//
-//        item.tintColor = UIColor.glucoseTintColor
-//        item.isEnabled = isEnabled
-//
-//        return item
-//    }
+    private func createWorkoutButtonItem(selected: Bool, isEnabled: Bool) -> UIBarButtonItem {
+        let item = UIBarButtonItem(image: UIImage.workoutImage(selected: selected), style: .plain, target: self, action: #selector(toggleWorkoutMode(_:)))
+        item.accessibilityLabel = NSLocalizedString("Workout Targets", comment: "The label of the workout mode toggle button")
+
+        if selected {
+            item.accessibilityTraits.insert(.selected)
+            item.accessibilityHint = NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled")
+        } else {
+            item.accessibilityHint = NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
+        }
+
+        item.tintColor = UIColor.glucoseTintColor
+        item.isEnabled = isEnabled
+
+        return item
+    }
 
     @objc func onPresetsTapped() {
         if preMealMode == true {
@@ -1495,6 +1524,15 @@ final class StatusTableViewController: LoopChartsTableViewController {
     }
 
     func presentPresetAlertController() {
+        guard workoutModeAllowed else {
+            presentPreMealModeAlertController()
+            return
+        }
+        guard preMealModeAllowed else {
+            presentWorkoutModeAlertController()
+            return
+        }
+        
         let vc = UIAlertController(presetTypeSelectionHandler: { [self] presetType in
             switch presetType {
             case .preMeal:
@@ -1509,15 +1547,15 @@ final class StatusTableViewController: LoopChartsTableViewController {
         present(vc, animated: true, completion: nil)
     }
 
-//    @IBAction func togglePreMealMode(_ sender: UIBarButtonItem) {
-//        if preMealMode == true {
-//            deviceManager.loopManager.mutateSettings { settings in
-//                settings.clearOverride(matching: .preMeal)
-//            }
-//        } else {
-//            presentPreMealModeAlertController()
-//        }
-//    }
+    @IBAction func togglePreMealMode(_ sender: UIBarButtonItem) {
+        if preMealMode == true {
+            deviceManager.loopManager.mutateSettings { settings in
+                settings.clearOverride(matching: .preMeal)
+            }
+        } else {
+            presentPreMealModeAlertController()
+        }
+    }
 
     func presentPreMealModeAlertController() {
         let vc = UIAlertController(premealDurationSelectionHandler: { duration in
@@ -1544,19 +1582,19 @@ final class StatusTableViewController: LoopChartsTableViewController {
         present(vc, animated: true, completion: nil)
     }
 
-//    @IBAction func toggleWorkoutMode(_ sender: UIBarButtonItem) {
-//        if workoutMode == true {
-//            deviceManager.loopManager.mutateSettings { settings in
-//                settings.clearOverride()
-//            }
-//        } else {
-//            if FeatureFlags.sensitivityOverridesEnabled {
-//                performSegue(withIdentifier: OverrideSelectionViewController.className, sender: toolbarItems![6])
-//            } else {
-//                presentWorkoutModeAlertController()
-//            }
-//        }
-//    }
+    @IBAction func toggleWorkoutMode(_ sender: UIBarButtonItem) {
+        if workoutMode == true {
+            deviceManager.loopManager.mutateSettings { settings in
+                settings.clearOverride()
+            }
+        } else {
+            if FeatureFlags.sensitivityOverridesEnabled {
+                performSegue(withIdentifier: OverrideSelectionViewController.className, sender: toolbarItems![6])
+            } else {
+                presentWorkoutModeAlertController()
+            }
+        }
+    }
 
     func presentWorkoutModeAlertController() {
         let vc = UIAlertController(workoutDurationSelectionHandler: { duration in
@@ -1675,7 +1713,7 @@ final class StatusTableViewController: LoopChartsTableViewController {
     }
 
     private func automaticDosingStatusChanged(_ automaticDosingEnabled: Bool) {
-//        updatePreMealModeAvailability(automaticDosingEnabled: automaticDosingEnabled)
+        updatePreMealModeAvailability(automaticDosingEnabled: automaticDosingEnabled)
         hudView?.loopCompletionHUD.loopIconClosed = automaticDosingEnabled
         hudView?.loopCompletionHUD.closedLoopDisallowedLocalizedDescription = deviceManager.closedLoopDisallowedLocalizedDescription
     }
@@ -2282,3 +2320,12 @@ extension StatusTableViewController: ServicesViewModelDelegate {
         show(settingsViewController, sender: self)
     }
 }
+
+extension StatusTableViewController: FavoriteFoodsFeatureUnlockDelegate {
+    func featureAvailabilityChanged() {
+        deviceManager.loopManager.mutateSettings { settings in
+            settings.favoriteFoodsEnabled.toggle()
+        }
+        self.updateToolbarItems()
+    }
+}