Add insulinTint to ChartColorPalette

Author: gestrich

Loop Status Extension/StatusViewController.swift

@@ -43,7 +43,8 @@ class StatusViewController: UIViewController, NCWidgetProviding {
                 axisLabel: .axisLabelColor,
                 grid: .gridColor,
                 glucoseTint: .glucoseTintColor,
-                insulinTint: .insulinTintColor
+                insulinTint: .insulinTintColor,
+                carbTint: .carbTintColor
             ),
             settings: {
                 var settings = ChartSettings()

Loop/Extensions/ChartColorPalette+Loop.swift

@@ -12,6 +12,6 @@ import LoopKitUI
 
 extension ChartColorPalette {
     static var primary: ChartColorPalette {
-        return ChartColorPalette(axisLine: .axisLineColor, axisLabel: .axisLabelColor, grid: .gridColor, glucoseTint: .glucoseTintColor, insulinTint: .insulinTintColor)
+        return ChartColorPalette(axisLine: .axisLineColor, axisLabel: .axisLabelColor, grid: .gridColor, glucoseTint: .glucoseTintColor, insulinTint: .insulinTintColor, carbTint: .carbTintColor)
     }
 }

LoopUI/Charts/COBChart.swift

@@ -55,10 +55,10 @@ public extension COBChart {
         let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The COB area
-        let lineModel = ChartLineModel(chartPoints: cobPoints, lineColor: UIColor.carbTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
+        let lineModel = ChartLineModel(chartPoints: cobPoints, lineColor: colors.carbTint, lineWidth: 2, animDuration: 0, animDelay: 0)
         let cobLine = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
 
-        let cobArea = ChartPointsFillsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, fills: [ChartPointsFill(chartPoints: cobPoints, fillColor: UIColor.carbTintColor.withAlphaComponent(0.5))])
+        let cobArea = ChartPointsFillsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, fills: [ChartPointsFill(chartPoints: cobPoints, fillColor: colors.carbTint.withAlphaComponent(0.5))])
 
         // Grid lines
         let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
@@ -69,7 +69,7 @@ public extension COBChart {
                 yAxisLayer: yAxisLayer,
                 axisLabelSettings: axisLabelSettings,
                 chartPoints: cobPoints,
-                tintColor: UIColor.carbTintColor,
+                tintColor: colors.carbTint,
                 gestureRecognizer: gestureRecognizer
             )
         }

LoopUI/Charts/CarbEffectChart.swift

@@ -74,7 +74,7 @@ extension CarbEffectChart {
 
         let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
-        let carbFillColor = UIColor.carbTintColor.withAlphaComponent(0.5)
+        let carbFillColor = colors.carbTint.withAlphaComponent(0.5)
         let carbBlendMode: CGBlendMode
         switch traitCollection.userInterfaceStyle {
         case .dark:
@@ -121,7 +121,7 @@ extension CarbEffectChart {
                 yAxisLayer: yAxisLayer,
                 axisLabelSettings: axisLabelSettings,
                 chartPoints: allCarbEffectPoints,
-                tintColor: UIColor.carbTintColor,
+                tintColor: colors.carbTint,
                 gestureRecognizer: gestureRecognizer
             )
         }

LoopUI/Charts/IOBChart.swift

@@ -58,10 +58,10 @@ public extension IOBChart {
         let (xAxisLayer, yAxisLayer, innerFrame) = (coordsSpace.xAxisLayer, coordsSpace.yAxisLayer, coordsSpace.chartInnerFrame)
 
         // The IOB area
-        let lineModel = ChartLineModel(chartPoints: iobPoints, lineColor: UIColor.insulinTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
+        let lineModel = ChartLineModel(chartPoints: iobPoints, lineColor: colors.insulinTint, lineWidth: 2, animDuration: 0, animDelay: 0)
         let iobLine = ChartPointsLineLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, lineModels: [lineModel])
 
-        let iobArea = ChartPointsFillsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, fills: [ChartPointsFill(chartPoints: iobPoints, fillColor: UIColor.insulinTintColor.withAlphaComponent(0.5))])
+        let iobArea = ChartPointsFillsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, fills: [ChartPointsFill(chartPoints: iobPoints, fillColor: colors.insulinTint.withAlphaComponent(0.5))])
 
         // Grid lines
         let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
@@ -73,7 +73,7 @@ public extension IOBChart {
             let viewFrame = CGRect(x: chart.contentView.bounds.minX, y: chartPointModel.screenLoc.y - width / 2, width: chart.contentView.bounds.size.width, height: width)
 
             let v = UIView(frame: viewFrame)
-            v.layer.backgroundColor = UIColor.insulinTintColor.cgColor
+            v.layer.backgroundColor = colors.insulinTint.cgColor
             return v
         })
 
@@ -83,7 +83,7 @@ public extension IOBChart {
                 yAxisLayer: yAxisLayer,
                 axisLabelSettings: axisLabelSettings,
                 chartPoints: iobPoints,
-                tintColor: UIColor.insulinTintColor,
+                tintColor: colors.insulinTint,
                 gestureRecognizer: gestureRecognizer
             )
         }