Merge pull request #8 from LoopKit/tidepool-sync

Tidepool Sync

Author: ps2

MinimedKit/PumpManager/MinimedPumpManager.swift

@@ -17,22 +17,18 @@ public protocol MinimedPumpManagerStateObserver: AnyObject {
 
 public class MinimedPumpManager: RileyLinkPumpManager {
 
-    public static let managerIdentifier = "Minimed500"
+    public static let pluginIdentifier = "Minimed500"
 
     // Primarily used for testing
     public let dateGenerator: () -> Date
-    
-    public var managerIdentifier: String {
-        return MinimedPumpManager.managerIdentifier
-    }
-    
+        
     public init(state: MinimedPumpManagerState, rileyLinkDeviceProvider: RileyLinkDeviceProvider, pumpOps: PumpOps? = nil, dateGenerator: @escaping () -> Date = Date.init) {
         self.lockedState = Locked(state)
 
         self.dateGenerator = dateGenerator
 
         self.hkDevice = HKDevice(
-            name: MinimedPumpManager.managerIdentifier,
+            name: MinimedPumpManager.pluginIdentifier,
             manufacturer: "Medtronic",
             model: state.pumpModel.rawValue,
             hardwareVersion: nil,
@@ -265,7 +261,7 @@ public class MinimedPumpManager: RileyLinkPumpManager {
                 state.lastRileyLinkBatteryAlertDate = dateGenerator()
             }
             self.pumpDelegate.notify { delegate in
-                let identifier = Alert.Identifier(managerIdentifier: self.managerIdentifier, alertIdentifier: "lowRLBattery")
+                let identifier = Alert.Identifier(managerIdentifier: self.pluginIdentifier, alertIdentifier: "lowRLBattery")
                 let alertBody = String(format: LocalizedString("\"%1$@\" has a low battery", comment: "Format string for low battery alert body for RileyLink. (1: device name)"), device.name ?? "unnamed")
                 let content = Alert.Content(title: LocalizedString("Low RileyLink Battery", comment: "Title for RileyLink low battery alert"), body: alertBody, acknowledgeActionButtonLabel: LocalizedString("OK", comment: "Acknowledge button label for RileyLink low battery alert"))
                 delegate?.issueAlert(Alert(identifier: identifier, foregroundContent: content, backgroundContent: content, trigger: .immediate))
@@ -493,7 +489,7 @@ extension MinimedPumpManager {
     }
 
     private static var pumpBatteryLowAlertIdentifier: Alert.Identifier {
-        return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpBatteryLow")
+        return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpBatteryLow")
     }
 
     private var pumpBatteryLowAlert: Alert {
@@ -558,7 +554,7 @@ extension MinimedPumpManager {
     }
 
     private static var pumpReservoirEmptyAlertIdentifier: Alert.Identifier {
-        return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpReservoirEmpty")
+        return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpReservoirEmpty")
     }
 
     private var pumpReservoirEmptyAlert: Alert {
@@ -569,7 +565,7 @@ extension MinimedPumpManager {
     }
 
     private static var pumpReservoirLowAlertIdentifier: Alert.Identifier {
-        return Alert.Identifier(managerIdentifier: managerIdentifier, alertIdentifier: "PumpReservoirLow")
+        return Alert.Identifier(managerIdentifier: pluginIdentifier, alertIdentifier: "PumpReservoirLow")
     }
 
     private func pumpReservoirLowAlertForAmount(_ units: Double, andTimeRemaining remaining: TimeInterval?) -> Alert {

MinimedKitUI/MinimedHUDProvider.swift

@@ -15,7 +15,7 @@ import SwiftUI
 class MinimedHUDProvider: HUDProvider {
 
     var managerIdentifier: String {
-        return MinimedPumpManager.managerIdentifier
+        return MinimedPumpManager.pluginIdentifier
     }
 
     private var state: MinimedPumpManagerState {