nate/feature/LOOP-1293/display-mock-cgm-status-progress (#134)

* displaying the cgm status progress

* defining color for glucose, trend, and progress

* display LOW and HIGH for out of range glucose measurements

* responses to PR comments

Author: nhamming

Loop/View Controllers/StatusTableViewController.swift

@@ -507,12 +507,14 @@ final class StatusTableViewController: ChartsTableViewController {
                                                             unit: unit,
                                                             staleGlucoseAge: self.deviceManager.loopManager.settings.inputDataRecencyInterval,
                                                             sensor: self.deviceManager.sensorState)
-
-                    if self.deviceManager.cgmManager != nil {
-                        hudView.cgmStatusHUD.presentStatusHighlight((self.deviceManager.cgmManager as? CGMManagerUI)?.cgmStatusHighlight)
-                    }
                 }
 
+                if self.deviceManager.cgmManager != nil {
+                    hudView.cgmStatusHUD.presentStatusHighlight((self.deviceManager.cgmManager as? CGMManagerUI)?.cgmStatusHighlight)
+                }
+
+                hudView.cgmStatusHUD.lifecycleProgress = (self.deviceManager.cgmManager as? CGMManagerUI)?.cgmLifecycleProgress
+                
                 // Pump Status HUD
                 if self.deviceManager.pumpManager != nil {
                     hudView.pumpStatusHUD.presentStatusHighlight(self.pumpStatusHighlight)

LoopUI/ViewModel/CGMStatusHUDViewModel.swift

@@ -21,7 +21,9 @@ public class CGMStatusHUDViewModel {
 
     var accessibilityString: String = ""
 
-    var tintColor: UIColor?
+    var glucoseValueTintColor: UIColor = .label
+    
+    var glucoseTrendTintColor: UIColor = .systemPurple
 
     var staleGlucoseValueHandler: (String) -> Void
 
@@ -83,8 +85,15 @@ public class CGMStatusHUDViewModel {
         let numberFormatter = NumberFormatter.glucoseFormatter(for: unit)
         if let valueString = numberFormatter.string(from: glucoseQuantity) {
             if glucoseValueCurrent {
-                glucoseValueString = valueString
                 startStalenessTimerIfNeeded()
+                switch sensor?.glucoseValueType {
+                case .some(.belowRange):
+                    glucoseValueString = LocalizedString("LOW", comment: "String displayed instead of a glucose value below the CGM range")
+                case .some(.aboveRange):
+                    glucoseValueString = LocalizedString("HIGH", comment: "String displayed instead of a glucose value above the CGM range")
+                default:
+                    glucoseValueString = valueString
+                }
             } else {
                 glucoseValueString = CGMStatusHUDViewModel.staleGlucoseRepresentation
             }
@@ -98,7 +107,8 @@ public class CGMStatusHUDViewModel {
             trend = nil
         }
 
-        tintColor = sensor?.glucoseValueType?.color
+        glucoseValueTintColor = sensor?.glucoseValueType?.glucoseColor ?? .label
+        glucoseTrendTintColor = sensor?.glucoseValueType?.trendColor ?? .systemPurple
 
         unitsString = unit.localizedShortUnitString
         accessibilityString = accessibilityStrings.joined(separator: ", ")

LoopUI/Views/CGMStatusHUDView.swift

@@ -53,22 +53,18 @@ public final class CGMStatusHUDView: DeviceStatusHUDView, NibLoadable {
     public override func tintColorDidChange() {
         super.tintColorDidChange()
 
-        glucoseValueHUD.tintColor = tintColor
-        switch tintColor {
-        case UIColor.label:
-            glucoseTrendHUD.tintColor = .systemPurple
-        default:
-            glucoseTrendHUD.tintColor = tintColor
-        }
+        glucoseValueHUD.tintColor = viewModel.glucoseValueTintColor
+        glucoseTrendHUD.tintColor = viewModel.glucoseTrendTintColor
     }
 
     public func presentAddCGMHighlight() {
+        resetProgress()
         presentStatusHighlight(withMessage: LocalizedString("Add CGM", comment: "Title text for button to set up a CGM"),
                                icon: UIImage(systemName: "plus.circle")!,
                                color: .systemBlue)
     }
 
-    override public func presentStatusHighlight() {
+    override func presentStatusHighlight() {
         guard statusStackView.arrangedSubviews.contains(glucoseValueHUD),
             statusStackView.arrangedSubviews.contains(glucoseTrendHUD) else
         {
@@ -111,8 +107,11 @@ public final class CGMStatusHUDView: DeviceStatusHUDView, NibLoadable {
 
         glucoseValueHUD.glucoseLabel.text = viewModel.glucoseValueString
         glucoseValueHUD.unitLabel.text = viewModel.unitsString
+        glucoseValueHUD.tintColor = viewModel.glucoseValueTintColor
+        
         glucoseTrendHUD.setTrend(viewModel.trend)
-        tintColor = viewModel.tintColor ?? .label
-        accessibilityValue = viewModel.accessibilityString        
+        glucoseTrendHUD.tintColor = viewModel.glucoseTrendTintColor
+        
+        accessibilityValue = viewModel.accessibilityString
     }
 }

LoopUI/Views/DeviceStatusHUDView.swift

@@ -22,6 +22,7 @@ import LoopKitUI
     @IBOutlet public weak var progressView: UIProgressView! {
         didSet {
             progressView.isHidden = true
+            progressView.tintColor = .systemPurple
         }
     }
 
@@ -34,6 +35,24 @@ import LoopKitUI
 
     @IBOutlet public weak var statusStackView: UIStackView!
 
+    public var lifecycleProgress: DeviceLifecycleProgress? {
+        didSet {
+            guard let lifecycleProgress = lifecycleProgress else {
+                resetProgress()
+                return
+            }
+             
+            progressView.isHidden = false
+            progressView.progress = Float(lifecycleProgress.percentComplete.clamped(to: 0...1))
+            progressView.tintColor = lifecycleProgress.progressState.color
+        }
+    }
+    
+    public func resetProgress() {
+        progressView.isHidden = true
+        progressView.progress = 0
+    }
+    
     func setup() {
         if statusHighlightView == nil {
             statusHighlightView = StatusHighlightHUDView(frame: self.frame)
@@ -72,4 +91,5 @@ import LoopKitUI
         statusHighlightView.isHidden = true
         statusStackView?.removeArrangedSubview(statusHighlightView)
     }
+    
 }