model and view

Author: ivalkou

Loop/Managers/LoopDataManager.swift

@@ -1078,6 +1078,8 @@ extension LoopDataManager {
             return
         }
 
+        let overrideLowerBound = settings.scheduleOverride?.settings.targetRange?.lowerBound //HKQuantity
+
         guard let bolusState = delegate?.bolusState, case .none = bolusState else {
             logger.debug("Already bolusing. Cancel microbolus calculation.")
             completion(false, nil)

Loop/View Controllers/SettingsTableViewController.swift

@@ -593,16 +593,13 @@ final class SettingsTableViewController: UITableViewController {
                 show(vc, sender: sender)
             case .microbolus:
                 var settings = dataManager.loopManager.settings
-                guard settings.dosingEnabled else { break }
+                guard settings.dosingEnabled,
+                    let unit = dataManager.loopManager.glucoseStore.preferredUnit
+                else { break }
 
                 let viewModel = MicrobolusView.ViewModel(
-                    microbolusesWithCOB: settings.microbolusSettings.enabled,
-                    withCOBValue: settings.microbolusSettings.size,
-                    microbolusesWithoutCOB: settings.microbolusSettings.enabledWithoutCarbs,
-                    withoutCOBValue: settings.microbolusSettings.sizeWithoutCarbs,
-                    safeMode: settings.microbolusSettings.safeMode,
-                    microbolusesMinimumBolusSize: settings.microbolusSettings.minimumBolusSize,
-                    openBolusScreen: settings.microbolusSettings.shouldOpenBolusScreen
+                    settings: settings.microbolusSettings,
+                    glucoseUnit: unit
                 )
 
                 microbolusCancellable = viewModel.changes()

Loop/Views/MicrobolusView.swift

@@ -9,6 +9,8 @@
 import SwiftUI
 import Combine
 import LoopCore
+import LoopKit
+import HealthKit
 
 struct MicrobolusView: View {
     final class ViewModel: ObservableObject {
@@ -19,6 +21,8 @@ struct MicrobolusView: View {
         @Published var safeMode: Microbolus.SafeMode
         @Published var microbolusesMinimumBolusSize: Double
         @Published var openBolusScreen: Bool
+        @Published var disableByOverride: Bool
+        @Published var lowerBound: Double
 
         @Published fileprivate var pickerWithCOBIndex: Int
         @Published fileprivate var pickerWithoutCOBIndex: Int
@@ -29,19 +33,25 @@ struct MicrobolusView: View {
         fileprivate let minimumBolusSizeValues = stride(from: 0.0, to: 0.51, by: 0.05).map { $0 }
 
         private var cancellable: AnyCancellable!
+        fileprivate let formatter = QuantityFormatter()
+        fileprivate let unit: HKUnit
 
-        init(microbolusesWithCOB: Bool, withCOBValue: Double, microbolusesWithoutCOB: Bool, withoutCOBValue: Double, safeMode: Microbolus.SafeMode, microbolusesMinimumBolusSize: Double, openBolusScreen: Bool) {
-            self.microbolusesWithCOB = microbolusesWithCOB
-            self.withCOBValue = withCOBValue
-            self.microbolusesWithoutCOB = microbolusesWithoutCOB
-            self.withoutCOBValue = withoutCOBValue
-            self.safeMode = safeMode
-            self.microbolusesMinimumBolusSize = microbolusesMinimumBolusSize
-            self.openBolusScreen = openBolusScreen
+        init(settings: Microbolus.Settings, glucoseUnit: HKUnit) {
+            self.microbolusesWithCOB = settings.enabled
+            self.withCOBValue = settings.size
+            self.microbolusesWithoutCOB = settings.enabledWithoutCarbs
+            self.withoutCOBValue = settings.sizeWithoutCarbs
+            self.safeMode = settings.safeMode
+            self.microbolusesMinimumBolusSize = settings.minimumBolusSize
+            self.openBolusScreen = settings.shouldOpenBolusScreen
+            self.disableByOverride = settings.disableByOverride
+            self.lowerBound = settings.overrideLowerBound
+            self.unit = glucoseUnit
+            formatter.setPreferredNumberFormatter(for: glucoseUnit)
 
-            pickerWithCOBIndex = values.firstIndex(of: Int(withCOBValue)) ?? 0
-            pickerWithoutCOBIndex = values.firstIndex(of: Int(withoutCOBValue)) ?? 0
-            pickerMinimumBolusSizeIndex = minimumBolusSizeValues.firstIndex(of: Double(microbolusesMinimumBolusSize)) ?? 0
+            pickerWithCOBIndex = values.firstIndex(of: Int(settings.size)) ?? 0
+            pickerWithoutCOBIndex = values.firstIndex(of: Int(settings.sizeWithoutCarbs)) ?? 0
+            pickerMinimumBolusSizeIndex = minimumBolusSizeValues.firstIndex(of: Double(settings.minimumBolusSize)) ?? 0
 
             let withCOBCancellable = $pickerWithCOBIndex
                 .map { Double(self.values[$0]) }
@@ -63,33 +73,40 @@ struct MicrobolusView: View {
         }
 
         func changes() -> AnyPublisher<Microbolus.Settings, Never> {
-            Publishers.CombineLatest4(
+            Publishers.CombineLatest3(
                 Publishers.CombineLatest4(
                     $microbolusesWithCOB,
                     $withCOBValue,
                     $microbolusesWithoutCOB,
                     $withoutCOBValue
                 ),
-                $safeMode,
-                $microbolusesMinimumBolusSize,
-                $openBolusScreen
+                Publishers.CombineLatest4(
+                    $safeMode,
+                    $microbolusesMinimumBolusSize,
+                    $openBolusScreen,
+                    $disableByOverride
+                ),
+                $lowerBound
             )
                 .map {
                     Microbolus.Settings(
                         enabled: $0.0.0,
                         size: $0.0.1,
                         enabledWithoutCarbs: $0.0.2,
                         sizeWithoutCarb: $0.0.3,
-                        safeMode: $0.1,
-                        minimumBolusSize: $0.2,
-                        shouldOpenBolusScreen: $0.3
+                        safeMode: $0.1.0,
+                        minimumBolusSize: $0.1.1,
+                        shouldOpenBolusScreen: $0.1.2,
+                        disableByOverride: $0.1.3,
+                        overrideLowerBound: $0.2
                     )
                 }
                 .eraseToAnyPublisher()
         }
     }
 
     @ObservedObject var viewModel: ViewModel
+    @ObservedObject private var keyboard = KeyboardResponder()
 
     init(viewModel: ViewModel) {
         self.viewModel = viewModel
@@ -152,6 +169,28 @@ struct MicrobolusView: View {
                 Toggle (isOn: $viewModel.openBolusScreen) {
                     Text("Open Bolus screen after Carbs")
                 }
+
+                Toggle (isOn: $viewModel.disableByOverride) {
+                    Text("Disable microboluses by override ")
+                }
+
+                if viewModel.disableByOverride {
+                    Text("Blablabla")
+                    .font(.caption)
+                    
+                    HStack {
+                        Text("Lower bound")
+
+                        TextField("0", value: $viewModel.lowerBound, formatter: viewModel.formatter.numberFormatter, onEditingChanged: { changed in
+
+                        }) { self.dismissKeyboard() }
+                        .keyboardType(.numberPad)
+                        .multilineTextAlignment(.trailing)
+
+                        Text(viewModel.unit.localizedShortUnitString)
+                    }
+                }
+
                 Picker(selection: $viewModel.pickerMinimumBolusSizeIndex, label: Text("Minimum Bolus Size")) {
                     ForEach(0 ..< viewModel.minimumBolusSizeValues.count) { index in Text(String(format: "%.2f U", self.viewModel.minimumBolusSizeValues[index])).tag(index)
                     }
@@ -160,6 +199,11 @@ struct MicrobolusView: View {
 
         }
         .navigationBarTitle("Microboluses")
+        .padding(.bottom, keyboard.currentHeight)
+        .animation(.easeOut(duration: 0.16))
+        .onTapGesture {
+            self.dismissKeyboard()
+        }
     }
 }
 
@@ -179,16 +223,50 @@ private extension Microbolus.SafeMode {
 struct MicrobolusView_Previews: PreviewProvider {
     static var previews: some View {
         MicrobolusView(viewModel: .init(
-            microbolusesWithCOB: true,
-            withCOBValue: 30,
-            microbolusesWithoutCOB: false,
-            withoutCOBValue: 30,
-            safeMode: .enabled,
-            microbolusesMinimumBolusSize: 0.0,
-            openBolusScreen: false
+            settings: Microbolus.Settings(),
+            glucoseUnit: HKUnit(from: "mmol/L")
             )
         )
             .environment(\.colorScheme, .dark)
             .previewLayout(.sizeThatFits)
     }
 }
+
+// MARK: - Helpers
+
+extension UIApplication {
+    func endEditing() {
+        sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+    }
+}
+
+extension View {
+    func dismissKeyboard() {
+        UIApplication.shared.endEditing()
+    }
+}
+
+final class KeyboardResponder: ObservableObject {
+    private var notificationCenter: NotificationCenter
+    @Published private(set) var currentHeight: CGFloat = 0
+
+    init(center: NotificationCenter = .default) {
+        notificationCenter = center
+        notificationCenter.addObserver(self, selector: #selector(keyBoardWillShow(notification:)), name: UIResponder.keyboardWillShowNotification, object: nil)
+        notificationCenter.addObserver(self, selector: #selector(keyBoardWillHide(notification:)), name: UIResponder.keyboardWillHideNotification, object: nil)
+    }
+
+    deinit {
+        notificationCenter.removeObserver(self)
+    }
+
+    @objc func keyBoardWillShow(notification: Notification) {
+        if let keyboardSize = (notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue {
+            currentHeight = keyboardSize.height
+        }
+    }
+
+    @objc func keyBoardWillHide(notification: Notification) {
+        currentHeight = 0
+    }
+}

LoopCore/Microbolus.swift

@@ -29,6 +29,8 @@ public enum Microbolus {
         public var safeMode: SafeMode
         public var minimumBolusSize: Double
         public var shouldOpenBolusScreen: Bool
+        public var disableByOverride: Bool
+        public var overrideLowerBound: Double
 
         public init(
             enabled: Bool = false,
@@ -37,7 +39,9 @@ public enum Microbolus {
             sizeWithoutCarb: Double = 30,
             safeMode: SafeMode = .enabled,
             minimumBolusSize: Double = 0,
-            shouldOpenBolusScreen: Bool = false
+            shouldOpenBolusScreen: Bool = false,
+            disableByOverride: Bool = false,
+            overrideLowerBound: Double = 0
         ) {
             self.enabled = enabled
             self.size = size
@@ -46,6 +50,8 @@ public enum Microbolus {
             self.safeMode = safeMode
             self.minimumBolusSize = minimumBolusSize
             self.shouldOpenBolusScreen = shouldOpenBolusScreen
+            self.disableByOverride = disableByOverride
+            self.overrideLowerBound = overrideLowerBound
         }
 
         public init?(rawValue: [String : Any]) {
@@ -79,6 +85,14 @@ public enum Microbolus {
             if let shouldOpenBolusScreen = rawValue["shouldOpenBolusScreen"] as? Bool {
                 self.shouldOpenBolusScreen = shouldOpenBolusScreen
             }
+
+            if let disableByOverride = rawValue["disableByOverride"] as? Bool {
+                self.disableByOverride = disableByOverride
+            }
+
+            if let overrideLowerBound = rawValue["overrideLowerBound"] as? Double {
+                self.overrideLowerBound = overrideLowerBound
+            }
         }
 
         public var rawValue: [String : Any] {
@@ -89,7 +103,9 @@ public enum Microbolus {
                 "sizeWithoutCarbs": sizeWithoutCarbs,
                 "safeMode": safeMode.rawValue,
                 "minimumBolusSize": minimumBolusSize,
-                "shouldOpenBolusScreen": shouldOpenBolusScreen
+                "shouldOpenBolusScreen": shouldOpenBolusScreen,
+                "disableByOverride": disableByOverride,
+                "overrideLowerBound": overrideLowerBound
             ]
         }
     }