Merge pull request #403 from LoopKit/dev

Version 1.3.0

Cartfile

@@ -1,7 +1,7 @@
-github "LoopKit/LoopKit" ~> 1.1.0
+github "LoopKit/LoopKit" ~> 1.2.0
 github "LoopKit/xDripG5" ~> 0.8.0
 github "i-schuetz/SwiftCharts" ~> 0.5.0
 github "mddub/dexcom-share-client-swift" ~> 0.2.0
 github "mddub/G4ShareSpy" ~> 0.3.1
-github "ps2/rileylink_ios" ~> 0.13
+github "ps2/rileylink_ios" ~> 1.0
 github "amplitude/Amplitude-iOS" ~> 3.8.5

Cartfile.resolved

@@ -1,7 +1,7 @@
-github "amplitude/Amplitude-iOS" "v3.11.1"
+github "amplitude/Amplitude-iOS" "v3.14.0"
 github "mddub/G4ShareSpy" "v0.3.1"
-github "LoopKit/LoopKit" "v1.1.0"
+github "LoopKit/LoopKit" "v1.2.0"
 github "i-schuetz/SwiftCharts" "0.5.1"
 github "mddub/dexcom-share-client-swift" "v0.2.0"
-github "ps2/rileylink_ios" "v0.13"
+github "ps2/rileylink_ios" "v1.0"
 github "LoopKit/xDripG5" "v0.8.0"

Loop Status Extension/HKUnit.swift → Common/Extensions/HKUnit.swift

@@ -11,9 +11,9 @@ import HealthKit
 // Code in this extension is duplicated from:
 //   https://github.com/LoopKit/LoopKit/blob/master/LoopKit/HKUnit.swift
 // to avoid pulling in the LoopKit extension since it's not extension-API safe.
