Resolve all Swift 3.1 warnings

Common/Managers/StatusChartsManager.swift

@@ -24,7 +24,7 @@ final class StatusChartsManager {
     // MARK: - Configuration
 
     private lazy var chartSettings: ChartSettings = {
-        let chartSettings = ChartSettings()
+        var chartSettings = ChartSettings()
         chartSettings.top = 12
         chartSettings.bottom = 0
         chartSettings.trailing = 8

Loop/Managers/CGM/DexCGMManager.swift

@@ -100,7 +100,7 @@ final class ShareClientManager: CGMManager {
     var debugDescription: String {
         return [
             "## ShareClientManager",
-            "latestBackfill: \(latestBackfill)",
+            "latestBackfill: \(latestBackfill.debugDescription)",
             ""
         ].joined(separator: "\n")
     }
@@ -149,7 +149,7 @@ final class G5CGMManager: DexCGMManager, TransmitterDelegate {
     override var debugDescription: String {
         return [
             "## G5CGMManager",
-            "latestReading: \(latestReading)",
+            "latestReading: \(latestReading.debugDescription)",
             "transmitter: \(transmitter)",
             super.debugDescription,
             ""
@@ -217,7 +217,7 @@ final class G4CGMManager: DexCGMManager, ReceiverDelegate {
     override var debugDescription: String {
         return [
             "## G4CGMManager",
-            "latestReading: \(latestReading)",
+            "latestReading: \(latestReading.debugDescription)",
             "receiver: \(receiver)",
             super.debugDescription,
             ""

Loop/Managers/CGM/EnliteCGMManager.swift

@@ -61,7 +61,7 @@ final class EnliteCGMManager: CGMManager {
     var debugDescription: String {
         return [
             "## EnliteCGMManager",
-            "sensorState: \(sensorState)",
+            "sensorState: \(sensorState.debugDescription)",
             ""
         ].joined(separator: "\n")
     }

Loop/Managers/DeviceDataManager.swift

@@ -847,14 +847,14 @@ extension DeviceDataManager: CustomDebugStringConvertible {
             Bundle.main.localizedNameAndVersion,
             "## DeviceDataManager",
             "launchDate: \(launchDate)",
-            "cgm: \(cgm)",
-            "latestPumpStatusFromMySentry: \(latestPumpStatusFromMySentry)",
+            "cgm: \(cgm.debugDescription)",
+            "latestPumpStatusFromMySentry: \(latestPumpStatusFromMySentry.debugDescription)",
             "pumpState: \(String(reflecting: pumpState))",
             "preferredInsulinDataSource: \(preferredInsulinDataSource)",
             "glucoseTargetRangeSchedule: \(glucoseTargetRangeSchedule?.debugDescription ?? "")",
-            "workoutModeEnabled: \(workoutModeEnabled)",
-            "maximumBasalRatePerHour: \(maximumBasalRatePerHour)",
-            "maximumBolus: \(maximumBolus)",
+            "workoutModeEnabled: \(workoutModeEnabled.debugDescription)",
+            "maximumBasalRatePerHour: \(maximumBasalRatePerHour.debugDescription)",
+            "maximumBolus: \(maximumBolus.debugDescription)",
             cgmManager != nil ? String(reflecting: cgmManager!) : "",
             String(reflecting: rileyLinkManager),
             String(reflecting: statusExtensionManager!),

Loop/Managers/KeychainManager.swift

@@ -257,7 +257,7 @@ private extension URLComponents {
         host = keychainAttributes[kSecAttrServer as String] as? String
 
         if let port = keychainAttributes[kSecAttrPort as String] as? NSNumber, port.intValue > 0 {
-            self.port = port as Int?
+            self.port = port as? Int
         }
 
         if let path = keychainAttributes[kSecAttrPath as String] as? String {

Loop/Managers/LoopDataManager.swift

@@ -198,12 +198,13 @@ final class LoopDataManager {
 
         if insulinEffect == nil {
             updateGroup.enter()
-            deviceDataManager.doseStore.getGlucoseEffects(startDate: effectStartDate) { (effects, error) -> Void in
-                if let error = error {
+            deviceDataManager.doseStore.getGlucoseEffects(start: effectStartDate, end: .distantFuture) { result -> Void in
+                switch result {
+                case .success(let effects):
+                    self.insulinEffect = effects
+                case .failure(let error):
                     self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
                     self.insulinEffect = nil
-                } else {
-                    self.insulinEffect = effects
                 }
 
                 updateGroup.leave()
@@ -212,12 +213,13 @@ final class LoopDataManager {
 
         if insulinOnBoard == nil {
             updateGroup.enter()
-            deviceDataManager.doseStore.insulinOnBoardAtDate(Date()) { (value, error) in
-                if let error = error {
+            deviceDataManager.doseStore.insulinOnBoard(at: Date()) { result in
+                switch result {
+                case .success(let values):
+                    self.insulinOnBoard = values
+                case .failure(let error):
                     self.deviceDataManager.logger.addError(error, fromSource: "DoseStore")
                     self.insulinOnBoard = nil
-                } else {
-                    self.insulinOnBoard = value
                 }
                 updateGroup.leave()
             }
@@ -759,12 +761,12 @@ extension LoopDataManager {
                 "## LoopDataManager",
                 "predictedGlucose: \(predictedGlucose ?? [])",
                 "retrospectivePredictedGlucose: \(retrospectivePredictedGlucose ?? [])",
-                "recommendedTempBasal: \(recommendedTempBasal)",
-                "lastTempBasal: \(lastTempBasal)",
+                "recommendedTempBasal: \(recommendedTempBasal.debugDescription)",
+                "lastTempBasal: \(lastTempBasal.debugDescription)",
                 "lastLoopCompleted: \(lastLoopCompleted ?? .distantPast)",
-                "insulinOnBoard: \(insulinOnBoard)",
-                "carbsOnBoard: \(carbsOnBoard)",
-                "error: \(error)"
+                "insulinOnBoard: \(insulinOnBoard.debugDescription)",
+                "carbsOnBoard: \(carbsOnBoard.debugDescription)",
+                "error: \(error.debugDescription)"
             ]
             completionHandler(report.joined(separator: "\n"))
         }

Loop/Managers/StatusExtensionDataManager.swift

@@ -92,14 +92,11 @@ final class StatusExtensionDataManager {
             let chartEndDate = Date().addingTimeInterval(TimeInterval(hours: 3))
 
             updateGroup.enter()
-            glucoseStore.getRecentGlucoseValues(startDate: chartStartDate, endDate: Date()) {
-                (values, error) in
+            glucoseStore.getGlucoseValues(start: chartStartDate, end: Date()) {
+                (result) in
 
-                if let error = error {
-                    self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
-                    context.glucose = nil
-                    context.predictedGlucose = nil
-                } else {
+                switch result {
+                case .success(let values):
                     context.glucose = values.map({
                         return GlucoseContext(
                             value: $0.quantity.doubleValue(for: glucoseUnit),
@@ -117,6 +114,10 @@ final class StatusExtensionDataManager {
                             startDate: predictedGlucose[0].startDate,
                             interval: predictedGlucose[1].startDate.timeIntervalSince(predictedGlucose[0].startDate))
                     }
+                case .failure(let error):
+                    self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
+                    context.glucose = nil
+                    context.predictedGlucose = nil
                 }
                 updateGroup.leave()
             }

Loop/View Controllers/PredictionTableViewController.swift

@@ -138,13 +138,14 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
                     }
 
                     reloadGroup.enter()
-                    glucoseStore.getRecentGlucoseValues(startDate: self.charts.startDate) { (values, error) -> Void in
-                        if let error = error {
+                    glucoseStore.getGlucoseValues(start: self.charts.startDate, end: .distantFuture) { result -> Void in
+                        switch result {
+                        case .success(let values):
+                            self.charts.setGlucoseValues(values)
+                        case .failure(let error):
                             self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
                             self.needsRefresh = true
                             self.charts.setGlucoseValues([])
-                        } else {
-                            self.charts.setGlucoseValues(values)
                         }
 
                         reloadGroup.leave()

Loop/View Controllers/StatusTableViewController.swift

@@ -206,13 +206,14 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
                     if self.refreshContext.remove(.glucose) != nil {
                         reloadGroup.enter()
-                        glucoseStore.getRecentGlucoseValues(startDate: self.chartStartDate) { (values, error) -> Void in
-                            if let error = error {
+                        glucoseStore.getGlucoseValues(start: self.chartStartDate, end: .distantFuture) { result -> Void in
+                            switch result {
+                            case .success(let values):
+                                self.charts.setGlucoseValues(values)
+                            case .failure(let error):
                                 self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
                                 self.refreshContext.update(with: .glucose)
                                 self.charts.setGlucoseValues([])
-                            } else {
-                                self.charts.setGlucoseValues(values)
                             }
 
                             reloadGroup.leave()
@@ -249,36 +250,39 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
             if refreshContext.remove(.insulin) != nil {
                 reloadGroup.enter()
-                dataManager.doseStore.getInsulinOnBoardValues(startDate: chartStartDate) { (values, error) -> Void in
-                    if let error = error {
+                dataManager.doseStore.getInsulinOnBoardValues(start: chartStartDate, end: .distantFuture) { result -> Void in
+                    switch result {
+                    case .success(let values):
+                        self.charts.setIOBValues(values)
+                    case .failure(let error):
                         self.dataManager.logger.addError(error, fromSource: "DoseStore")
                         self.refreshContext.update(with: .insulin)
                         self.charts.setIOBValues([])
-                    } else {
-                        self.charts.setIOBValues(values)
                     }
                     reloadGroup.leave()
                 }
 
                 reloadGroup.enter()
-                dataManager.doseStore.getRecentNormalizedDoseEntries(startDate: chartStartDate) { (doses, error) -> Void in
-                    if let error = error {
+                dataManager.doseStore.getNormalizedDoseEntries(start: chartStartDate, end: .distantFuture) { result -> Void in
+                    switch result {
+                    case .failure(let error):
                         self.dataManager.logger.addError(error, fromSource: "DoseStore")
                         self.refreshContext.update(with: .insulin)
                         self.charts.setDoseEntries([])
-                    } else {
+                    case .success(let doses):
                         self.charts.setDoseEntries(doses)
                     }
                     reloadGroup.leave()
                 }
 
                 reloadGroup.enter()
-                dataManager.doseStore.getTotalRecentUnitsDelivered { (units, _, error) in
-                    if error != nil {
+                dataManager.doseStore.getTotalUnitsDelivered(since: Calendar.current.startOfDay(for: Date())) { result in
+                    switch result {
+                    case .success(let units):
+                        self.totalDelivery = units.value
+                    case .failure:
                         self.refreshContext.update(with: .insulin)
                         self.totalDelivery = nil
-                    } else {
-                        self.totalDelivery = units
                     }
 
                     reloadGroup.leave()

LoopUI/Views/LoopStateView.swift

@@ -68,8 +68,8 @@ final class LoopStateView: UIView {
         let lineWidth = lineWidth ?? shapeLayer.lineWidth
         let radius = min(bounds.width / 2, bounds.height / 2) - lineWidth / 2
 
-        let startAngle = open ? CGFloat(-M_PI_4) : 0
-        let endAngle = open ? CGFloat(5 * M_PI_4) : CGFloat(2 * M_PI)
+        let startAngle = open ? CGFloat(Double.pi / 4) : 0
+        let endAngle = open ? CGFloat(5 * Double.pi / 4) : CGFloat(2 * Double.pi)
 
         let path = UIBezierPath(
             arcCenter: center,