Merge branch 'dev-watchM' into dev-watch

Author: iMaces

Common/Models/GlucoseBackfillRequestUserInfo.swift

@@ -0,0 +1,40 @@
+//
+//  GlucoseBackfillRequestUserInfo.swift
+//  Loop
+//
+//  Created by Bharat Mediratta on 6/21/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+struct GlucoseBackfillRequestUserInfo {
+    let version = 1
+    let startDate: Date
+}
+
+extension GlucoseBackfillRequestUserInfo: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    static let name = "GlucoseBackfillRequestUserInfo"
+
+    init?(rawValue: RawValue) {
+        guard
+            rawValue["v"] as? Int == version,
+            rawValue["name"] as? String == GlucoseBackfillRequestUserInfo.name,
+            let startDate = rawValue["sd"] as? Date
+        else {
+            return nil
+        }
+
+        self.startDate = startDate
+    }
+
+    var rawValue: RawValue {
+        return [
+            "v": version,
+            "name": GlucoseBackfillRequestUserInfo.name,
+            "sd": startDate
+        ]
+    }
+}

Common/Models/WatchContext.swift

@@ -9,10 +9,11 @@
 import Foundation
 import HealthKit
 
+
 final class WatchContext: NSObject, RawRepresentable {
     typealias RawValue = [String: Any]
 
-    private let version = 3
+    private let version = 4
 
     var preferredGlucoseUnit: HKUnit?
     var maxBolus: Double?
@@ -22,6 +23,8 @@ final class WatchContext: NSObject, RawRepresentable {
     var eventualGlucose: HKQuantity?
     var glucoseDate: Date?
 
+    var targetRanges: [WatchDatedRange]?
+    var temporaryOverride: WatchDatedRange?
     var glucoseRangeScheduleOverride: GlucoseRangeScheduleOverrideUserInfo?
     var configuredOverrideContexts: [GlucoseRangeScheduleOverrideUserInfo.Context] = []
 
@@ -41,6 +44,7 @@ final class WatchContext: NSObject, RawRepresentable {
     var reservoir: Double?
     var reservoirPercentage: Double?
     var batteryPercentage: Double?
+    var predictedGlucose: WatchPredictedGlucose?
 
     var cgm: CGM?
 
@@ -56,16 +60,15 @@ final class WatchContext: NSObject, RawRepresentable {
         }
 
         if let unitString = rawValue["gu"] as? String {
-            let unit = HKUnit(from: unitString)
-            preferredGlucoseUnit = unit
+            preferredGlucoseUnit = HKUnit(from: unitString)
         }
-
+        let unit = preferredGlucoseUnit ?? .milligramsPerDeciliter
         if let glucoseValue = rawValue["gv"] as? Double {
-            glucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter, doubleValue: glucoseValue)
+            glucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
         }
 
         if let glucoseValue = rawValue["egv"] as? Double {
-            eventualGlucose = HKQuantity(unit: preferredGlucoseUnit ?? .milligramsPerDeciliter, doubleValue: glucoseValue)
+            eventualGlucose = HKQuantity(unit: unit, doubleValue: glucoseValue)
         }
 
         glucoseTrendRawValue = rawValue["gt"] as? Int
@@ -93,6 +96,18 @@ final class WatchContext: NSObject, RawRepresentable {
         COB = rawValue["cob"] as? Double
         maxBolus = rawValue["mb"] as? Double
 
+        if let rawValue = rawValue["pg"] as? WatchPredictedGlucose.RawValue {
+            predictedGlucose = WatchPredictedGlucose(rawValue: rawValue)
+        }
+
+        if let rawValue = rawValue["tr"] as? [WatchDatedRange.RawValue] {
+            targetRanges = rawValue.compactMap({return WatchDatedRange(rawValue: $0)})
+        }
+
+        if let rawValue = rawValue["to"] as? WatchDatedRange.RawValue {
+            temporaryOverride = WatchDatedRange(rawValue: rawValue)
+        }
+
         if let cgmRawValue = rawValue["cgm"] as? CGM.RawValue {
             cgm = CGM(rawValue: cgmRawValue)
         }
@@ -127,6 +142,11 @@ final class WatchContext: NSObject, RawRepresentable {
         raw["rbo"] = recommendedBolusDose
         raw["rp"] = reservoirPercentage
 
+        raw["pg"] = predictedGlucose?.rawValue
+
+        raw["tr"] = targetRanges?.map { $0.rawValue }
+        raw["to"] = temporaryOverride?.rawValue
+
         return raw
     }
 }

Common/Models/WatchDatedRange.swift

@@ -0,0 +1,54 @@
+//
+//  WatchDatedRange.swift
+//  WatchApp Extension
+//
+//  Created by Bharat Mediratta on 6/26/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+
+struct WatchDatedRange {
+    public let startDate: Date
+    public let endDate: Date
+    public let minValue: Double
+    public let maxValue: Double
+
+    public init(startDate: Date, endDate: Date, minValue: Double, maxValue: Double) {
+        self.startDate = startDate
+        self.endDate = endDate
+        self.minValue = minValue
+        self.maxValue = maxValue
+    }
+}
+
+
+extension WatchDatedRange: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    var rawValue: RawValue {
+        return [
+            "sd": startDate,
+            "ed": endDate,
+            "mi": minValue,
+            "ma": maxValue
+        ]
+    }
+
+    init?(rawValue: RawValue) {
+        guard
+            let startDate = rawValue["sd"] as? Date,
+            let endDate = rawValue["ed"] as? Date,
+            let minValue = rawValue["mi"] as? Double,
+            let maxValue = rawValue["ma"] as? Double
+            else {
+                return nil
+        }
+
+        self.startDate = startDate
+        self.endDate = endDate
+        self.minValue = minValue
+        self.maxValue = maxValue
+    }
+}

Common/Models/WatchHistoricalGlucose.swift

@@ -0,0 +1,51 @@
+//
+//  WatchHistoricalGlucose.swift
+//  Loop
+//
+//  Created by Bharat Mediratta on 6/22/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import HealthKit
+import LoopKit
+
+
+struct WatchHistoricalGlucose {
+    let samples: [NewGlucoseSample]
+
+    init(with samples: [StoredGlucoseSample]) {
+        self.samples = samples.map {
+            NewGlucoseSample(date: $0.startDate, quantity: $0.quantity, isDisplayOnly: false, syncIdentifier: $0.syncIdentifier)
+        }
+    }
+}
+
+
+extension WatchHistoricalGlucose: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    var rawValue: RawValue {
+        return [
+            "d": samples.map { $0.date },
+            "v": samples.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
+            "id": samples.map { $0.syncIdentifier }
+        ]
+    }
+
+    init?(rawValue: RawValue) {
+        guard
+            let dates = rawValue["d"] as? [Date],
+            let values = rawValue["v"] as? [Int16],
+            let syncIdentifiers = rawValue["id"] as? [String],
+            dates.count == values.count,
+            dates.count == syncIdentifiers.count
+        else {
+                return nil
+        }
+
+        self.samples = (0..<dates.count).map {
+            NewGlucoseSample(date: dates[$0], quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(values[$0])), isDisplayOnly: false, syncIdentifier: syncIdentifiers[$0])
+        }
+    }
+}

