tidepool-org · ps2 · Mar 15, 2019 · Sep 26, 2018 · Sep 28, 2018 · Sep 28, 2018
diff --git a/LoopKit/Locked.swift → Common/Locked.swift b/LoopKit/Locked.swift → Common/Locked.swift
diff --git a/Extensions/Comparable.swift b/Extensions/Comparable.swift
@@ -1,13 +1,11 @@
 //
 //  Comparable.swift
-//  LoopKit Example
+//  LoopKit
 //
-//  Created by Pete Schwamb on 2/17/19.
-//  Copyright © 2019 LoopKit Authors. All rights reserved.
+//  Created by Michael Pangburn on 11/20/18.
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
 //
 
-import Foundation
-
 extension Comparable {
     func clamped(to range: ClosedRange<Self>) -> Self {
         if self < range.lowerBound {
@@ -18,4 +16,8 @@ extension Comparable {
             return self
         }
     }
+
+    mutating func clamp(to range: ClosedRange<Self>) {
+        self = clamped(to: range)
+    }
 }
diff --git a/Extensions/UIColor.swift b/Extensions/UIColor.swift
@@ -0,0 +1,22 @@
+//
+//  UIColor.swift
+//  LoopKitUI
+//
+//  Copyright © 2018 LoopKit Authors. All rights reserved.
+//
+
+import UIKit
+
+
+extension UIColor {
+    static let delete = UIColor.higRed()
+}
+
+
+// MARK: - HIG colors
+// See: https://developer.apple.com/ios/human-interface-guidelines/visual-design/color/
+extension UIColor {
+    private static func higRed() -> UIColor {
+        return UIColor(red: 1, green: 59 / 255, blue: 48 / 255, alpha: 1)
+    }
+}
diff --git a/LoopKit.xcodeproj/project.pbxproj b/LoopKit.xcodeproj/project.pbxproj
diff --git a/LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme b/LoopKit.xcodeproj/xcshareddata/xcschemes/LoopKit Example.xcscheme
@@ -49,6 +49,16 @@
                ReferencedContainer = "container:LoopKit.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "892A5D3B222F03CB008961AB"
+               BuildableName = "LoopTestingKitTests.xctest"
+               BlueprintName = "LoopTestingKitTests"
+               ReferencedContainer = "container:LoopKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

diff --git a/LoopKit.xcodeproj/xcshareddata/xcschemes/MockKit.xcscheme b/LoopKit.xcodeproj/xcshareddata/xcschemes/MockKit.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "89D2047121CC7BD7001238CC"
+               BuildableName = "MockKit.framework"
+               BlueprintName = "MockKit"
+               ReferencedContainer = "container:LoopKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "89D2047921CC7BD8001238CC"
+               BuildableName = "MockKitTests.xctest"
+               BlueprintName = "MockKitTests"
+               ReferencedContainer = "container:LoopKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2047121CC7BD7001238CC"
+            BuildableName = "MockKit.framework"
+            BlueprintName = "MockKit"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2047121CC7BD7001238CC"
+            BuildableName = "MockKit.framework"
+            BlueprintName = "MockKit"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2047121CC7BD7001238CC"
+            BuildableName = "MockKit.framework"
+            BlueprintName = "MockKit"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/LoopKit.xcodeproj/xcshareddata/xcschemes/MockKitUI.xcscheme b/LoopKit.xcodeproj/xcshareddata/xcschemes/MockKitUI.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "89D2048E21CC7C12001238CC"
+               BuildableName = "MockKitUI.framework"
+               BlueprintName = "MockKitUI"
+               ReferencedContainer = "container:LoopKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "89D2049621CC7C13001238CC"
+               BuildableName = "MockKitUITests.xctest"
+               BlueprintName = "MockKitUITests"
+               ReferencedContainer = "container:LoopKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2048E21CC7C12001238CC"
+            BuildableName = "MockKitUI.framework"
+            BlueprintName = "MockKitUI"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2048E21CC7C12001238CC"
+            BuildableName = "MockKitUI.framework"
+            BlueprintName = "MockKitUI"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "89D2048E21CC7C12001238CC"
+            BuildableName = "MockKitUI.framework"
+            BlueprintName = "MockKitUI"
+            ReferencedContainer = "container:LoopKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/LoopKit/CGMManager.swift b/LoopKit/CGMManager.swift
@@ -38,6 +38,12 @@ public protocol CGMManagerDelegate: class {
     ///
     /// - Parameter manager: The manager instance
     func cgmManagerWantsDeletion(_ manager: CGMManager)
+
+
+    /// Informs the delegate that the manager has updated its state and should be persisted.
+    ///
+    /// - Parameter manager: The manager instance
+    func cgmManagerDidUpdateState(_ manager: CGMManager)
 }
 
 

diff --git a/LoopKit/GlucoseKit/GlucoseStore.swift b/LoopKit/GlucoseKit/GlucoseStore.swift
@@ -221,6 +221,20 @@ extension GlucoseStore {
         }
     }
 
