Pumpmanager changes

.travis.yml

@@ -4,6 +4,7 @@ osx_image: xcode10
 # xcode_project: Loop.xcodeproj
 # xcode_scheme: Loop
 before_script:
+    - git config --global protocol.version 1
     - set -o pipefail && xcodebuild -project Loop.xcodeproj -target Cartfile
 script:
     # Build the app target

Cartfile

@@ -1,8 +1,7 @@
-
-github "LoopKit/LoopKit" == 2.2.1
-github "LoopKit/CGMBLEKit" == 3.0
+github "LoopKit/LoopKit" "dev"
+github "LoopKit/CGMBLEKit" "dev"
 github "i-schuetz/SwiftCharts" == 0.6.2
-github "LoopKit/dexcom-share-client-swift" == 1.0
-github "LoopKit/G4ShareSpy" == 1.0
-github "ps2/rileylink_ios" == 2.1.0
+github "LoopKit/dexcom-share-client-swift" "dev"
+github "LoopKit/G4ShareSpy" "dev"
+github "ps2/rileylink_ios" "dev"
 github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,7 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v3.0"
-github "LoopKit/G4ShareSpy" "v1.0"
-github "LoopKit/LoopKit" "v2.2.1"
-github "LoopKit/dexcom-share-client-swift" "v1.0"
+github "LoopKit/CGMBLEKit" "ea1267791c66e884f1013fffd36faf4555cc6eaf"
+github "LoopKit/G4ShareSpy" "fed5a389e3e47e3a1953878dd21852aa5f44b360"
+github "LoopKit/LoopKit" "bf4166bc77f89e22971f2030ad006967881ff082"
+github "LoopKit/dexcom-share-client-swift" "b0419edf55c7f389b36cb47dd5c376bbd3d03d69"
 github "i-schuetz/SwiftCharts" "0.6.2"
-github "ps2/rileylink_ios" "v2.1.0"
+github "ps2/rileylink_ios" "46ed2c845e7c4b88c721994d8e8432e86be4c699"

Common/Models/PumpManagerUI.swift

@@ -0,0 +1,37 @@
+//
+//  PumpManagerUI.swift
+//  Loop
+//
+//  Created by Pete Schwamb on 10/18/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import LoopKit
+import LoopKitUI
+import MinimedKit
+import MinimedKitUI
+
+private let managersByIdentifier: [String: PumpManagerUI.Type] = allPumpManagers.compactMap{ $0 as? PumpManagerUI.Type}.reduce(into: [:]) { (map, Type) in
+    map[Type.managerIdentifier] = Type
+}
+
+typealias PumpManagerHUDViewsRawValue = [String: Any]
+
+func PumpManagerHUDViewsFromRawValue(_ rawValue: PumpManagerHUDViewsRawValue) -> [BaseHUDView]? {
+    guard let rawState = rawValue["hudProviderViews"] as? HUDProvider.HUDViewsRawState,
+        let managerIdentifier = rawValue["managerIdentifier"] as? String,
+        let manager = managersByIdentifier[managerIdentifier]
+        else {
+            return nil
+    }
+
+    return manager.createHUDViews(rawValue: rawState)
+}
+
+func PumpManagerHUDViewsRawValueFromHudProvider(_ hudProvider: HUDProvider) -> PumpManagerHUDViewsRawValue {
+    return [
+        "managerIdentifier": hudProvider.managerIdentifier,
+        "hudProviderViews": hudProvider.hudViewsRawState
+    ]
+}

Common/Models/StatusExtensionContext.swift

@@ -10,6 +10,7 @@
 import Foundation
 import HealthKit
 import LoopKit
+import LoopKitUI
 
 
 struct NetBasalContext {
@@ -151,6 +152,32 @@ extension PredictedGlucoseContext: RawRepresentable {
     }
 }
 
