Merge branch 'dev' of https://github.com/LoopKit/Loop into microboluses

Author: ivalkou

Loop/View Controllers/SettingsTableViewController.swift

@@ -73,7 +73,6 @@ final class SettingsTableViewController: UITableViewController {
         case insulinModel
         case carbRatio
         case insulinSensitivity
-        case overridePresets
     }
 
     fileprivate enum ServiceRow: Int, CaseCountable {
@@ -146,11 +145,7 @@ final class SettingsTableViewController: UITableViewController {
         case .cgm:
             return CGMRow.count
         case .configuration:
-            if FeatureFlags.sensitivityOverridesEnabled {
-                return ConfigurationRow.count
-            } else {
-                return ConfigurationRow.count - 1
-            }
+            return ConfigurationRow.count
         case .services:
             return ServiceRow.count
         case .testingPumpDataDeletion, .testingCGMDataDeletion:
@@ -309,14 +304,6 @@ final class SettingsTableViewController: UITableViewController {
                 } else {
                     configCell.detailTextLabel?.text = SettingsTableViewCell.TapToSetString
                 }
-            case .overridePresets:
-                configCell.textLabel?.text = NSLocalizedString("Override Presets", comment: "The title text for the override presets")
-                let maxPreviewSymbolCount = 3
-                let presetPreviewText = dataManager.loopManager.settings.overridePresets
-                    .prefix(maxPreviewSymbolCount)
-                    .map { $0.symbol }
-                    .joined(separator: " ")
-                configCell.detailTextLabel?.text = presetPreviewText
             }
 
             configCell.accessoryType = .disclosureIndicator
@@ -573,15 +560,6 @@ final class SettingsTableViewController: UITableViewController {
                 vc.delegate = self
                 vc.syncSource = pumpManager
 
-                show(vc, sender: sender)
-            case .overridePresets:
-                guard let glucoseUnit = dataManager.loopManager.glucoseStore.preferredUnit else { break }
-                let vc = OverridePresetTableViewController(
-                    glucoseUnit: glucoseUnit,
-                    presets: dataManager.loopManager.settings.overridePresets
-                )
-                vc.delegate = self
-
                 show(vc, sender: sender)
             }
         case .loop:
@@ -907,15 +885,6 @@ extension SettingsTableViewController: DeliveryLimitSettingsTableViewControllerD
 }
 
 
-extension SettingsTableViewController: OverridePresetTableViewControllerDelegate {
-    func overridePresetTableViewControllerDidUpdatePresets(_ vc: OverridePresetTableViewController) {
-        dataManager.loopManager.settings.overridePresets = vc.presets
-
-        tableView.reloadRows(at: [[Section.configuration.rawValue, ConfigurationRow.overridePresets.rawValue]], with: .none)
-    }
-}
-
-
 private extension UIAlertController {
     convenience init(pumpDataDeletionHandler handler: @escaping () -> Void) {
         self.init(

Loop/View Controllers/StatusTableViewController.swift

@@ -1300,7 +1300,7 @@ final class StatusTableViewController: ChartsTableViewController {
     // MARK: - Testing scenarios
 
     override func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) {
-        if let testingScenariosManager = deviceManager.testingScenariosManager, testingScenariosManager.scenarioURLs.isEmpty {
+        if let testingScenariosManager = deviceManager.testingScenariosManager, !testingScenariosManager.scenarioURLs.isEmpty {
             if motion == .motionShake {
                 presentScenarioSelector()
             }
@@ -1373,6 +1373,10 @@ extension StatusTableViewController: DoseProgressObserver {
 }
 
 extension StatusTableViewController: OverrideSelectionViewControllerDelegate {
+    func overrideSelectionViewController(_ vc: OverrideSelectionViewController, didUpdatePresets presets: [TemporaryScheduleOverridePreset]) {
+        deviceManager.loopManager.settings.overridePresets = presets
+    }
+
     func overrideSelectionViewController(_ vc: OverrideSelectionViewController, didConfirmOverride override: TemporaryScheduleOverride) {
         deviceManager.loopManager.settings.scheduleOverride = override
     }