[LOOP-3571] when .entirelyBelowRange display no bolus recommendation warning (#425)

Author: nhamming

Loop/Managers/DoseMath.swift

@@ -14,7 +14,7 @@ import LoopKit
 private enum InsulinCorrection {
     case inRange
     case aboveRange(min: GlucoseValue, correcting: GlucoseValue, minTarget: HKQuantity, units: Double)
-    case entirelyBelowRange(correcting: GlucoseValue, minTarget: HKQuantity, units: Double)
+    case entirelyBelowRange(min: GlucoseValue, minTarget: HKQuantity, units: Double)
     case suspend(min: GlucoseValue)
 }
 
@@ -25,7 +25,7 @@ extension InsulinCorrection {
         switch self {
         case .aboveRange(min: _, correcting: _, minTarget: _, units: let units):
             return units
-        case .entirelyBelowRange(correcting: _, minTarget: _, units: let units):
+        case .entirelyBelowRange(min: _, minTarget: _, units: let units):
             return units
         case .inRange, .suspend:
             return 0
@@ -70,8 +70,8 @@ extension InsulinCorrection {
             return .glucoseBelowSuspendThreshold(minGlucose: minimum)
         case .inRange:
             return .predictedGlucoseInRange
-        case .entirelyBelowRange:
-            return nil
+        case .entirelyBelowRange(min: let min, minTarget: _, units: _):
+            return .allGlucoseBelowTarget(minGlucose: min)
         case .aboveRange(min: let min, correcting: _, minTarget: let target, units: let units):
             if units > 0 && min.quantity < target {
                 return .predictedGlucoseBelowTarget(minGlucose: min)
@@ -303,7 +303,7 @@ extension Collection where Element: GlucoseValue {
             }
 
             return .entirelyBelowRange(
-                correcting: min,
+                min: min,
                 minTarget: minGlucoseTargets.lowerBound,
                 units: units
             )

Loop/Models/BolusRecommendation.swift

@@ -22,7 +22,7 @@ extension BolusRecommendationNotice {
             let glucoseFormatter = NumberFormatter.glucoseFormatter(for: unit)
             let bgStr = glucoseFormatter.string(from: glucose.quantity, unit: unit)!
             return String(format: NSLocalizedString("Current glucose of %1$@ is below correction range.", comment: "Message when offering bolus recommendation even though bg is below range. (1: glucose value)"), bgStr)
-        case .predictedGlucoseBelowTarget(minGlucose: let minGlucose):
+        case .predictedGlucoseBelowTarget(minGlucose: let minGlucose), .allGlucoseBelowTarget(minGlucose: let minGlucose):
             let timeFormatter = DateFormatter()
             timeFormatter.dateStyle = .none
             timeFormatter.timeStyle = .short

Loop/View Models/BolusEntryViewModel.swift

@@ -17,7 +17,7 @@ import LoopKitUI
 import LoopUI
 import SwiftUI
 
-protocol BolusEntryViewModelDelegate: class {
+protocol BolusEntryViewModelDelegate: AnyObject {
 
     func withLoopState(do block: @escaping (LoopState) -> Void)
 
@@ -64,6 +64,7 @@ final class BolusEntryViewModel: ObservableObject {
     enum Notice: Equatable {
         case predictedGlucoseInRange
         case predictedGlucoseBelowSuspendThreshold(suspendThreshold: HKQuantity)
+        case glucoseBelowTarget
         case staleGlucoseData
         case stalePumpData
     }
@@ -634,6 +635,8 @@ final class BolusEntryViewModel: ObservableObject {
                     }
                 case .predictedGlucoseInRange:
                     notice = .predictedGlucoseInRange
+                case .allGlucoseBelowTarget(minGlucose: _):
+                    notice = .glucoseBelowTarget
                 default:
                     notice = nil
                 }

Loop/Views/BolusEntryView.swift

@@ -349,7 +349,7 @@ struct BolusEntryView: View {
                 caption: Text(String(format: NSLocalizedString("Your pump data is stale. %1$@ cannot recommend a bolus amount.", comment: "Caption for bolus screen notice when pump data is missing or stale"), appName)),
                 severity: .critical
             )
-        case .predictedGlucoseInRange:
+        case .predictedGlucoseInRange, .glucoseBelowTarget:
             return WarningView(
                 title: Text("No Bolus Recommended", comment: "Title for bolus screen notice when no bolus is recommended"),
                 caption: Text("Based on your predicted glucose, no bolus is recommended.", comment: "Caption for bolus screen notice when no bolus is recommended for the predicted glucose")