[LOOP-3554] manual glucose display in cgm pill (#403)

* display manual glucose in CGM pill when current

* corrected typo

Author: nhamming

LoopTests/ViewModels/CGMStatusHUDViewModelTests.swift

@@ -179,17 +179,135 @@ class CGMStatusHUDViewModelTests: XCTestCase {
 
         // ensure status highlight icon is set to the manual glucose override icon
         // when there is a manual glucose override icon, the status highlight isn't returned to be presented
-        viewModel.setManualGlucoseTrendIconOverride()
+        let glucoseDisplay = TestGlucoseDisplay(isStateValid: true,
+                                                trendType: .down,
+                                                isLocal: true,
+                                                glucoseRangeCategory: .urgentLow)
+        let glucoseStartDate = Date()
+        let staleGlucoseAge: TimeInterval = .minutes(15)
+        viewModel.setGlucoseQuantity(90,
+                                     at: glucoseStartDate,
+                                     unit: .milligramsPerDeciliter,
+                                     staleGlucoseAge: staleGlucoseAge,
+                                     glucoseDisplay: glucoseDisplay,
+                                     wasUserEntered: true,
+                                     isDisplayOnly: false)
+
+        XCTAssertEqual(viewModel.glucoseValueString, "90")
+        XCTAssertNil(viewModel.trend)
         XCTAssertNil(viewModel.statusHighlight)
         XCTAssertEqual(viewModel.manualGlucoseTrendIconOverride, statusHighlight1.image)
         XCTAssertEqual(viewModel.glucoseTrendTintColor, statusHighlight1.state.color)
 
         // ensure updating the status highlight icon also updates the manual glucose override icon
         viewModel.statusHighlight = statusHighlight2
         XCTAssertNil(viewModel.statusHighlight)
+        XCTAssertEqual(viewModel.glucoseValueString, "90")
+        XCTAssertNil(viewModel.trend)
         XCTAssertEqual(viewModel.manualGlucoseTrendIconOverride, statusHighlight2.image)
         XCTAssertEqual(viewModel.glucoseTrendTintColor, statusHighlight2.state.color)
     }
+
+    func testManualGlucoseOverridesStatusHighlight() {
+        // add manual glucose
+        let glucoseDisplay = TestGlucoseDisplay(isStateValid: true,
+                                                trendType: .down,
+                                                isLocal: true,
+                                                glucoseRangeCategory: .urgentLow)
+        let staleGlucoseAge: TimeInterval = .minutes(15)
+        viewModel.setGlucoseQuantity(90,
+                                     at: Date(),
+                                     unit: .milligramsPerDeciliter,
+                                     staleGlucoseAge: staleGlucoseAge,
+                                     glucoseDisplay: glucoseDisplay,
+                                     wasUserEntered: true,
+                                     isDisplayOnly: false)
+
+        // check that manual glucose is displayed
+        XCTAssertEqual(viewModel.glucoseValueString, "90")
+        XCTAssertNil(viewModel.trend)
+        XCTAssertNil(viewModel.statusHighlight)
+        XCTAssertNil(viewModel.manualGlucoseTrendIconOverride)
+        XCTAssertEqual(viewModel.glucoseTrendTintColor, .glucoseTintColor)
+
+        // add status highlight
+        let statusHighlight1 = TestStatusHighlight(localizedMessage: "Test 1",
+                                                   imageName: "plus.circle",
+                                                   state: .normalCGM)
+        viewModel.statusHighlight = statusHighlight1
+
+        // check that manual glucose is still displayed (this time with status highlight icon)
+        XCTAssertEqual(viewModel.glucoseValueString, "90")
+        XCTAssertNil(viewModel.trend)
+        XCTAssertNil(viewModel.statusHighlight)
+        XCTAssertEqual(viewModel.manualGlucoseTrendIconOverride, statusHighlight1.image)
+        XCTAssertEqual(viewModel.glucoseTrendTintColor, statusHighlight1.state.color)
+
+        // add CGM glucose
+        viewModel.setGlucoseQuantity(95,
+                                     at: Date(),
+                                     unit: .milligramsPerDeciliter,
+                                     staleGlucoseAge: staleGlucoseAge,
+                                     glucoseDisplay: glucoseDisplay,
+                                     wasUserEntered: false,
+                                     isDisplayOnly: false)
+
+        // check that status highlight is displayed
+        XCTAssertEqual(viewModel.glucoseValueString, "95")
+        XCTAssertEqual(viewModel.trend, .down)
+        XCTAssertEqual(viewModel.statusHighlight as! TestStatusHighlight, statusHighlight1)
+        XCTAssertNil(viewModel.manualGlucoseTrendIconOverride)
+
+        // remove status highlight
+        viewModel.statusHighlight = nil
+
+        // check that CGM glucose is displayed
+        XCTAssertEqual(viewModel.glucoseValueString, "95")
+        XCTAssertEqual(viewModel.trend, .down)
+        XCTAssertNil(viewModel.statusHighlight)
+        XCTAssertNil(viewModel.manualGlucoseTrendIconOverride)
+
+        // add status highlight
+        let statusHighlight2 = TestStatusHighlight(localizedMessage: "Test 2",
+                                                   imageName: "exclamationmark.circle",
+                                                   state: .critical)
+        viewModel.statusHighlight = statusHighlight2
+
+        // check that status highlight is displayed
+        XCTAssertEqual(viewModel.glucoseValueString, "95")
+        XCTAssertEqual(viewModel.trend, .down)
+        XCTAssertEqual(viewModel.statusHighlight as! TestStatusHighlight, statusHighlight2)
+        XCTAssertNil(viewModel.manualGlucoseTrendIconOverride)
+
+        // add manual glucose
+        viewModel.setGlucoseQuantity(100,
+                                     at: Date(),
+                                     unit: .milligramsPerDeciliter,
+                                     staleGlucoseAge: staleGlucoseAge,
+                                     glucoseDisplay: glucoseDisplay,
+                                     wasUserEntered: true,
+                                     isDisplayOnly: false)
+
+        // check that manual glucose is still displayed (again with status highlight icon)
+        XCTAssertEqual(viewModel.glucoseValueString, "100")
+        XCTAssertNil(viewModel.trend)
+        XCTAssertNil(viewModel.statusHighlight)
+        XCTAssertEqual(viewModel.manualGlucoseTrendIconOverride, statusHighlight2.image)
+        XCTAssertEqual(viewModel.glucoseTrendTintColor, statusHighlight2.state.color)
+
+        // add stale manual glucose
+        viewModel.setGlucoseQuantity(100,
+                                     at: Date(),
+                                     unit: .milligramsPerDeciliter,
+                                     staleGlucoseAge: .minutes(-1),
+                                     glucoseDisplay: glucoseDisplay,
+                                     wasUserEntered: true,
+                                     isDisplayOnly: false)
+
+        // check that the status highlight is displayed
+        XCTAssertEqual(viewModel.statusHighlight as! TestStatusHighlight, statusHighlight2)
+        XCTAssertNil(viewModel.manualGlucoseTrendIconOverride)
+    }
 }
 
 extension CGMStatusHUDViewModelTests {

LoopUI/ViewModel/CGMStatusHUDViewModel.swift

@@ -31,23 +31,34 @@ public class CGMStatusHUDViewModel {
         }
         return manualGlucoseTrendIconOverride
     }
