Swift 3.1 - post widget merge cleanups (#424)

* Extend ChartColorPalette in Loop target to add a .default() palette

* Update chart appropriately when we remove glucose targets

* Drop the first predicted glucose entry. It's the current glucose and its interval to the second is not uniform with the interval for the rest

* Use predictedGlucose.startIndex for clarity instead of hardcoding indexes

Author: Bharat Mediratta

Loop Status Extension/DatedRangedContextCalculator.swift

@@ -9,6 +9,8 @@
 import Foundation
 import SwiftCharts
 
+import LoopUI
+
 class DatedRangeContextCalculator: TargetPointsCalculator {
 
     var targetRanges: [DatedRangeContext]?

Loop Status Extension/StatusViewController.swift

@@ -29,7 +29,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
     @IBOutlet weak var glucoseChartContentView: ChartContentView!
 
     private lazy var charts: StatusChartsManager = {
-        let charts = StatusChartsManager()
+        let charts = StatusChartsManager(colors: ChartColorPalette(axisLine: .axisLineColor, axisLabel: .axisLabelColor, grid: .gridColor, glucoseTint: .glucoseTintColor, doseTint: .doseTintColor))
 
         charts.glucoseDisplayRange = (
             min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
@@ -227,10 +227,7 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                         )
                         subtitleLabel.alpha = 1
                     }
-
-                    charts.endDate = eventualGlucose.startDate
                 }
-
             }
 
             charts.targetPointsCalculator = DatedRangeContextCalculator(targetRanges: context.targetRanges, temporaryOverride: context.temporaryOverride)

Loop Status Extension/UIColor+Widget.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import LoopUI
 
 extension UIColor {
     @nonobjc static let axisLabelColor = subtitleLabelColor

Loop.xcodeproj/project.pbxproj

@@ -0,0 +1,19 @@
+//
+//  ChartColorPalette+Loop.swift
+//  Loop
+//
+//  Created by Bharat Mediratta on 4/1/17.
+//  Copyright © 2017 LoopKit Authors. All rights reserved.
+//
+
+import Foundation
+
+import LoopUI
+
+extension ChartColorPalette {
+    static var `default`: ChartColorPalette {
+        get {
+            return ChartColorPalette(axisLine: .axisLineColor, axisLabel: .axisLabelColor, grid: .gridColor, glucoseTint: .glucoseTintColor, doseTint: .doseTintColor)
+        }
+    }
+}

Loop/Extensions/ChartColorPalette+Loop.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2016 LoopKit Authors. All rights reserved.
 //
 
-
 import UIKit
+import LoopUI
 
 extension UIColor {
     @nonobjc static let axisLabelColor = secondaryLabelColor

Loop/Extensions/UIColor+Loop.swift

@@ -9,6 +9,7 @@
 import Foundation
 import LoopKit
 import SwiftCharts
+import LoopUI
 
 class GlucoseRangeScheduleCalculator: TargetPointsCalculator {
 

Loop/Managers/GlucoseRangeScheduleCalculator.swift

@@ -13,6 +13,7 @@ import GlucoseKit
 import InsulinKit
 import LoopKit
 import SwiftCharts
+import LoopUI
 
 extension StatusChartsManager {
 

Loop/Managers/StatusChartsManager+LoopKit.swift

@@ -101,15 +101,19 @@ final class StatusExtensionDataManager {
                         startDate: $0.startDate
                     )
                 })
-
+                
                 // Only tranfer the predicted glucose if we have glucose history
-                if let predictedGlucose = predictedGlucose,
+                // Drop the first element in predictedGlucose because it is the currentGlucose
+                // and will have a different interval to the next element
+                if let predictedGlucose = predictedGlucose?.dropFirst(),
                     predictedGlucose.count > 1 {
+                    let first = predictedGlucose[predictedGlucose.startIndex]
+                    let second = predictedGlucose[predictedGlucose.startIndex.advanced(by: 1)]
                     context.predictedGlucose = PredictedGlucoseContext(
                         values: predictedGlucose.map { $0.quantity.doubleValue(for: glucoseUnit) },
                         unit: glucoseUnit,
-                        startDate: predictedGlucose[0].startDate,
-                        interval: predictedGlucose[1].startDate.timeIntervalSince(predictedGlucose[0].startDate))
+                        startDate: first.startDate,
+                        interval: second.startDate.timeIntervalSince(first.startDate))
                 }
                 updateGroup.leave()
             }

Loop/Managers/StatusExtensionDataManager.swift

@@ -9,6 +9,7 @@
 import UIKit
 import HealthKit
 import LoopKit
+import LoopUI
 
 
 class PredictionTableViewController: UITableViewController, IdentifiableClass, UIGestureRecognizerDelegate {
@@ -88,7 +89,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
     var dataManager: DeviceDataManager!
 
     private lazy var charts: StatusChartsManager = {
-        let charts = StatusChartsManager()
+        let charts = StatusChartsManager(colors: .default)
 
         charts.glucoseDisplayRange = (
             min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 60),