Skip to content

Commit f910c5b

Browse files
bjorkertbjorkert
committed
Rename to now_line
1 parent 6f12bd4 commit f910c5b

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎now_marker/dev_now_marker.patch renamed to ‎now_line/dev_now_line.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Submodule LoopKit 7b6be31..c55cd98:
1+
Submodule LoopKit 7b6be31..bd3f5db:
22
diff --git a/LoopKit/LoopKitUI/Charts/COBChart.swift b/LoopKit/LoopKitUI/Charts/COBChart.swift
33
index 2bbae1e..6cbdbde 100644
44
--- a/LoopKit/LoopKitUI/Charts/COBChart.swift
@@ -23,15 +23,15 @@ index 2bbae1e..6cbdbde 100644
2323
yAxisLayer,
2424
cobChartCache?.highlightLayer,
2525
diff --git a/LoopKit/LoopKitUI/Charts/DoseChart.swift b/LoopKit/LoopKitUI/Charts/DoseChart.swift
26-
index ad30019..1988794 100644
26+
index ad30019..6f34555 100644
2727
--- a/LoopKit/LoopKitUI/Charts/DoseChart.swift
2828
+++ b/LoopKit/LoopKitUI/Charts/DoseChart.swift
2929
@@ -106,6 +106,10 @@ public extension DoseChart {
3030
// Grid lines
3131
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
3232

3333
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
34-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.carbTint, linesWidth: 1.0)
34+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.insulinTint, linesWidth: 1.0)
3535
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
3636
+
3737
// 0-line
@@ -46,15 +46,15 @@ index ad30019..1988794 100644
4646
yAxisLayer,
4747
zeroGuidelineLayer,
4848
diff --git a/LoopKit/LoopKitUI/Charts/IOBChart.swift b/LoopKit/LoopKitUI/Charts/IOBChart.swift
49-
index 54d0921..5850f73 100644
49+
index 54d0921..aff259f 100644
5050
--- a/LoopKit/LoopKitUI/Charts/IOBChart.swift
5151
+++ b/LoopKit/LoopKitUI/Charts/IOBChart.swift
5252
@@ -66,6 +66,10 @@ public extension IOBChart {
5353
// Grid lines
5454
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
5555

5656
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
57-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.carbTint, linesWidth: 1.0)
57+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.insulinTint, linesWidth: 1.0)
5858
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
5959
+
6060
// 0-line
@@ -69,15 +69,15 @@ index 54d0921..5850f73 100644
6969
yAxisLayer,
7070
zeroGuidelineLayer,
7171
diff --git a/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift b/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
72-
index bd786fe..ce593b7 100644
72+
index bd786fe..0dcf20c 100644
7373
--- a/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
7474
+++ b/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
7575
@@ -170,6 +170,10 @@ extension PredictedGlucoseChart {
7676
// Grid lines
7777
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
7878

7979
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
80-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.carbTint, linesWidth: 1.0)
80+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.glucoseTint, linesWidth: 1.0)
8181
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
8282
+
8383
let circles = ChartPointsScatterCirclesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: glucosePoints, displayDelay: 0, itemSize: CGSize(width: 4, height: 4), itemFillColor: colors.glucoseTint, optimized: true)

‎now_marker/main_now_marker.patch renamed to ‎now_line/main_now_line.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Submodule Loop c6b058b..9ea23ae:
1+
Submodule Loop c6b058b..758fe1c:
22
diff --git a/Loop/LoopUI/Charts/COBChart.swift b/Loop/LoopUI/Charts/COBChart.swift
33
index b8fbfd8f..a96c1f4f 100644
44
--- a/Loop/LoopUI/Charts/COBChart.swift
@@ -23,15 +23,15 @@ index b8fbfd8f..a96c1f4f 100644
2323
yAxisLayer,
2424
cobChartCache?.highlightLayer,
2525
diff --git a/Loop/LoopUI/Charts/DoseChart.swift b/Loop/LoopUI/Charts/DoseChart.swift
26-
index a2558511..5169c938 100644
26+
index a2558511..eac4c164 100644
2727
--- a/Loop/LoopUI/Charts/DoseChart.swift
2828
+++ b/Loop/LoopUI/Charts/DoseChart.swift
2929
@@ -106,6 +106,10 @@ public extension DoseChart {
3030
// Grid lines
3131
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
3232

3333
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
34-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.carbTintColor, linesWidth: 1.0)
34+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.insulinTintColor, linesWidth: 1.0)
3535
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
3636
+
3737
// 0-line
@@ -46,15 +46,15 @@ index a2558511..5169c938 100644
4646
yAxisLayer,
4747
zeroGuidelineLayer,
4848
diff --git a/Loop/LoopUI/Charts/IOBChart.swift b/Loop/LoopUI/Charts/IOBChart.swift
49-
index a78699ea..fbe57792 100644
49+
index a78699ea..cb08b0c8 100644
5050
--- a/Loop/LoopUI/Charts/IOBChart.swift
5151
+++ b/Loop/LoopUI/Charts/IOBChart.swift
5252
@@ -66,6 +66,10 @@ public extension IOBChart {
5353
// Grid lines
5454
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
5555

5656
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
57-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.carbTintColor, linesWidth: 1.0)
57+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.insulinTintColor, linesWidth: 1.0)
5858
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
5959
+
6060
// 0-line
@@ -69,15 +69,15 @@ index a78699ea..fbe57792 100644
6969
yAxisLayer,
7070
zeroGuidelineLayer,
7171
diff --git a/Loop/LoopUI/Charts/PredictedGlucoseChart.swift b/Loop/LoopUI/Charts/PredictedGlucoseChart.swift
72-
index 01a343d0..4f9d5457 100644
72+
index 01a343d0..6ceaaa1a 100644
7373
--- a/Loop/LoopUI/Charts/PredictedGlucoseChart.swift
7474
+++ b/Loop/LoopUI/Charts/PredictedGlucoseChart.swift
7575
@@ -170,6 +170,10 @@ extension PredictedGlucoseChart {
7676
// Grid lines
7777
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
7878

7979
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
80-
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.carbTintColor, linesWidth: 1.0)
80+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: UIColor.glucoseTintColor, linesWidth: 1.0)
8181
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
8282
+
8383
let circles = ChartPointsScatterCirclesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: glucosePoints, displayDelay: 0, itemSize: CGSize(width: 4, height: 4), itemFillColor: colors.glucoseTint, optimized: true)

0 commit comments

Comments
 (0)