Nate/feature/LOOP-1420/status extension status bar (#153)

* update status extension to use the new status bar. still need to present progress and status highlights

* early commit for displaying pump status progress

* changed status bar container view to a stack view to allow for spacing adjustments in the widget

* updating widget layout and presenting status highlight and lifecycle progress

* correcting autolayout constraint warnings

* load the mock pump manager provided HUD

* correct jitter when expanding the widget

* stop the glucoe unit and delta value in the status bar from scaling

* displaying active carbs and active insulin in the widget

* removing unneeded whitespace

* correcting expansion jitter again

* always display the active carbs and insulin, even if none

* widget charts should be 135 in height

* repositioning the labels

* allow enough space on the chart to not clip the y-axis values

* responses to PR comments

* updating layout of widget

* corrected typo

Author: nhamming

Common/Models/PumpManagerUI.swift

@@ -9,6 +9,7 @@
 import Foundation
 import LoopKit
 import LoopKitUI
+import MockKitUI
 
 private let managersByIdentifier: [String: PumpManagerUI.Type] = staticPumpManagers.compactMap{ $0 as? PumpManagerUI.Type}.reduce(into: [:]) { (map, Type) in
     map[Type.managerIdentifier] = Type
@@ -19,7 +20,7 @@ typealias PumpManagerHUDViewRawValue = [String: Any]
 func PumpManagerHUDViewFromRawValue(_ rawValue: PumpManagerHUDViewRawValue, pluginManager: PluginManager) -> LevelHUDView? {
     guard
         let identifier = rawValue["managerIdentifier"] as? String,
-        let rawState = rawValue["hudProviderViews"] as? HUDProvider.HUDViewRawState,
+        let rawState = rawValue["hudProviderView"] as? HUDProvider.HUDViewRawState,
         let manager = pluginManager.getPumpManagerTypeByIdentifier(identifier) ?? staticPumpManagersByIdentifier[identifier] as? PumpManagerUI.Type else
     {
         return nil

Common/Models/StatusExtensionContext.swift

@@ -53,18 +53,54 @@ struct PredictedGlucoseContext {
     }
 }
 
-extension NetBasalContext: RawRepresentable {
-    typealias RawValue = [String: Any]
+struct DeviceStatusHighlightContext: DeviceStatusHighlight {
+    var localizedMessage: String
+    var imageSystemName: String
+    var state: DeviceStatusHighlightState
+    
+    init(localizedMessage: String,
+         imageSystemName: String,
+         state: DeviceStatusHighlightState)
+    {
+        self.localizedMessage = localizedMessage
+        self.imageSystemName = imageSystemName
+        self.state = state
+    }
+    
+    init?(from deviceStatusHighlight: DeviceStatusHighlight?) {
+        guard let deviceStatusHighlight = deviceStatusHighlight else {
+            return nil
+        }
+        
+        self.init(localizedMessage: deviceStatusHighlight.localizedMessage,
+                  imageSystemName: deviceStatusHighlight.imageSystemName,
+                  state: deviceStatusHighlight.state)
+    }
+}
 
-    var rawValue: RawValue {
-        var value: RawValue = [
-            "rate": rate,
-            "percentage": percentage,
-            "start": start
-        ]
-        value["end"] = end
-        return value
+struct DeviceLifecycleProgressContext: DeviceLifecycleProgress {
+    var percentComplete: Double
+    var progressState: DeviceLifecycleProgressState
+    
+    init(percentComplete: Double,
+         progressState: DeviceLifecycleProgressState)
+    {
+        self.percentComplete = percentComplete
+        self.progressState = progressState
+    }
+    
+    init?(from deviceLifecycleProgress: DeviceLifecycleProgress?) {
+        guard let deviceLifecycleProgress = deviceLifecycleProgress else {
+            return nil
+        }
+        
+        self.init(percentComplete: deviceLifecycleProgress.percentComplete,
+                  progressState: deviceLifecycleProgress.progressState)
     }
+}
+
+extension NetBasalContext: RawRepresentable {
+    typealias RawValue = [String: Any]
 
     init?(rawValue: RawValue) {
         guard
@@ -80,23 +116,21 @@ extension NetBasalContext: RawRepresentable {
         self.start = start
         self.end = rawValue["end"] as? Date
     }
+    
+    var rawValue: RawValue {
+        var value: RawValue = [
+            "rate": rate,
+            "percentage": percentage,
+            "start": start
+        ]
+        value["end"] = end
+        return value
+    }
 }
 
 extension SensorDisplayableContext: RawRepresentable {
     typealias RawValue = [String: Any]
 
-    var rawValue: RawValue {
-        var raw: RawValue = [
-            "isStateValid": isStateValid,
-            "stateDescription": stateDescription,
-            "isLocal": isLocal
-        ]
-        raw["trendType"] = trendType?.rawValue
-        raw["glucoseValueType"] = glucoseValueType?.rawValue
-
-        return raw
-    }
-
     init(_ other: SensorDisplayable) {
         isStateValid = other.isStateValid
         stateDescription = other.stateDescription
@@ -130,20 +164,23 @@ extension SensorDisplayableContext: RawRepresentable {
             glucoseValueType = nil
         }
     }
+    
+    var rawValue: RawValue {
+        var raw: RawValue = [
+            "isStateValid": isStateValid,
+            "stateDescription": stateDescription,
+            "isLocal": isLocal
+        ]
+        raw["trendType"] = trendType?.rawValue
+        raw["glucoseValueType"] = glucoseValueType?.rawValue
+
+        return raw
+    }
 }
 
 extension PredictedGlucoseContext: RawRepresentable {
     typealias RawValue = [String: Any]
 
-    var rawValue: RawValue {
-        return [
-            "values": values,
-            "unit": unit.unitString,
-            "startDate": startDate,
-            "interval": interval
-        ]
-    }
-
     init?(rawValue: RawValue) {
         guard
             let values = rawValue["values"] as? [Double],
@@ -159,6 +196,64 @@ extension PredictedGlucoseContext: RawRepresentable {
         self.startDate = startDate
         self.interval = interval
     }
+    
+    var rawValue: RawValue {
+        return [
+            "values": values,
+            "unit": unit.unitString,
+            "startDate": startDate,
+            "interval": interval
+        ]
+    }
+}
+
+extension DeviceStatusHighlightContext: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    init?(rawValue: RawValue) {
+        guard let localizedMessage = rawValue["localizedMessage"] as? String,
+            let imageSystemName = rawValue["imageSystemName"] as? String,
+            let rawState = rawValue["state"] as? DeviceStatusHighlightState.RawValue,
+            let state = DeviceStatusHighlightState(rawValue: rawState) else
+        {
+            return nil
+        }
+
+        self.localizedMessage = localizedMessage
+        self.imageSystemName = imageSystemName
+        self.state = state
+    }
+    
+    var rawValue: RawValue {
+        return [
+            "localizedMessage": localizedMessage,
+            "imageSystemName": imageSystemName,
+            "state": state.rawValue,
+        ]
+    }
+}
+
+extension DeviceLifecycleProgressContext: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    init?(rawValue: RawValue) {
+        guard let percentComplete = rawValue["percentComplete"] as? Double,
+            let rawProgressState = rawValue["progressState"] as? DeviceLifecycleProgressState.RawValue,
+            let progressState = DeviceLifecycleProgressState(rawValue: rawProgressState) else
+        {
+            return nil
+        }
+
+        self.percentComplete = percentComplete
+        self.progressState = progressState
+    }
+    
+    var rawValue: RawValue {
+        return [
+            "percentComplete": percentComplete,
+            "progressState": progressState.rawValue,
+        ]
+    }
 }
 
 struct PumpManagerHUDViewContext: RawRepresentable {
@@ -194,6 +289,10 @@ struct StatusExtensionContext: RawRepresentable {
     var reservoirCapacity: Double?
     var sensor: SensorDisplayableContext?
     var pumpManagerHUDViewContext: PumpManagerHUDViewContext?
+    var pumpStatusHighlightContext: DeviceStatusHighlightContext?
+    var pumpLifecycleProgressContext: DeviceLifecycleProgressContext?
+    var cgmStatusHighlightContext: DeviceStatusHighlightContext?
+    var cgmLifecycleProgressContext: DeviceLifecycleProgressContext?
 
     init() { }
 
@@ -221,6 +320,22 @@ struct StatusExtensionContext: RawRepresentable {
         if let rawPumpManagerHUDViewContext = rawValue["pumpManagerHUDViewContext"] as? PumpManagerHUDViewContext.RawValue {
             pumpManagerHUDViewContext = PumpManagerHUDViewContext(rawValue: rawPumpManagerHUDViewContext)
         }
+        
+        if let rawPumpStatusHighlightContext = rawValue["pumpStatusHighlightContext"] as? DeviceStatusHighlightContext.RawValue {
+            pumpStatusHighlightContext = DeviceStatusHighlightContext(rawValue: rawPumpStatusHighlightContext)
+        }
+        
+        if let rawPumpLifecycleProgressContext = rawValue["pumpLifecycleProgressContext"] as? DeviceLifecycleProgressContext.RawValue {
+            pumpLifecycleProgressContext = DeviceLifecycleProgressContext(rawValue: rawPumpLifecycleProgressContext)
+        }
+        
+        if let rawCGMStatusHighlightContext = rawValue["cgmStatusHighlightContext"] as? DeviceStatusHighlightContext.RawValue {
+            cgmStatusHighlightContext = DeviceStatusHighlightContext(rawValue: rawCGMStatusHighlightContext)
+        }
+        
+        if let rawCGMLifecycleProgressContext = rawValue["cgmLifecycleProgressContext"] as? DeviceLifecycleProgressContext.RawValue {
+            cgmLifecycleProgressContext = DeviceLifecycleProgressContext(rawValue: rawCGMLifecycleProgressContext)
+        }
     }
 
     var rawValue: RawValue {
@@ -235,6 +350,10 @@ struct StatusExtensionContext: RawRepresentable {
         raw["reservoirCapacity"] = reservoirCapacity
         raw["sensor"] = sensor?.rawValue
         raw["pumpManagerHUDViewContext"] = pumpManagerHUDViewContext?.rawValue
+        raw["pumpStatusHighlightContext"] = pumpStatusHighlightContext?.rawValue
+        raw["pumpLifecycleProgressContext"] = pumpLifecycleProgressContext?.rawValue
+        raw["cgmStatusHighlightContext"] = cgmStatusHighlightContext?.rawValue
+        raw["cgmLifecycleProgressContext"] = cgmLifecycleProgressContext?.rawValue
 
         return raw
     }