+
+    /// Deletes glucose samples from both the CoreData cache and from HealthKit.
+    ///
+    /// - Parameters:
+    ///   - cachePredicate: The predicate to use in matching CoreData glucose objects, or `nil` to match all.
+    ///   - healthKitPredicate: The predicate to use in matching HealthKit glucose objects.
+    ///   - completion: The completion handler for the result of the HealthKit object deletion.
+    public func purgeGlucoseSamples(matchingCachePredicate cachePredicate: NSPredicate?, healthKitPredicate: NSPredicate, completion: @escaping (_ success: Bool, _ count: Int, _ error: Error?) -> Void) {
+        dataAccessQueue.async {
+            self.purgeCachedGlucoseObjects(matching: cachePredicate)
+            self.healthStore.deleteObjects(of: self.glucoseType, predicate: healthKitPredicate, withCompletion: completion)
+        }
+    }
+
     /**
      Cleans the in-memory and managed HealthKit caches.
 
@@ -422,7 +436,7 @@ extension GlucoseStore {
         return Date(timeIntervalSinceNow: -cacheLength)
     }
 
-    private func purgeCachedGlucoseObjects(matching predicate: NSPredicate) {
+    private func purgeCachedGlucoseObjects(matching predicate: NSPredicate?) {
         dispatchPrecondition(condition: .onQueue(dataAccessQueue))
 
         cacheStore.managedObjectContext.performAndWait {

diff --git a/LoopKit/GlucoseKit/GlucoseTrend.swift b/LoopKit/GlucoseKit/GlucoseTrend.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 
-public enum GlucoseTrend: Int {
+public enum GlucoseTrend: Int, CaseIterable {
     case upUpUp       = 1
     case upUp         = 2
     case up           = 3

diff --git a/LoopKit/Persistence/NSManagedObjectContext.swift b/LoopKit/Persistence/NSManagedObjectContext.swift
@@ -18,7 +18,7 @@ extension NSManagedObjectContext {
     ///   - predicate: The predicate to match
     /// - Returns: The number of deleted objects
     /// - Throws: NSBatchDeleteRequest exeuction errors
-    internal func purgeObjects<T: NSManagedObject>(of type: T.Type, matching predicate: NSPredicate) throws -> Int {
+    internal func purgeObjects<T: NSManagedObject>(of type: T.Type, matching predicate: NSPredicate? = nil) throws -> Int {
         let fetchRequest: NSFetchRequest<NSFetchRequestResult> = T.fetchRequest()
         fetchRequest.predicate = predicate
 

diff --git a/LoopKit/PumpManagerStatus.swift b/LoopKit/PumpManagerStatus.swift
@@ -44,3 +44,16 @@ public struct PumpManagerStatus: Equatable {
         self.bolusState = bolusState
     }
 }
+
+extension PumpManagerStatus: CustomDebugStringConvertible {
+    public var debugDescription: String {
+        return """
+        ## PumpManagerStatus
+        * timeZone: \(timeZone)
+        * device: \(device)
+        * pumpBatteryChargeRemaining: \(pumpBatteryChargeRemaining as Any)
+        * suspendState: \(basalDeliveryState)
+        * bolusState: \(bolusState)
+        """
+    }
+}
diff --git a/LoopKitUI/UIColor.swift b/LoopKitUI/UIColor.swift
@@ -4,7 +4,6 @@
 //
 //  Copyright © 2018 LoopKit Authors. All rights reserved.
 //
-
 import UIKit
 
 private class FrameworkBundle {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ @@
     //
     //  Copyright © 2018 LoopKit Authors. All rights reserved.
     //
     import UIKit
     private class FrameworkBundle {
@@ Expand Down @@