Displaying the units when highlighting chart values, and re-using hig…

…hlight views while panning.

Loop.xcodeproj/project.pbxproj

@@ -126,6 +126,7 @@
 		43EB40861C82646A00472A8C /* StatusChartManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40851C82646A00472A8C /* StatusChartManager.swift */; };
 		43EB40C21C83F84900472A8C /* StatusChartHighlightLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43EB40C11C83F84900472A8C /* StatusChartHighlightLayer.swift */; };
 		43EDDBF31C361C75007D89B5 /* xDripG5.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43EDDBF11C361C75007D89B5 /* xDripG5.framework */; };
+		43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */; };
 		43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */; };
 		43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F5C2C81B929C09003EB13D /* HealthKit.framework */; };
 		43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */; };
@@ -337,6 +338,7 @@
 		43EDDBF51C361D24007D89B5 /* CommonCrypto.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = CommonCrypto.framework.dSYM; path = Carthage/Build/iOS/CommonCrypto.framework.dSYM; sourceTree = "<group>"; };
 		43EDDBF61C361D24007D89B5 /* xDripG5.framework.dSYM */ = {isa = PBXFileReference; lastKnownFileType = wrapper.dsym; name = xDripG5.framework.dSYM; path = Carthage/Build/iOS/xDripG5.framework.dSYM; sourceTree = "<group>"; };
 		43EDEE6B1CF2E12A00393BE3 /* Loop.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Loop.entitlements; sourceTree = "<group>"; };
+		43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartAxisValueDoubleUnit.swift; sourceTree = "<group>"; };
 		43F4EF1C1BA2A57600526CE1 /* DiagnosticLogger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DiagnosticLogger.swift; sourceTree = "<group>"; };
 		43F5C2C81B929C09003EB13D /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
 		43F5C2D41B92A4A6003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -434,6 +436,7 @@
 				43DE92601C555C26001FFDE1 /* AbsorptionTimeType+CarbKit.swift */,
 				438849EB1D29EC34003B3F23 /* AmplitudeService.swift */,
 				4331E0791C85650D00FBE832 /* ChartAxisValueDoubleLog.swift */,
+				43F41C321D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift */,
 				434F24CA1CFCB7AB0004498F /* GlucoseRxMessage.swift */,
 				436FACED1D0BA636004E2427 /* InsulinDataSource.swift */,
 				436A0DA41D236A2A00104B24 /* LoopError.swift */,
@@ -953,6 +956,7 @@
 				43776F901B8022E90074EA36 /* AppDelegate.swift in Sources */,
 				437CCADA1D284ADF0075D2C3 /* AuthenticationTableViewCell.swift in Sources */,
 				43CE7CDE1CA8B63E003CC1B0 /* NSDate.swift in Sources */,
+				43F41C331D3A17AA00C11ED6 /* ChartAxisValueDoubleUnit.swift in Sources */,
 				43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */,
 				43B371861CE583890013C5A6 /* BasalStateView.swift in Sources */,
 				434FF1EA1CF26C29000DB779 /* IdentifiableClass.swift in Sources */,

Loop/Managers/StatusChartManager.swift

@@ -73,23 +73,31 @@ class StatusChartsManager {
 
     var glucoseValues: [GlucoseValue] = [] {
         didSet {
-            glucosePoints = glucoseValues.map({
+            // TODO: Use the preferred unit
+            let unit = HKUnit.milligramsPerDeciliterUnit()
+            let unitString = unit.glucoseUnitDisplayString
+
+            glucosePoints = glucoseValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDouble($0.quantity.doubleValueForUnit(HKUnit.milligramsPerDeciliterUnit()))
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValueForUnit(unit), unitString: unitString)
                 )
-            })
+            }
         }
     }
 
     var predictedGlucoseValues: [GlucoseValue] = [] {
         didSet {
-            predictedGlucosePoints = predictedGlucoseValues.map({
+            // TODO: Use the preferred unit
+            let unit = HKUnit.milligramsPerDeciliterUnit()
+            let unitString = unit.glucoseUnitDisplayString
+
+            predictedGlucosePoints = predictedGlucoseValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDouble($0.quantity.doubleValueForUnit(HKUnit.milligramsPerDeciliterUnit()), formatter: integerFormatter)
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValueForUnit(unit), unitString: unitString, formatter: integerFormatter)
                 )
-            })
+            }
         }
     }
 
