Merge pull request #920 from LoopKit/tidepool-dev-sync

Tidepool dev sync

Author: ps2

Cartfile.resolved

@@ -1,8 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "ea1267791c66e884f1013fffd36faf4555cc6eaf"
-github "LoopKit/G4ShareSpy" "fed5a389e3e47e3a1953878dd21852aa5f44b360"
-github "LoopKit/LoopKit" "e386a24577244ee6b2add52e8b2aff0385c2200b"
-github "LoopKit/dexcom-share-client-swift" "b0419edf55c7f389b36cb47dd5c376bbd3d03d69"
+github "LoopKit/CGMBLEKit" "6d77ba2983ce57388d1df81c507738bb7a283149"
+github "LoopKit/G4ShareSpy" "ffbb8d65564f662369bbaf93dd9e147be9d1137e"
+github "LoopKit/LoopKit" "e560de9bd3b0e89eca5661d10186f84bf1fa10e4"
+github "LoopKit/dexcom-share-client-swift" "dc39f5c579c004a8305df1584a9e479ace07966c"
 github "i-schuetz/SwiftCharts" "0.6.5"
-github "maxkonovalov/MKRingProgressView" "2.2.1"
-github "ps2/rileylink_ios" "e0dc72050510fb8bf7fc85f655b8d24dc4de0097"
+github "maxkonovalov/MKRingProgressView" "2.2.2"
+github "ps2/rileylink_ios" "be5bb7f1ef37a5c22bfa4b5493ae698786157271"

Common/Extensions/GlucoseRangeSchedule.swift

@@ -46,7 +46,7 @@ extension GlucoseRangeSchedule {
 }
 
 
-extension Range where Bound == HKQuantity {
+extension ClosedRange where Bound == HKQuantity {
     func averageValue(for unit: HKUnit) -> Double {
         let minValue = lowerBound.doubleValue(for: unit)
         let maxValue = upperBound.doubleValue(for: unit)

Common/Extensions/HKUnit.swift

@@ -36,15 +36,6 @@ extension HKUnit {
         }
     }
 
-    /// An example value for the "ideal" target
-    var glucoseExampleTargetValue: Double {
-        if self == .milligramsPerDeciliter {
-            return 100
-        } else {
-            return 5.5
-        }
-    }
-
     /// The smallest value expected to be visible on a chart
     var chartableIncrement: Double {
         if self == .milligramsPerDeciliter {

Common/Extensions/NSBundle.swift

@@ -30,6 +30,10 @@ extension Bundle {
         return object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
     }
 
+    var isAppExtension: Bool {
+        return bundleURL.pathExtension == "appex"
+    }
+
     var mainAppUrl: URL? {
         if let mainAppBundleIdentifier = mainAppBundleIdentifier {
             return URL(string: "\(mainAppBundleIdentifier)://")

Common/Extensions/NSTimeInterval.swift

@@ -22,10 +22,6 @@ extension TimeInterval {
         return TimeInterval(hours: hours)
     }
 
-    static func days(_ days: Double) -> TimeInterval {
-        return TimeInterval(days: days)
-    }
-
     init(minutes: Double) {
         self.init(minutes * 60)
     }
@@ -34,15 +30,12 @@ extension TimeInterval {
         self.init(minutes: hours * 60)
     }
 
-    init(days: Double) {
-        self.init(hours: days * 24)
-    }
-
     var minutes: Double {
         return self / 60.0
     }
 
     var hours: Double {
         return minutes / 60.0
     }
+
 }

Common/Extensions/SampleValue.swift

@@ -11,7 +11,7 @@ import LoopKit
 
 extension Collection where Element == SampleValue {
     /// O(n)
-    var quantityRange: Range<HKQuantity>? {
+    var quantityRange: ClosedRange<HKQuantity>? {
         var lowest: HKQuantity?
         var highest: HKQuantity?
 
@@ -33,6 +33,6 @@ extension Collection where Element == SampleValue {
             return nil
         }
 
-        return l..<h
+        return l...h
     }
 }

Common/Models/StatusExtensionContext.swift

@@ -27,7 +27,7 @@ struct SensorDisplayableContext: SensorDisplayable {
     let isLocal: Bool
 }
 
-struct GlucoseContext {
+struct GlucoseContext: GlucoseValue {
     let value: Double
     let unit: HKUnit
     let startDate: Date

Learn/Configuration/NumberRangeEntry.swift

@@ -11,8 +11,6 @@ import UIKit
 class NumberRangeEntry: LessonSectionProviding {
     let headerTitle: String?
 
-    let footerTitle: String? = nil
-
     var cells: [LessonCellProviding] {
         return numberCells
     }

Learn/Configuration/QuantityRangeEntry.swift

@@ -67,11 +67,22 @@ class QuantityRangeEntry: LessonSectionProviding {
 
         numberRange = NumberRangeEntry(
             headerTitle: headerTitle,
-            minValue: NSNumber(value: minValue?.doubleValue(for: unit)),
-            maxValue: NSNumber(value: maxValue?.doubleValue(for: unit)),
+            minValue: (minValue?.doubleValue(for: unit)).map(NSNumber.init(value:)),
+            maxValue: (maxValue?.doubleValue(for: unit)).map(NSNumber.init(value:)),
             formatter: quantityFormatter.numberFormatter,
             unitString: quantityFormatter.string(from: unit),
             keyboardType: keyboardType
         )
     }
+
+    internal class func glucoseRange(minValue: HKQuantity, maxValue: HKQuantity, quantityFormatter: QuantityFormatter, unit: HKUnit) -> QuantityRangeEntry {
+        return QuantityRangeEntry(
+            headerTitle: NSLocalizedString("Range", comment: "Section title for glucose range"),
+            minValue: minValue,
+            maxValue: maxValue,
+            quantityFormatter: quantityFormatter,
+            unit: unit,
+            keyboardType: unit == .milligramsPerDeciliter ? .numberPad : .decimalPad
+        )
+    }
 }

Learn/Extensions/NSNumber.swift

@@ -13,14 +13,3 @@ extension NSNumber: Comparable {
         return lhs.compare(rhs) == .orderedAscending
     }
 }
-
-
-extension NSNumber {
-    convenience init?(value: Double?) {
-        if let value = value {
-            self.init(value: value)
-        } else {
-            return nil
-        }
-    }
-}