Dev watch hybrid2

Cartfile

@@ -1,7 +1,8 @@
-github "LoopKit/LoopKit" == 2.1.3
-github "LoopKit/CGMBLEKit" == 2.1.1
+
+github "LoopKit/LoopKit" "dev"
+github "LoopKit/CGMBLEKit" "dev"
 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/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" "v2.1.1"
-github "LoopKit/LoopKit" "v2.1.3"
+github "LoopKit/CGMBLEKit" "f868f1366c8a464763fb86ca077e768282a9b197"
+github "LoopKit/G4ShareSpy" "3c7040cc93f28b778b6d265e3224974b4ea31483"
+github "LoopKit/LoopKit" "1dc7b3ec4b7c6bb9225545f5d8fe599bfe783a5c"
+github "LoopKit/dexcom-share-client-swift" "13e0f5cfd98dd4bfdf5eff413ba3ed36617cbb08"
 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 "ps2/rileylink_ios" "f3597c78ae00da2f35ef98269056126af4ce070f"

Common/Base.lproj/Intents.intentdefinition

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>INEnums</key>
+	<array/>
+	<key>INIntentDefinitionModelVersion</key>
+	<string>1.0</string>
+	<key>INIntentDefinitionSystemVersion</key>
+	<string>17G65</string>
+	<key>INIntentDefinitionToolsBuildVersion</key>
+	<string>10L232m</string>
+	<key>INIntentDefinitionToolsVersion</key>
+	<string>10.0</string>
+	<key>INIntents</key>
+	<array>
+		<dict>
+			<key>INIntentCategory</key>
+			<string>create</string>
+			<key>INIntentDescriptionID</key>
+			<string>yc02Yq</string>
+			<key>INIntentLastParameterTag</key>
+			<integer>0</integer>
+			<key>INIntentName</key>
+			<string>NewCarbEntry</string>
+			<key>INIntentParameterCombinations</key>
+			<dict>
+				<key></key>
+				<dict>
+					<key>INIntentParameterCombinationIsPrimary</key>
+					<true/>
+					<key>INIntentParameterCombinationSubtitle</key>
+					<string></string>
+					<key>INIntentParameterCombinationSubtitleID</key>
+					<string>bOiZXO</string>
+					<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
+					<false/>
+					<key>INIntentParameterCombinationTitle</key>
+					<string>Add Carb Entry</string>
+					<key>INIntentParameterCombinationTitleID</key>
+					<string>OcNxIj</string>
+				</dict>
+			</dict>
+			<key>INIntentParameters</key>
+			<array/>
+			<key>INIntentResponse</key>
+			<dict>
+				<key>INIntentResponseCodes</key>
+				<array>
+					<dict>
+						<key>INIntentResponseCodeFormatString</key>
+						<string></string>
+						<key>INIntentResponseCodeFormatStringID</key>
+						<string>SP7STY</string>
+						<key>INIntentResponseCodeName</key>
+						<string>failure</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<false/>
+					</dict>
+					<dict>
+						<key>INIntentResponseCodeFormatString</key>
+						<string></string>
+						<key>INIntentResponseCodeFormatStringID</key>
+						<string>I1DB3p</string>
+						<key>INIntentResponseCodeName</key>
+						<string>success</string>
+						<key>INIntentResponseCodeSuccess</key>
+						<true/>
+					</dict>
+				</array>
+				<key>INIntentResponseLastParameterTag</key>
+				<integer>0</integer>
+				<key>INIntentResponseParameters</key>
+				<array/>
+			</dict>
+			<key>INIntentRestrictions</key>
+			<integer>0</integer>
+			<key>INIntentTitle</key>
+			<string>Add Carb Entry</string>
+			<key>INIntentTitleID</key>
+			<string>80eo5o</string>
+			<key>INIntentType</key>
+			<string>Custom</string>
+			<key>INIntentUserConfirmationRequired</key>
+			<false/>
+			<key>INIntentVerb</key>
+			<string>Add</string>
+		</dict>
+	</array>
+</dict>
+</plist>

Common/Extensions/Double.swift

@@ -0,0 +1,28 @@
+//
+//  Double.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+
+extension FloatingPoint {
+    func floored(to increment: Self) -> Self {
+        if increment == 0 {
+            return self
+        }
+
+        return floor(self / increment) * increment
+    }
+
+    func ceiled(to increment: Self) -> Self {
+        if increment == 0 {
+            return self
+        }
+
+        return ceil(self / increment) * increment
+    }
+}
+

Loop/Extensions/GlucoseRangeSchedule.swift → Common/Extensions/GlucoseRangeSchedule.swift

@@ -23,12 +23,26 @@ extension GlucoseRangeSchedule {
         return override.isActive()
     }
 
