Merge branch 'dev' into master

Author: ps2

Cartfile

@@ -1,7 +1,8 @@
-github "LoopKit/LoopKit" == 2.1.3
-github "LoopKit/CGMBLEKit" == 2.1.1
-github "i-schuetz/SwiftCharts" == 0.6.2
-github "mddub/dexcom-share-client-swift" == 0.4.1
-github "mddub/G4ShareSpy" == 0.3.3
-github "ps2/rileylink_ios" == 2.0.6
+
+github "LoopKit/LoopKit" "dev"
+github "LoopKit/CGMBLEKit" "dev"
+github "i-schuetz/SwiftCharts" == 0.6.1
+github "LoopKit/dexcom-share-client-swift" "carthage-recursive"
+github "LoopKit/G4ShareSpy" "fix-cartfile"
+github "ps2/rileylink_ios" "dev"
 github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,7 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v2.1.1"
-github "LoopKit/LoopKit" "v2.1.3"
-github "i-schuetz/SwiftCharts" "0.6.2"
-github "mddub/G4ShareSpy" "v0.3.3"
-github "mddub/dexcom-share-client-swift" "v0.4.1"
-github "ps2/rileylink_ios" "v2.0.6"
+github "LoopKit/CGMBLEKit" "97433c2c546b50268bbfe2e1a42cb377c6066e78"
+github "LoopKit/G4ShareSpy" "47931f1ee70f1081db6eebf3a68bb8f4146e5fca"
+github "LoopKit/LoopKit" "8c553f7bd03c2032b146e4a52d58d527a4285c15"
+github "LoopKit/dexcom-share-client-swift" "f0125aed8960586a9473dca02d17b3e5969558ac"
+github "i-schuetz/SwiftCharts" "0.6.1"
+github "ps2/rileylink_ios" "9f62a563cc7e6ea17a3f3be3a3f351aba202d624"

Common/Extensions/UIColor.swift

@@ -26,5 +26,5 @@ extension UIColor {
 
     @nonobjc static let unknownColor = UIColor(red: 198 / 255, green: 199 / 255, blue: 201 / 255, alpha: 1)
 
-    @nonobjc static let deleteColor = UIColor.HIGRedColor()
+    static let delete = UIColor.HIGRedColor()
 }

Common/Extensions/UserDefaults+CGM.swift

@@ -6,23 +6,20 @@
 //
 
 import Foundation
+import LoopKit
 
 
 extension UserDefaults {
     private enum Key: String {
-        case cgmSettings = "com.loopkit.Loop.cgmSettings"
+        case cgmManagerState = "com.loopkit.Loop.CGMManagerState"
     }
 
-    var cgm: CGM? {
+    var cgmManagerState: CGMManager.RawStateValue? {
         get {
-            if let rawValue = dictionary(forKey: Key.cgmSettings.rawValue) {
-                return CGM(rawValue: rawValue)
-            } else {
-                return nil
-            }
+            return dictionary(forKey: Key.cgmManagerState.rawValue)
         }
         set {
-            set(newValue?.rawValue, forKey: Key.cgmSettings.rawValue)
+            set(newValue, forKey: Key.cgmManagerState.rawValue)
         }
     }
 }

Common/Models/CGM.swift

@@ -8,11 +8,12 @@
 
 import Foundation
 import HealthKit
+import LoopKit
 
 final class WatchContext: NSObject, RawRepresentable {
     typealias RawValue = [String: Any]
 
-    private let version = 3
+    private let version = 4
 
     var preferredGlucoseUnit: HKUnit?
     var maxBolus: Double?
@@ -42,7 +43,7 @@ final class WatchContext: NSObject, RawRepresentable {
     var reservoirPercentage: Double?
     var batteryPercentage: Double?
 
-    var cgm: CGM?
+    var cgmManagerState: CGMManager.RawStateValue?
 
     override init() {
         super.init()
@@ -93,9 +94,7 @@ final class WatchContext: NSObject, RawRepresentable {
         COB = rawValue["cob"] as? Double
         maxBolus = rawValue["mb"] as? Double
 
-        if let cgmRawValue = rawValue["cgm"] as? CGM.RawValue {
-            cgm = CGM(rawValue: cgmRawValue)
-        }
+        cgmManagerState = rawValue["cgmManagerState"] as? CGMManager.RawStateValue
     }
 
     var rawValue: RawValue {
@@ -107,7 +106,7 @@ final class WatchContext: NSObject, RawRepresentable {
         raw["bad"] = lastNetTempBasalDate
         raw["bp"] = batteryPercentage
 
-        raw["cgm"] = cgm?.rawValue
+        raw["cgmManagerState"] = cgmManagerState
 
         raw["cob"] = COB