Jojo beeps merge 2019-07-20

.travis.yml

@@ -1,13 +1,21 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode10.2
 # xcode_sdk: iphonesimulator11
 # xcode_project: Loop.xcodeproj
 # xcode_scheme: Loop
+
+addons:
+  homebrew:
+    packages:
+    - carthage
+    update: true
 before_script:
+    - git config --global protocol.version 1
     - set -o pipefail && xcodebuild -project Loop.xcodeproj -target Cartfile
 script:
     # Build the app target
-    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Loop build CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO | xcpretty
+    - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme Learn build CODE_SIGN_IDENTITY="" CODE_SIGNING_ALLOWED=NO | xcpretty
     # Run the test target
     - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme LoopTests -destination 'name=iPhone SE' test | xcpretty
     - set -o pipefail && xcodebuild -project Loop.xcodeproj -scheme DoseMathTests -destination 'name=iPhone SE' test | xcpretty

Cartfile

@@ -1,8 +1,7 @@
-
-github "LoopKit/LoopKit" ~> 2.2
-github "LoopKit/CGMBLEKit" == 3.0
-github "ps2/SwiftCharts" "hotfix-xcode10.2"
-github "LoopKit/dexcom-share-client-swift" == 1.0
-github "LoopKit/G4ShareSpy" == 1.0
-github "ps2/rileylink_ios" ~> 2.1
+github "kdisimone/LoopKit" "jojo"
+github "kdisimone/CGMBLEKit" "jojo-firefly"
+github "i-schuetz/SwiftCharts" == 0.6.5
+github "kdisimone/dexcom-share-client-swift" "jojo"
+github "kdisimone/G4ShareSpy" "jojo"
+github "kdisimone/rileylink_ios" "jojo-beeps"
 github "LoopKit/Amplitude-iOS" "decreepify"

Cartfile.resolved

@@ -1,7 +1,8 @@
 github "LoopKit/Amplitude-iOS" "2137d5fd44bf630ed33e1e72d7af6d8f8612f270"
-github "LoopKit/CGMBLEKit" "v3.0"
-github "LoopKit/G4ShareSpy" "v1.0"
-github "LoopKit/LoopKit" "v2.2.2"
-github "LoopKit/dexcom-share-client-swift" "v1.0"
-github "ps2/SwiftCharts" "cc8c401171d5ccb638ec6c87f6c410ee31fa774d"
-github "ps2/rileylink_ios" "v2.1.1"
+github "i-schuetz/SwiftCharts" "0.6.5"
+github "kdisimone/CGMBLEKit" "9ffe6455cd7f9d39a3f89c34ff77f435a6f3db53"
+github "kdisimone/G4ShareSpy" "86007af69a378a3235cc67895ab913dbd495f193"
+github "kdisimone/LoopKit" "42d3afac724aab4d9b5ff17bead2f3cef68c30ba"
+github "kdisimone/dexcom-share-client-swift" "9810c126d2dc94ae4ffdc6350dd7057e859b7ad1"
+github "kdisimone/rileylink_ios" "1e8fbe0443dc203e181bd76a524b3de4636492a3"
+github "maxkonovalov/MKRingProgressView" "2.2.2"

Common/Extensions/GlucoseRangeSchedule.swift

@@ -10,58 +10,20 @@ import HealthKit
 
 
 extension GlucoseRangeSchedule {
-    func overrideEnabledForContext(_ context: Override.Context) -> Bool? {
-        guard let override = override, override.context == context else {
-            guard let value = overrideRanges[context], !value.isZero else {
-                // Unavailable to set
-                return nil
-            }
-
-            return false
-        }
-
-        return override.isActive()
-    }
-
-    var activeOverride: GlucoseRangeSchedule.Override? {
-        guard let override = override, override.isActive() else {
-            return nil
-        }
-
-        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] {
-        var contexts: [GlucoseRangeSchedule.Override.Context] = []
-        for (context, range) in overrideRanges where !range.isZero {
-            contexts.append(context)
-        }
-
-        return contexts
-    }
-
     func minQuantity(at date: Date) -> HKQuantity {
         return HKQuantity(unit: unit, doubleValue: value(at: date).minValue)
     }
+
+    func maxQuantity(at date: Date) -> HKQuantity {
+        return HKQuantity(unit: unit, doubleValue: value(at: date).maxValue)
+    }
 }
 
 
-extension DoubleRange {
-    var averageValue: Double {
+extension Range where Bound == HKQuantity {
+    func averageValue(for unit: HKUnit) -> Double {
+        let minValue = lowerBound.doubleValue(for: unit)
+        let maxValue = upperBound.doubleValue(for: unit)
         return (maxValue + minValue) / 2
     }
 }

Common/Extensions/HKUnit.swift

@@ -7,6 +7,7 @@
 //
 
 import HealthKit
+import LoopCore
 
 // Code in this extension is duplicated from:
 //   https://github.com/LoopKit/LoopKit/blob/master/LoopKit/HKUnit.swift
@@ -21,14 +22,6 @@ extension HKUnit {
         }
     }
 
-    static let milligramsPerDeciliter: HKUnit = {
-        return HKUnit.gramUnit(with: .milli).unitDivided(by: HKUnit.literUnit(with: .deci))
-    }()
-
-    static let millimolesPerLiter: HKUnit = {
-        return HKUnit.moleUnit(with: .milli, molarMass: HKUnitMolarMassBloodGlucose).unitDivided(by: HKUnit.liter())
-    }()
-
     var localizedShortUnitString: String {
         if self == HKUnit.millimolesPerLiter {
             return NSLocalizedString("mmol/L", comment: "The short unit display string for millimoles of glucose per liter")

Common/Extensions/NSTimeInterval.swift

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

Common/Extensions/NewCarbEntryIntent+Loop.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import LoopCore
 
 @available(iOS 12.0, watchOSApplicationExtension 5.0, *)
 extension NewCarbEntryIntent: IdentifiableClass { }

Loop/Views/TextFieldTableViewCell.swift → Common/Extensions/TextFieldTableViewCell.swift

@@ -6,6 +6,7 @@
 //
 
 import LoopKitUI
+import LoopUI
 
 
 extension TextFieldTableViewCell: NibLoadable { }

Common/Models/LoopSettingsUserInfo.swift

@@ -5,6 +5,8 @@
 //  Copyright © 2018 LoopKit Authors. All rights reserved.
 //
 
+import LoopCore
+
 
 struct LoopSettingsUserInfo {
     let settings: LoopSettings

Loop/Managers/PumpManager.swift → Common/Models/PumpManager.swift

@@ -8,10 +8,14 @@
 import Foundation
 import LoopKit
 import MinimedKit
+import OmniKit
+import MockKit
 
 
 let allPumpManagers: [PumpManager.Type] = [
-    MinimedPumpManager.self
+    OmnipodPumpManager.self,
+    MinimedPumpManager.self,
+    MockPumpManager.self,
 ]
 
 private let managersByIdentifier: [String: PumpManager.Type] = allPumpManagers.reduce(into: [:]) { (map, Type) in