-public extension HKUnit {
+extension HKUnit {
     // A formatting helper for determining the preferred decimal style for a given unit
-    var preferredMinimumFractionDigits: Int {
+    var preferredFractionDigits: Int {
         if self.unitString == "mg/dL" {
             return 0
         } else {

Loop/Extensions/NSBundle.swift → Common/Extensions/NSBundle.swift

@@ -22,7 +22,19 @@ extension Bundle {
         return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
     }
 
+    private var mainAppBundleIdentifier: String? {
+        return object(forInfoDictionaryKey: "MainAppBundleIdentifier") as? String
+    }
+
     var appGroupSuiteName: String {
         return object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
     }
+
+    var mainAppUrl: URL? {
+        if let mainAppBundleIdentifier = mainAppBundleIdentifier {
+            return URL(string: "\(mainAppBundleIdentifier)://")
+        } else {
+            return nil
+        }
+    }
 }

Loop/Extensions/NSUserDefaults+StatusExtension.swift → Common/Extensions/NSUserDefaults+StatusExtension.swift

@@ -14,6 +14,10 @@ extension UserDefaults {
         case StatusExtensionContext = "com.loopkit.Loop.StatusExtensionContext"
     }
 
+    var statusExtensionContextObservableKey: String {
+        return Key.StatusExtensionContext.rawValue
+    }
+
     var statusExtensionContext: StatusExtensionContext? {
         get {
             if let rawValue = dictionary(forKey: Key.StatusExtensionContext.rawValue) {

Common/Extensions/NumberFormatter.swift

@@ -0,0 +1,42 @@
+//
+//  NSNumberFormatter.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 9/5/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import Foundation
+import HealthKit
+
+
+extension NumberFormatter {
+    static func glucoseFormatter(for unit: HKUnit) -> NumberFormatter {
+        let numberFormatter = NumberFormatter()
+
+        numberFormatter.numberStyle = .decimal
+        numberFormatter.minimumFractionDigits = unit.preferredFractionDigits
+        numberFormatter.maximumFractionDigits = unit.preferredFractionDigits
+        return numberFormatter
+    }
+
+    func describingGlucose(_ value: Double, for unit: HKUnit) -> String? {
+        guard let stringValue = string(from: NSNumber(value: value)) else {
+            return nil
+        }
+
+        return String(
+            format: NSLocalizedString("GLUCOSE_VALUE_AND_UNIT",
+                                      value: "%1$@ %2$@",
+                                      comment: "Format string for combining localized glucose value and unit. (1: glucose value)(2: unit)"
+            ),
+            stringValue,
+            unit.glucoseUnitDisplayString
+        )
+    }
+
+    @nonobjc func describingGlucose(_ value: HKQuantity, for unit: HKUnit) -> String? {
+        return describingGlucose(value.doubleValue(for: unit), for: unit)
+    }
+
+}

Common/Extensions/UIColor+HIG.swift

@@ -0,0 +1,52 @@
+//
+//  UIColor+HIG.swift
+//  Naterade
+//
+//  Created by Nathan Racklyeft on 1/23/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import UIKit
+
+
+extension UIColor {
+    // MARK: - HIG colors
+    // See: https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
+
+    static func HIGTealBlueColor() -> UIColor {
+        return UIColor(red: 90 / 255, green: 200 / 255, blue: 250 / 255, alpha: 1)
+    }
+
+    static func HIGYellowColor() -> UIColor {
+        return UIColor(red: 1, green: 204 / 255, blue: 0, alpha: 1)
+    }
+
+    static func HIGOrangeColor() -> UIColor {
+        return UIColor(red: 1, green: 149 / 255, blue: 0 / 255, alpha: 1)
+    }
+
+    static func HIGPinkColor() -> UIColor {
+        return UIColor(red: 1, green: 45 / 255, blue: 85 / 255, alpha: 1)
+    }
+
+    static func HIGBlueColor() -> UIColor {
+        return UIColor(red: 0, green: 122 / 255, blue: 1, alpha: 1)
+    }
+
+    static func HIGGreenColor() -> UIColor {
+        return UIColor(red: 76 / 255, green: 217 / 255, blue: 100 / 255, alpha: 1)
+    }
+
+    static func HIGRedColor() -> UIColor {
+        return UIColor(red: 1, green: 59 / 255, blue: 48 / 255, alpha: 1)
+    }
+
+    static func HIGPurpleColor() -> UIColor {
+        return UIColor(red: 88 / 255, green: 86 / 255, blue: 214 / 255, alpha: 1)
+    }
+
+    static func HIGGrayColor() -> UIColor {
+        return UIColor(red: 142 / 255, green: 143 / 255, blue: 147 / 255, alpha: 1)
+    }
+
+}

Common/Extensions/UIColor.swift

@@ -0,0 +1,32 @@
+//
+//  UIColor.swift
+//  Naterade
+//
+//  Created by Nathan Racklyeft on 1/23/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import UIKit
+
+
+extension UIColor {
+    @nonobjc static var tintColor: UIColor? = nil
+
+    @nonobjc static let secondaryLabelColor = UIColor.HIGGrayColor()
+
+    @nonobjc static let cellBackgroundColor = UIColor(white: 239 / 255, alpha: 1)
+
+    @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)
+
+    @nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()
+
+    @nonobjc static let COBTintColor = UIColor(red: 99 / 255, green: 218 / 255, blue: 56 / 255, alpha: 1)
+
+    @nonobjc static let agingColor = UIColor.HIGYellowColor()
+
+    @nonobjc static let staleColor = UIColor.HIGRedColor()
+
+    @nonobjc static let unknownColor = UIColor(red: 198 / 255, green: 199 / 255, blue: 201 / 255, alpha: 1)
+
+    @nonobjc static let deleteColor = UIColor.HIGRedColor()
+}

Loop/Models/GlucoseTrend.swift → Common/Models/GlucoseTrend.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 
-enum GlucoseTrend: Int {
+public enum GlucoseTrend: Int {
     case upUpUp       = 1
     case upUp         = 2
     case up           = 3