Merge pull request #434 from ps2/dev

Version 2.0.3

Author: ps2

.gitignore

@@ -31,3 +31,4 @@ project.xcworkspace
 # Pods/
 
 Carthage/
+.gitmodules

.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode9.4
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:

Cartfile

@@ -0,0 +1 @@
+github "LoopKit/LoopKit" == 2.1.2

Cartfile.resolved

@@ -0,0 +1 @@
+github "LoopKit/LoopKit" "v2.1.2"

RileyLinkKitUI/CaseCountable.swift Common/CaseCountable.swiftRileyLinkKitUI/CaseCountable.swift renamed to Common/CaseCountable.swift

@@ -0,0 +1,36 @@
+//
+//  HKUnit.swift
+//  Naterade
+//
+//  Created by Nathan Racklyeft on 1/17/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import HealthKit
+
+
+extension HKUnit {
+    static let milligramsPerDeciliter: HKUnit = {
+        return HKUnit.gramUnit(with: .milli).unitDivided(by: .literUnit(with: .deci))
+    }()
+
+    static let millimolesPerLiter: HKUnit = {
+        return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: .liter())
+    }()
+
+    var foundationUnit: Unit? {
+        if self == HKUnit.milligramsPerDeciliter {
+            return UnitConcentrationMass.milligramsPerDeciliter
+        }
+
+        if self == HKUnit.millimolesPerLiter {
+            return UnitConcentrationMass.millimolesPerLiter(withGramsPerMole: HKUnitMolarMassBloodGlucose)
+        }
+
+        if self == HKUnit.gram() {
+            return UnitMass.grams
+        }
+
+        return nil
+    }
+}

Common/HKUnit.swift

@@ -0,0 +1,17 @@
+//
+//  LocalizedString.swift
+//  RileyLink
+//
+//  Created by Kathryn DiSimone on 8/15/18.
+//  Copyright © 2018 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+private class FrameworkBundle {
+    static let main = Bundle(for: FrameworkBundle.self)
+}
+
+func LocalizedString(_ key: String, tableName: String? = nil, value: String = "", comment: String) -> String {
+    return NSLocalizedString(key, tableName: tableName, bundle: FrameworkBundle.main, value: value, comment: comment)
+}

Common/LocalizedString.swift

@@ -0,0 +1,40 @@
+//
+//  Locked.swift
+//  LoopKit
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import os.lock
+
+
+internal class Locked<T> {
+    private var lock = os_unfair_lock()
+    private var _value: T
+
+    init(_ value: T) {
+        os_unfair_lock_lock(&lock)
+        defer { os_unfair_lock_unlock(&lock) }
+        _value = value
+    }
+
+    var value: T {
+        get {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            return _value
+        }
+        set {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            _value = newValue
+        }
+    }
+
+    func mutate(_ changes: (_ value: inout T) -> Void) -> T {
+        os_unfair_lock_lock(&lock)
+        defer { os_unfair_lock_unlock(&lock) }
+        changes(&_value)
+        return _value
+    }
+}

Common/Locked.swift

@@ -10,7 +10,7 @@ import Foundation
 extension NumberFormatter {
     func decibleString(from decibles: Int?) -> String? {
         if let decibles = decibles, let formatted = string(from: NSNumber(value: decibles)) {
-            return String(format: NSLocalizedString("%@ dB", comment: "Unit format string for an RSSI value in decibles"), formatted)
+            return String(format: LocalizedString("%@ dB", comment: "Unit format string for an RSSI value in decibles"), formatted)
         } else {
             return nil
         }