Common/Models/WatchPredictedGlucose.swift

@@ -0,0 +1,52 @@
+//
+//  WatchPredictedGlucose.swift
+//  WatchApp Extension
+//
+//  Created by Bharat Mediratta on 6/26/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+import LoopKit
+import HealthKit
+
+
+struct WatchPredictedGlucose {
+    let values: [GlucoseValue]
+
+    init?(values: [GlucoseValue]) {
+        guard values.count > 1 else {
+            return nil
+        }
+        self.values = values
+    }
+}
+
+
+extension WatchPredictedGlucose: RawRepresentable {
+    typealias RawValue = [String: Any]
+
+    var rawValue: RawValue {
+
+        return [
+            "v": values.map { Int16($0.quantity.doubleValue(for: .milligramsPerDeciliter)) },
+            "d": values[0].startDate,
+            "i": values[1].startDate.timeIntervalSince(values[0].startDate)
+        ]
+    }
+
+    init?(rawValue: RawValue) {
+        guard
+            let values = rawValue["v"] as? [Int16],
+            let firstDate = rawValue["d"] as? Date,
+            let interval = rawValue["i"] as? TimeInterval
+            else {
+                return nil
+        }
+
+        self.values = values.enumerated().map { tuple in
+            PredictedGlucoseValue(startDate: firstDate + Double(tuple.0) * interval,
+                                  quantity: HKQuantity(unit: .milligramsPerDeciliter, doubleValue: Double(tuple.1)))
+        }
+    }
+}

Loop Status Extension/Base.lproj/MainInterface.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="64E-I5-5c4">
     <device id="retina5_5" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>