@@ -98,18 +106,21 @@ class StatusChartsManager {
             IOBPoints = IOBValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDouble($0.value, formatter: decimalFormatter)
+                    y: ChartAxisValueDoubleUnit($0.value, unitString: "U", formatter: decimalFormatter)
                 )
             }
         }
     }
 
     var COBValues: [CarbValue] = [] {
         didSet {
+            let unit = HKUnit.gramUnit()
+            let unitString = unit.unitString
+
             COBPoints = COBValues.map {
                 ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDouble($0.quantity.doubleValueForUnit(HKUnit.gramUnit()), formatter: integerFormatter)
+                    y: ChartAxisValueDoubleUnit($0.quantity.doubleValueForUnit(unit), unitString: unitString, formatter: integerFormatter)
                 )
             }
         }
@@ -122,7 +133,7 @@ class StatusChartsManager {
                     let startX = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
                     let endX = ChartAxisValueDate(date: entry.endDate, formatter: dateFormatter)
                     let zero = ChartAxisValueInt(0)
-                    let value = ChartAxisValueDoubleLog(actualDouble: entry.value, formatter: decimalFormatter)
+                    let value = ChartAxisValueDoubleLog(actualDouble: entry.value, unitString: "U/hour", formatter: decimalFormatter)
 
                     let newPoints = [
                         ChartPoint(x: startX, y: zero),
@@ -214,6 +225,14 @@ class StatusChartsManager {
 
     private var doseChart: Chart?
 
+    private var glucoseChartCache: ChartPointsTouchHighlightLayerViewCache?
+
+    private var IOBChartCache: ChartPointsTouchHighlightLayerViewCache?
+
+    private var COBChartCache: ChartPointsTouchHighlightLayerViewCache?
+
+    private var doseChartCache: ChartPointsTouchHighlightLayerViewCache?
+
     // MARK: - Generators
 
     func glucoseChartWithFrame(frame: CGRect) -> Chart? {
@@ -275,7 +294,7 @@ class StatusChartsManager {
             prediction = ChartPointsScatterCirclesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: predictedGlucosePoints, displayDelay: 0, itemSize: CGSize(width: 2, height: 2), itemFillColor: UIColor.glucoseTintColor.colorWithAlphaComponent(0.75))
         }
 
-        let highlightLayer = StatusChartHighlightLayer(
+        glucoseChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
@@ -292,7 +311,7 @@ class StatusChartsManager {
             targetOverrideDurationLayer,
             xAxis,
             yAxis,
-            highlightLayer,
+            glucoseChartCache?.highlightLayer,
             prediction,
             circles
         ]
@@ -356,7 +375,7 @@ class StatusChartsManager {
             return v
         })
 
-        let highlightLayer = StatusChartHighlightLayer(
+        IOBChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
@@ -371,7 +390,7 @@ class StatusChartsManager {
             xAxis,
             yAxis,
             zeroGuidelineLayer,
-            highlightLayer,
+            IOBChartCache?.highlightLayer,
             IOBArea,
             IOBLine,
         ]
@@ -425,7 +444,7 @@ class StatusChartsManager {
         let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .XAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
 
 
-        let highlightLayer = StatusChartHighlightLayer(
+        COBChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
@@ -439,7 +458,7 @@ class StatusChartsManager {
             gridLayer,
             xAxis,
             yAxis,
-            highlightLayer,
+            COBChartCache?.highlightLayer,
             COBArea,
             COBLine
         ]
@@ -492,7 +511,7 @@ class StatusChartsManager {
             return v
         })
 
-        let highlightLayer = StatusChartHighlightLayer(
+        doseChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
@@ -507,7 +526,7 @@ class StatusChartsManager {
             xAxis,
             yAxis,
             zeroGuidelineLayer,
-            highlightLayer,
+            doseChartCache?.highlightLayer,
             doseArea,
             doseLine
         ]

Loop/Models/ChartAxisValueDoubleLog.swift

@@ -12,7 +12,9 @@ import SwiftCharts
 
 class ChartAxisValueDoubleLog: ChartAxisValueDoubleScreenLoc {
 
-    init(actualDouble: Double, formatter: NSNumberFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
+    let unitString: String?
+
+    init(actualDouble: Double, unitString: String? = nil, formatter: NSNumberFormatter, labelSettings: ChartLabelSettings = ChartLabelSettings()) {
         let screenLocDouble: Double
 
         switch actualDouble {
@@ -24,6 +26,8 @@ class ChartAxisValueDoubleLog: ChartAxisValueDoubleScreenLoc {
             screenLocDouble = 0
         }
 
+        self.unitString = unitString
+
         super.init(screenLocDouble: screenLocDouble, actualDouble: actualDouble, formatter: formatter, labelSettings: labelSettings)
     }
 
@@ -39,7 +43,14 @@ class ChartAxisValueDoubleLog: ChartAxisValueDoubleScreenLoc {
             actualDouble = 0
         }
 
+        self.unitString = nil
+
         super.init(screenLocDouble: screenLocDouble, actualDouble: actualDouble, formatter: formatter, labelSettings: labelSettings)
     }
 
+    override var description: String {
+        let suffix = unitString != nil ? " \(unitString!)" : ""
+
+        return super.description + suffix
+    }
 }

Loop/Models/ChartAxisValueDoubleUnit.swift

@@ -0,0 +1,31 @@
+//
+//  ChartAxisValueDoubleUnit.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 7/16/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import UIKit
+import SwiftCharts
+
+
+class ChartAxisValueDoubleUnit: ChartAxisValueDouble {
+    let unitString: String
+
+    init(_ double: Double, unitString: String, formatter: NSNumberFormatter) {
+        self.unitString = unitString
+
+        super.init(double, formatter: formatter)
+    }
+
+    init(_ double: Double, unitString: String) {
+        self.unitString = unitString
+
+        super.init(double)
+    }
+
+    override var description: String {
+        return "\(super.description) \(unitString)"
+    }
+}

Loop/Views/StatusChartHighlightLayer.swift

@@ -10,73 +10,103 @@ import Foundation
 import SwiftCharts
 
 
-class StatusChartHighlightLayer<T: ChartPoint, U: UIView>: ChartPointsTouchHighlightLayer<T, U> {
-    init(
-        xAxis: ChartAxisLayer,
-        yAxis: ChartAxisLayer,
-        innerFrame: CGRect,
-        chartPoints: [T],
-        tintColor: UIColor,
-        labelCenterY: CGFloat = 0,
-        gestureRecognizer: UIPanGestureRecognizer? = nil
-    ) {
-        super.init(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: chartPoints, gestureRecognizer: gestureRecognizer,
-            modelFilter: { (screenLoc, chartPointModels) -> ChartPointLayerModel<T>? in
+class ChartPointsTouchHighlightLayerViewCache {
+    private lazy var containerView = UIView(frame: .zero)
+
+    private lazy var xAxisOverlayView = UIView()
+
+    private lazy var point = ChartPointEllipseView(center: .zero, diameter: 16)
+
+    private lazy var labelY: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.monospacedDigitSystemFontOfSize(15, weight: UIFontWeightBold)
+        label.textAlignment = .Center
+        label.backgroundColor = UIColor.whiteColor()
+
+        return label
+    }()
+
+    private lazy var labelX: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.preferredFontForTextStyle(UIFontTextStyleCaption1)
+        label.textColor = UIColor.secondaryLabelColor
+
+        return label
+    }()
+
+    private(set) var highlightLayer: ChartPointsTouchHighlightLayer<ChartPoint, UIView>!
+
+    init(xAxis: ChartAxisLayer, yAxis: ChartAxisLayer, innerFrame: CGRect, chartPoints: [ChartPoint], tintColor: UIColor, labelCenterY: CGFloat, gestureRecognizer: UIPanGestureRecognizer? = nil) {
+
+        highlightLayer = ChartPointsTouchHighlightLayer(
+            xAxis: xAxis,
+            yAxis: yAxis,
+            innerFrame: innerFrame,
+            chartPoints: chartPoints,
+            gestureRecognizer: gestureRecognizer,
+            modelFilter: { (screenLoc, chartPointModels) -> ChartPointLayerModel<ChartPoint>? in
                 if let index = chartPointModels.map({ $0.screenLoc.x }).findClosestElementIndexToValue(screenLoc.x) {
                     return chartPointModels[index]
                 } else {
                     return nil
                 }
             },
-            viewGenerator: { (chartPointModel, layer, chart) -> U? in
-                let containerView = U(frame: chart.bounds)
+            viewGenerator: { [unowned self] (chartPointModel, layer, chart) -> UIView? in
+                let containerView = self.containerView
+                containerView.frame = chart.bounds
+                containerView.alpha = 1  // This is animated to 0 when touch last ended
 
-                let xAxisOverlayView = UIView(frame: xAxis.rect.offsetBy(dx: 0, dy: 1))
-                xAxisOverlayView.backgroundColor = UIColor.whiteColor()
-                xAxisOverlayView.opaque = true
-                containerView.addSubview(xAxisOverlayView)
+                let xAxisOverlayView = self.xAxisOverlayView
+                if xAxisOverlayView.superview == nil {
+                    xAxisOverlayView.frame = xAxis.rect.offsetBy(dx: 0, dy: 1)
+                    xAxisOverlayView.backgroundColor = UIColor.whiteColor()
+                    xAxisOverlayView.opaque = true
+                    containerView.addSubview(xAxisOverlayView)
+                }
 
-                let point = ChartPointEllipseView(center: chartPointModel.screenLoc, diameter: 16)
-                point.fillColor = tintColor.colorWithAlphaComponent(0.5)
-                containerView.addSubview(point)
+                let point = self.point
+                point.center = chartPointModel.screenLoc
+                if point.superview == nil {
+                    point.fillColor = tintColor.colorWithAlphaComponent(0.5)
+                    containerView.addSubview(point)
+                }
 
                 if let text = chartPointModel.chartPoint.y.labels.first?.text {
-                    let label = UILabel()
-                    label.font = UIFont.monospacedDigitSystemFontOfSize(15, weight: UIFontWeightBold)
+                    let label = self.labelY
 
                     label.text = text
-                    label.textColor = tintColor
-                    label.textAlignment = .Center
                     label.sizeToFit()
                     label.frame.size.height += 4
                     label.frame.size.width += label.frame.size.height / 2
                     label.center.y = innerFrame.origin.y - 1
                     label.center.x = chartPointModel.screenLoc.x
                     label.frame.origin.x = min(max(label.frame.origin.x, innerFrame.origin.x), innerFrame.maxX - label.frame.size.width)
                     label.frame.origin.makeIntegralInPlaceWithDisplayScale(chart.view.traitCollection.displayScale)
-                    label.layer.borderColor = tintColor.CGColor
-                    label.layer.borderWidth = 1 / chart.view.traitCollection.displayScale
                     label.layer.cornerRadius = label.frame.size.height / 2
-                    label.backgroundColor = UIColor.whiteColor()
+                    label.layer.borderWidth = 1 / max(1, chart.view.traitCollection.displayScale)
+
+                    if label.superview == nil {
+                        label.textColor = tintColor
+                        label.layer.borderColor = tintColor.CGColor
 
-                    containerView.addSubview(label)
+                        containerView.addSubview(label)
+                    }
                 }
 
                 if let text = chartPointModel.chartPoint.x.labels.first?.text {
-                    let label = UILabel()
-                    label.font = UIFont.preferredFontForTextStyle(UIFontTextStyleCaption1)
+                    let label = self.labelX
                     label.text = text
-                    label.textColor = UIColor.secondaryLabelColor
                     label.sizeToFit()
                     label.center = CGPoint(x: chartPointModel.screenLoc.x, y: xAxisOverlayView.center.y)
                     label.frame.origin.makeIntegralInPlaceWithDisplayScale(chart.view.traitCollection.displayScale)
 
-                    containerView.addSubview(label)
+                    if label.superview == nil {
+                        containerView.addSubview(label)
+                    }
                 }
 
                 return containerView
             }
         )
-
     }
 }