Change setting order; add glucose icon coloring logic based on range

FreeAPS/Sources/Modules/CGM/View/CGMRootView.swift

@@ -54,17 +54,15 @@ extension CGM {
                         Text("Calibrations").navigationLink(to: .calibrations, from: self)
                     }
                     Section(header: Text("Calendar")) {
-                        Toggle("Create events in calendar", isOn: $state.createCalendarEvents)
+                        Toggle("Create Events in Calendar", isOn: $state.createCalendarEvents)
                         if state.calendarIDs.isNotEmpty {
                             Picker("Calendar", selection: $state.currentCalendarID) {
                                 ForEach(state.calendarIDs, id: \.self) {
                                     Text($0).tag($0)
                                 }
                             }
+                            Toggle("Display Emojis as Labels", isOn: $state.displayCalendarEmojis)
                             Toggle("Display IOB and COB", isOn: $state.displayCalendarIOBandCOB)
-                            if state.displayCalendarIOBandCOB {
-                                Toggle("Display Emojis", isOn: $state.displayCalendarEmojis)
-                            }
                         }
                     }
 

FreeAPS/Sources/Services/Calendar/CalendarManager.swift

@@ -63,7 +63,9 @@ final class BaseCalendarManager: CalendarManager, Injectable {
         // create an event now
         let event = EKEvent(eventStore: eventStore)
 
-        let glucoseIcon = "🟢" // TODO: change icon color on BG range
+        var glucoseIcon = "🟢"
+        glucoseIcon = Double(glucoseValue) <= Double(settingsManager.settings.low) ? "🔴" : glucoseIcon
+        glucoseIcon = Double(glucoseValue) >= Double(settingsManager.settings.high) ? "🟠" : glucoseIcon
 
         let glucoseText = glucoseFormatter
             .string(from: Double(
@@ -83,14 +85,14 @@ final class BaseCalendarManager: CalendarManager, Injectable {
 
         var glucoseDisplayText = settingsManager.settings.displayCalendarEmojis ? glucoseIcon + " " : ""
         glucoseDisplayText += glucoseText + " " + directionText + " " + deltaText
-        
+
         var iobDisplayText = ""
         var cobDisplayText = ""
 
         if settingsManager.settings.displayCalendarIOBandCOB {
             if settingsManager.settings.displayCalendarEmojis {
                 iobDisplayText += "💉"
-                cobDisplayText += "🍞"
+                cobDisplayText += "🥨"
             } else {
                 iobDisplayText += "IOB:"
                 cobDisplayText += "COB:"