Skip to content

Commit 6605276

Browse files
marionbarkermarionbarker
committed
Merge branch 'main' into testflight_expiration_warning
2 parents 5301e43 + 54a9aba commit 6605276

11 files changed

+4633
-195
lines changed

‎2002/2023-09-23-dev_2002.patch

Lines changed: 1267 additions & 0 deletions
Large diffs are not rendered by default.

‎2002/2023-08-16-dev_2002.patch renamed to ‎2002/archive/2023-08-16-dev_2002.patch

File renamed without changes.

‎2002/dev_2002.patch renamed to ‎2002/archive/2023-09-07-dev_2002.patch

File renamed without changes.

‎2002/archive/main_2002_230911.patch

Lines changed: 950 additions & 0 deletions
Large diffs are not rendered by default.

‎2002/archive/old_dev_2002.patch

Lines changed: 1275 additions & 0 deletions
Large diffs are not rendered by default.

‎2002/main_2002.patch

Lines changed: 519 additions & 195 deletions
Large diffs are not rendered by default.

‎customtypeone_looppatches/2023-10-01_dev_cto_no_switcher_no_neg_iob.patch

Lines changed: 386 additions & 0 deletions
Large diffs are not rendered by default.

‎dexcom_upload_readings/dev_g6g7_upload_readings.patch

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Submodule CGMBLEKit 995e861..204735f:
2+
diff --git a/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift b/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
3+
index c641180..80f7cdb 100644
4+
--- a/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
5+
+++ b/CGMBLEKit/CGMBLEKit/TransmitterManagerState.swift
6+
@@ -26,7 +26,7 @@ public struct TransmitterManagerState: RawRepresentable, Equatable {
7+
8+
public init(
9+
transmitterID: String,
10+
- shouldSyncToRemoteService: Bool = false,
11+
+ shouldSyncToRemoteService: Bool = true,
12+
transmitterStartDate: Date? = nil,
13+
sensorStartOffset: UInt32? = nil
14+
) {
15+
Submodule G7SensorKit 83d8aaf..e700cf1:
16+
diff --git a/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift b/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
17+
index 948b02f..95538dd 100644
18+
--- a/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
19+
+++ b/G7SensorKit/G7SensorKit/G7CGMManager/G7CGMManagerState.swift
20+
@@ -18,7 +18,7 @@ public struct G7CGMManagerState: RawRepresentable, Equatable {
21+
public var latestReading: G7GlucoseMessage?
22+
public var latestReadingTimestamp: Date?
23+
public var latestConnect: Date?
24+
- public var uploadReadings: Bool = false
25+
+ public var uploadReadings: Bool = true
26+
27+
init() {
28+
}
29+
@@ -31,7 +31,7 @@ public struct G7CGMManagerState: RawRepresentable, Equatable {
30+
}
31+
self.latestReadingTimestamp = rawValue["latestReadingTimestamp"] as? Date
32+
self.latestConnect = rawValue["latestConnect"] as? Date
33+
- self.uploadReadings = rawValue["uploadReadings"] as? Bool ?? false
34+
+ self.uploadReadings = rawValue["uploadReadings"] as? Bool ?? true
35+
}
36+
37+
public var rawValue: RawValue {
38+
diff --git a/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift b/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
39+
index 93bff10..5d4d452 100644
40+
--- a/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
41+
+++ b/G7SensorKit/G7SensorKitUI/Views/G7SettingsViewModel.swift
42+
@@ -23,7 +23,7 @@ class G7SettingsViewModel: ObservableObject {
43+
@Published private(set) var activatedAt: Date?
44+
@Published private(set) var lastConnect: Date?
45+
@Published private(set) var latestReadingTimestamp: Date?
46+
- @Published var uploadReadings: Bool = false {
47+
+ @Published var uploadReadings: Bool = true {
48+
didSet {
49+
cgmManager.uploadReadings = uploadReadings
50+
}

‎dexcom_upload_readings/g6g7_upload_readings.patch renamed to ‎dexcom_upload_readings/main_g6g7_upload_readings.patch

File renamed without changes.

‎now_line/dev_now_line.patch

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Submodule LoopKit 7b6be31..bd3f5db:
2+
diff --git a/LoopKit/LoopKitUI/Charts/COBChart.swift b/LoopKit/LoopKitUI/Charts/COBChart.swift
3+
index 2bbae1e..6cbdbde 100644
4+
--- a/LoopKit/LoopKitUI/Charts/COBChart.swift
5+
+++ b/LoopKit/LoopKitUI/Charts/COBChart.swift
6+
@@ -63,6 +63,10 @@ public extension COBChart {
7+
// Grid lines
8+
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
9+
10+
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
11+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.carbTint, linesWidth: 1.0)
12+
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
13+
+
14+
if gestureRecognizer != nil {
15+
cobChartCache = ChartPointsTouchHighlightLayerViewCache(
16+
xAxisLayer: xAxisLayer,
17+
@@ -76,6 +80,7 @@ public extension COBChart {
18+
19+
let layers: [ChartLayer?] = [
20+
gridLayer,
21+
+ currentTimeLayer,
22+
xAxisLayer,
23+
yAxisLayer,
24+
cobChartCache?.highlightLayer,
25+
diff --git a/LoopKit/LoopKitUI/Charts/DoseChart.swift b/LoopKit/LoopKitUI/Charts/DoseChart.swift
26+
index ad30019..6f34555 100644
27+
--- a/LoopKit/LoopKitUI/Charts/DoseChart.swift
28+
+++ b/LoopKit/LoopKitUI/Charts/DoseChart.swift
29+
@@ -106,6 +106,10 @@ public extension DoseChart {
30+
// Grid lines
31+
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
32+
33+
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
34+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.insulinTint, linesWidth: 1.0)
35+
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
36+
+
37+
// 0-line
38+
let dummyZeroChartPoint = ChartPoint(x: ChartAxisValueDouble(0), y: ChartAxisValueDouble(0))
39+
let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
40+
@@ -130,6 +134,7 @@ public extension DoseChart {
41+
42+
let layers: [ChartLayer?] = [
43+
gridLayer,
44+
+ currentTimeLayer,
45+
xAxisLayer,
46+
yAxisLayer,
47+
zeroGuidelineLayer,
48+
diff --git a/LoopKit/LoopKitUI/Charts/IOBChart.swift b/LoopKit/LoopKitUI/Charts/IOBChart.swift
49+
index 54d0921..aff259f 100644
50+
--- a/LoopKit/LoopKitUI/Charts/IOBChart.swift
51+
+++ b/LoopKit/LoopKitUI/Charts/IOBChart.swift
52+
@@ -66,6 +66,10 @@ public extension IOBChart {
53+
// Grid lines
54+
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
55+
56+
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
57+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.insulinTint, linesWidth: 1.0)
58+
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
59+
+
60+
// 0-line
61+
let dummyZeroChartPoint = ChartPoint(x: ChartAxisValueDouble(0), y: ChartAxisValueDouble(0))
62+
let zeroGuidelineLayer = ChartPointsViewsLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: [dummyZeroChartPoint], viewGenerator: {(chartPointModel, layer, chart) -> UIView? in
63+
@@ -90,6 +94,7 @@ public extension IOBChart {
64+
65+
let layers: [ChartLayer?] = [
66+
gridLayer,
67+
+ currentTimeLayer,
68+
xAxisLayer,
69+
yAxisLayer,
70+
zeroGuidelineLayer,
71+
diff --git a/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift b/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
72+
index bd786fe..0dcf20c 100644
73+
--- a/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
74+
+++ b/LoopKit/LoopKitUI/Charts/PredictedGlucoseChart.swift
75+
@@ -170,6 +170,10 @@ extension PredictedGlucoseChart {
76+
// Grid lines
77+
let gridLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: guideLinesLayerSettings, axisValuesX: Array(xAxisValues.dropFirst().dropLast()), axisValuesY: yAxisValues)
78+
79+
+ let currentTimeValue = ChartAxisValueDate(date: Date(), formatter: { _ in "" })
80+
+ let currentTimeSettings = ChartGuideLinesLayerSettings(linesColor: colors.glucoseTint, linesWidth: 1.0)
81+
+ let currentTimeLayer = ChartGuideLinesForValuesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, settings: currentTimeSettings, axisValuesX: [currentTimeValue], axisValuesY: [])
82+
+
83+
let circles = ChartPointsScatterCirclesLayer(xAxis: xAxisLayer.axis, yAxis: yAxisLayer.axis, chartPoints: glucosePoints, displayDelay: 0, itemSize: CGSize(width: 4, height: 4), itemFillColor: colors.glucoseTint, optimized: true)
84+
85+
var alternatePrediction: ChartLayer?
86+
@@ -208,6 +212,7 @@ extension PredictedGlucoseChart {
87+
88+
let layers: [ChartLayer?] = [
89+
gridLayer,
90+
+ currentTimeLayer,
91+
targetsLayer,
92+
xAxisLayer,
93+
yAxisLayer,

0 commit comments

Comments
 (0)