-    
+
+    private var glucoseValueCurrent: Bool {
+        guard let isStaleAt = isStaleAt else { return true }
+        return Date() < isStaleAt
+    }
+
+    private var isManualGlucose: Bool = false
+
+    private var isManualGlucoseCurrent: Bool {
+        return isManualGlucose && glucoseValueCurrent
+    }
+
     var manualGlucoseTrendIconOverride: UIImage?
 
     private var storedStatusHighlight: DeviceStatusHighlight?
 
     var statusHighlight: DeviceStatusHighlight? {
         get {
-            guard manualGlucoseTrendIconOverride == nil else {
-                // if there is an icon override for a manual glucose, don't provide the stored status highlight
+            guard !isManualGlucoseCurrent else {
+                // if there is a current manual glucose, don't provide the stored status highlight
                 return nil
             }
             return storedStatusHighlight
         }
         set {
             storedStatusHighlight = newValue
-            if manualGlucoseTrendIconOverride != nil {
-                // If there is an icon override for a manual glucose, it displays the current status highlight icon
+            if isManualGlucoseCurrent {
+                // If there is a current manual glucose, it displays the current status highlight icon
                 setManualGlucoseTrendIconOverride()
             }
         }
@@ -76,7 +87,7 @@ public class CGMStatusHUDViewModel {
             }
         }
     }
-    
+
     private func startStalenessTimerIfNeeded() {
         if let fireDate = isStaleAt,
             isVisible,
@@ -115,8 +126,7 @@ public class CGMStatusHUDViewModel {
         let time = timeFormatter.string(from: glucoseStartDate)
 
         isStaleAt = glucoseStartDate.addingTimeInterval(staleGlucoseAge)
-        let glucoseValueCurrent = Date() < isStaleAt!
-        
+
         glucoseValueTintColor = glucoseDisplay?.glucoseRangeCategory?.glucoseColor ?? .label
 
         let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)
@@ -138,8 +148,8 @@ public class CGMStatusHUDViewModel {
         }
 
         // Only a user-entered glucose value that is *not* display-only (i.e. a calibration) is considered a manual glucose entry.
-        let isManualGlucose = wasUserEntered && !isDisplayOnly
-        if isManualGlucose, glucoseValueCurrent {
+        isManualGlucose = wasUserEntered && !isDisplayOnly
+        if isManualGlucoseCurrent {
             // a manual glucose value presents any status highlight icon instead of a trend icon
             setManualGlucoseTrendIconOverride()
         } else if let trend = glucoseDisplay?.trendType, glucoseValueCurrent {