Merge pull request #1470 from trioneer-dev/fix/1451-glucose-on-top

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

Author: dnzxy

Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -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" : {
@@ -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" : {
@@ -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" : {

Trio/Sources/Modules/Home/View/Chart/MainChartView.swift

@@ -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,
@@ -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)