+struct PumpManagerHUDViewsContext: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    let pumpManagerHUDViewsRawValue: PumpManagerHUDViewsRawValue
+
+    var hudViews: [BaseHUDView]? {
+        return PumpManagerHUDViewsFromRawValue(pumpManagerHUDViewsRawValue)
+    }
+
+    init(pumpManagerHUDViewsRawValue: PumpManagerHUDViewsRawValue) {
+        self.pumpManagerHUDViewsRawValue = pumpManagerHUDViewsRawValue
+    }
+
+    init?(rawValue: RawValue) {
+        if let pumpManagerHUDViewsRawValue = rawValue["pumpManagerHUDViewsRawValue"] as? PumpManagerHUDViewsRawValue {
+            self.pumpManagerHUDViewsRawValue = pumpManagerHUDViewsRawValue
+        } else {
+            return nil
+        }
+    }
+
+    var rawValue: RawValue {
+        return ["pumpManagerHUDViewsRawValue": pumpManagerHUDViewsRawValue]
+    }
+}
+
 struct StatusExtensionContext: RawRepresentable {
     typealias RawValue = [String: Any]
     private let version = 5
@@ -161,6 +188,7 @@ struct StatusExtensionContext: RawRepresentable {
     var batteryPercentage: Double?
     var reservoirCapacity: Double?
     var sensor: SensorDisplayableContext?
+    var pumpManagerHUDViewsContext: PumpManagerHUDViewsContext?
 
     init() { }
 
@@ -184,6 +212,10 @@ struct StatusExtensionContext: RawRepresentable {
         if let rawValue = rawValue["sensor"] as? SensorDisplayableContext.RawValue {
             sensor = SensorDisplayableContext(rawValue: rawValue)
         }
+
+        if let rawPumpManagerHUDViewsContext = rawValue["pumpManagerHUDViewsContext"] as? PumpManagerHUDViewsContext.RawValue {
+            pumpManagerHUDViewsContext = PumpManagerHUDViewsContext(rawValue: rawPumpManagerHUDViewsContext)
+        }
     }
 
     var rawValue: RawValue {
@@ -197,6 +229,8 @@ struct StatusExtensionContext: RawRepresentable {
         raw["batteryPercentage"] = batteryPercentage
         raw["reservoirCapacity"] = reservoirCapacity
         raw["sensor"] = sensor?.rawValue
+        raw["pumpManagerHUDViewsContext"] = pumpManagerHUDViewsContext?.rawValue
+
         return raw
     }
 }

Loop Status Extension/StateColorPalette.swift

@@ -6,6 +6,7 @@
 //
 
 import LoopUI
+import LoopKitUI
 
 extension StateColorPalette {
     static let loopStatus = StateColorPalette(unknown: .unknownColor, normal: .freshColor, warning: .agingColor, error: .staleColor)

Loop Status Extension/StatusViewController.swift

@@ -9,6 +9,7 @@
 import CoreData
 import HealthKit
 import LoopKit
+import LoopKitUI
 import LoopUI
 import NotificationCenter
 import UIKit
@@ -22,8 +23,6 @@ class StatusViewController: UIViewController, NCWidgetProviding {
             hudView.glucoseHUD.stateColors = .cgmStatus
             hudView.glucoseHUD.tintColor = .glucoseTintColor
             hudView.basalRateHUD.tintColor = .doseTintColor
-            hudView.reservoirVolumeHUD.stateColors = .pumpStatus
-            hudView.batteryHUD.stateColors = .pumpStatus
         }
     }
     @IBOutlet weak var subtitleLabel: UILabel!
@@ -159,7 +158,6 @@ class StatusViewController: UIViewController, NCWidgetProviding {
         let group = DispatchGroup()
 
         var activeInsulin: Double?
-        var lastReservoirValue: ReservoirValue?
         var glucose: [StoredGlucoseSample] = []
 
         group.enter()
@@ -173,17 +171,6 @@ class StatusViewController: UIViewController, NCWidgetProviding {
             group.leave()
         }
 
-        group.enter()
-        doseStore.getReservoirValues(since: .distantPast, limit: 1) { (result) in
-            switch result {
-            case .success(let values):
-                lastReservoirValue = values.first
-            case .failure:
-                lastReservoirValue = nil
-            }
-            group.leave()
-        }
-
         charts.startDate = Calendar.current.nextDate(after: Date(timeIntervalSinceNow: .minutes(-5)), matching: DateComponents(minute: 0), matchingPolicy: .strict, direction: .backward) ?? Date()
 
         // Showing the whole history plus full prediction in the glucose plot
@@ -201,13 +188,20 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 return
             }
 
-            if let batteryPercentage = context.batteryPercentage {
-                self.hudView.batteryHUD.batteryLevel = Double(batteryPercentage)
+            let hudViews: [BaseHUDView]
+
+            if let hudViewsContext = context.pumpManagerHUDViewsContext,
+                let contextHUDViews = hudViewsContext.hudViews
+            {
+                hudViews = contextHUDViews
+            } else {
+                hudViews = [ReservoirVolumeHUDView.instantiate(), BatteryLevelHUDView.instantiate()]
             }
 
-            if let reservoir = lastReservoirValue, let capacity = context.reservoirCapacity {
-                self.hudView.reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / capacity)))
-                self.hudView.reservoirVolumeHUD.setReservoirVolume(volume: reservoir.unitVolume, at: reservoir.startDate)
+            self.hudView.removePumpManagerProvidedViews()
+            for view in hudViews {
+                view.stateColors = .pumpStatus
+                self.hudView.addHUDView(view)
             }
 
             if let netBasal = context.netBasal {