-    var activeOverrideContext: GlucoseRangeSchedule.Override.Context? {
+    var activeOverride: GlucoseRangeSchedule.Override? {
         guard let override = override, override.isActive() else {
             return nil
         }
 
-        return override.context
+        return override
+    }
+
+    var activeOverrideContext: GlucoseRangeSchedule.Override.Context? {
+        return activeOverride?.context
+    }
+
+    var activeOverrideQuantityRange: Range<HKQuantity>? {
+        guard let activeOverride = activeOverride else {
+            return nil
+        }
+
+        let lowerBound = HKQuantity(unit: unit, doubleValue: activeOverride.value.minValue)
+        let upperBound = HKQuantity(unit: unit, doubleValue: activeOverride.value.maxValue)
+        return lowerBound..<upperBound
     }
 
     var configuredOverrideContexts: [GlucoseRangeSchedule.Override.Context] {

Common/Extensions/HKUnit.swift

@@ -14,7 +14,7 @@ import HealthKit
 extension HKUnit {
     // A formatting helper for determining the preferred decimal style for a given unit
     var preferredFractionDigits: Int {
-        if self.unitString == "mg/dL" {
+        if self == .milligramsPerDeciliter {
             return 0
         } else {
             return 1
@@ -45,7 +45,7 @@ extension HKUnit {
 
     /// An example value for the "ideal" target
     var glucoseExampleTargetValue: Double {
-        if unitString == "mg/dL" {
+        if self == .milligramsPerDeciliter {
             return 100
         } else {
             return 5.5
@@ -54,7 +54,7 @@ extension HKUnit {
 
     /// The smallest value expected to be visible on a chart
     var chartableIncrement: Double {
-        if unitString == "mg/dL" {
+        if self == .milligramsPerDeciliter {
             return 1
         } else {
             return 1 / 25

Common/Extensions/NSUserActivity.swift

@@ -0,0 +1,33 @@
+//
+//  NSUserActivity.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+
+extension NSUserActivity {
+    /// Activity of viewing the current status of the Loop
+    static let viewLoopStatusActivityType = "ViewLoopStatus"
+
+    class func forViewLoopStatus() -> NSUserActivity {
+        return NSUserActivity(activityType: viewLoopStatusActivityType)
+    }
+
+    static let didAddCarbEntryOnWatchActivityType = "com.loopkit.Loop.AddCarbEntryOnWatch"
+
+    class func forDidAddCarbEntryOnWatch() -> NSUserActivity {
+        let activity = NSUserActivity(activityType: didAddCarbEntryOnWatchActivityType)
+        activity.isEligibleForSearch = true
+        activity.isEligibleForHandoff = false
+        activity.isEligibleForPublicIndexing = false
+        if #available(iOS 12.0, watchOSApplicationExtension 5.0, *) {
+            activity.isEligibleForPrediction = true
+        }
+        activity.requiredUserInfoKeys = []
+        activity.title = NSLocalizedString("Add Carb Entry", comment: "Title of the user activity for adding carbs")
+        return activity
+    }
+}

Common/Extensions/NewCarbEntryIntent+Loop.swift

@@ -0,0 +1,11 @@
+//
+//  NewCarbEntryIntent+Loop.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+@available(iOS 12.0, watchOSApplicationExtension 5.0, *)
+extension NewCarbEntryIntent: IdentifiableClass { }

Common/Extensions/PersistenceController.swift

@@ -20,4 +20,14 @@ extension PersistenceController {
 
         return self.init(directoryURL: directoryURL.appendingPathComponent("com.loopkit.LoopKit", isDirectory: true), isReadOnly: isReadOnly)
     }
+
+    class func controllerInLocalDirectory() -> PersistenceController {
+        guard let directoryURL = try? FileManager.default.url(for: .documentDirectory, in: .userDomainMask, appropriateFor: nil, create: true) else {
+            fatalError("Could not access the document directory of the current process")
+        }
+
+        let isReadOnly = Bundle.main.bundleURL.pathExtension == "appex"
+
+        return self.init(directoryURL: directoryURL.appendingPathComponent("com.loopkit.LoopKit"), isReadOnly: isReadOnly)
+    }
 }

Common/Extensions/SampleValue.swift

@@ -0,0 +1,38 @@
+//
+//  SampleValue.swift
+//  Loop
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import HealthKit
+import LoopKit
+
+
+extension Collection where Element == SampleValue {
+    /// O(n)
+    var quantityRange: Range<HKQuantity>? {
+        var lowest: HKQuantity?
+        var highest: HKQuantity?
+
+        for sample in self {
+            if let l = lowest {
+                lowest = Swift.min(l, sample.quantity)
+            } else {
+                lowest = sample.quantity
+            }
+
+            if let h = highest {
+                highest = Swift.max(h, sample.quantity)
+            } else {
+                highest = sample.quantity
+            }
+        }
+
+        guard let l = lowest, let h = highest else {
+            return nil
+        }
+
+        return l..<h
+    }
+}

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/BolusSuggestionUserInfo.swift

@@ -9,11 +9,11 @@
 import Foundation
 
 
-final class BolusSuggestionUserInfo: RawRepresentable {
-    let recommendedBolus: Double
-    let maxBolus: Double?
+struct BolusSuggestionUserInfo: RawRepresentable {
+    let recommendedBolus: Double?
+    var maxBolus: Double?
 
-    init(recommendedBolus: Double, maxBolus: Double? = nil) {
+    init(recommendedBolus: Double?, maxBolus: Double? = nil) {
         self.recommendedBolus = recommendedBolus
         self.maxBolus = maxBolus
     }
@@ -24,7 +24,7 @@ final class BolusSuggestionUserInfo: RawRepresentable {
     static let version = 1
     static let name = "BolusSuggestionUserInfo"
 
-    required init?(rawValue: RawValue) {
+    init?(rawValue: RawValue) {
         guard rawValue["v"] as? Int == type(of: self).version && rawValue["name"] as? String == BolusSuggestionUserInfo.name,
             let recommendedBolus = rawValue["br"] as? Double else
         {
@@ -39,12 +39,10 @@ final class BolusSuggestionUserInfo: RawRepresentable {
         var raw: RawValue = [
             "v": type(of: self).version,
             "name": BolusSuggestionUserInfo.name,
-            "br": recommendedBolus
         ]
 
-        if let maxBolus = maxBolus {
-            raw["mb"] = maxBolus
-        }
+        raw["br"] = recommendedBolus
+        raw["mb"] = maxBolus
 
         return raw
     }