Skip to content

Plot glucose on the top chart layer so carbs and boluses no longer hide it #1470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dnzxy merged 3 commits into from
Sep 7, 2026
+22 −10
Merged

Plot glucose on the top chart layer so carbs and boluses no longer hide it #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abc2222
Plot glucose on the top chart layer so carbs and boluses no longer hi…
trioneer-dev Sep 5, 2026
300db0f
l18n
MikePlante1 Sep 7, 2026
78515a0
Merge branch 'dev' into fix/1451-glucose-on-top
MikePlante1 Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Trio/Sources/Localizations/Main/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36762,6 +36762,10 @@
}
}
},
"Alert Identifier" : {
"comment" : "The name of the parameter for the alert identifier in the StopCriticalAlertIntent.",
"isCommentAutoGenerated" : true
},
"Alert Sound" : {
"comment" : "A section header for the alert sound settings.",
"localizations" : {
Expand Down Expand Up @@ -179301,6 +179305,10 @@
}
}
},
"Manager Identifier" : {
"comment" : "The title of the parameter for the manager identifier in the StopCriticalAlertIntent.",
"isCommentAutoGenerated" : true
},
"Manual" : {
"comment" : "Manual Bolus",
"localizations" : {
Expand Down Expand Up @@ -263407,6 +263415,10 @@
}
}
},
"Stop Trio Alarm" : {
"comment" : "Title of the intent that stops a Trio critical-alert alarm.",
"isCommentAutoGenerated" : true
},
"Stopped Override successfully." : {
"comment" : "Stopped Override successfully",
"localizations" : {
Expand Down
20 changes: 10 additions & 10 deletions Trio/Sources/Modules/Home/View/Chart/MainChartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,16 +929,6 @@ extension MainChartCanvas {
viewContext: context
)

GlucoseChartView(
glucoseData: glucose,
units: state.units,
highGlucose: state.highGlucose,
lowGlucose: state.lowGlucose,
currentGlucoseTarget: state.currentGlucoseTarget,
isSmoothingEnabled: state.isSmoothingEnabled,
glucoseColorScheme: state.glucoseColorScheme
)

InsulinView(
glucoseData: glucose,
insulinData: insulin,
Expand All @@ -964,6 +954,16 @@ extension MainChartCanvas {
forecastDisplayType: state.forecastDisplayType,
lastDeterminationDate: state.determinationsFromPersistence.first?.deliverAt ?? .distantPast
)

GlucoseChartView(
glucoseData: glucose,
units: state.units,
highGlucose: state.highGlucose,
lowGlucose: state.lowGlucose,
currentGlucoseTarget: state.currentGlucoseTarget,
isSmoothingEnabled: state.isSmoothingEnabled,
glucoseColorScheme: state.glucoseColorScheme
)
}
.frame(width: canvasWidth, height: mainHeight)
.chartXScale(domain: windowStart ... windowEnd)
Expand Down
Loading