Fiddling around to add a Dynamic Island chart

FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -30,7 +30,7 @@
       },
       {
         "package": "SwiftCharts",
-        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts",
+        "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts.git",
         "state": {
           "branch": "master",
           "revision": "c354c1945bb35a1f01b665b22474f6db28cba4a2",

FreeAPS/Sources/Services/LiveActivity/LiveActitiyShared.swift

@@ -7,6 +7,8 @@ struct LiveActivityAttributes: ActivityAttributes {
         let trendSystemImage: String?
         let change: String
         let date: Date
+        let sixHourReadingsGlucose: [Decimal?]
+        let sixHourReadingsDate: [Date?]
     }
 
     let startDate: Date

FreeAPS/Sources/Services/LiveActivity/LiveActivityBridge.swift

@@ -21,7 +21,7 @@ extension LiveActivityAttributes.ContentState {
             .string(from: mmol ? value.asMmolL as NSNumber : NSNumber(value: value))!
     }
 
-    init?(new bg: BloodGlucose, prev: BloodGlucose?, mmol: Bool) {
+    init?(new bg: BloodGlucose, prev: BloodGlucose?, mmol: Bool, sixHourReadings: [BloodGlucose]) {
         guard let glucose = bg.glucose,
               bg.dateString.timeIntervalSinceNow > -TimeInterval(minutes: 6)
         else {
@@ -62,7 +62,20 @@ extension LiveActivityAttributes.ContentState {
             Self.formatGlucose(glucose - $0, mmol: mmol, forceSign: true)
         }) ?? ""
 
-        self.init(bg: formattedBG, trendSystemImage: trendString, change: change, date: bg.dateString)
+        let sixHourReadingsGlucose: [Decimal?]
+        let sixHourReadingsDate: [Date?]
+
+        sixHourReadingsGlucose = sixHourReadings.map({ mmol ? $0.glucose?.asMmolL : Decimal(Double($0.glucose ?? 0)) })
+        sixHourReadingsDate = sixHourReadings.map(\.dateString)
+
+        self.init(
+            bg: formattedBG,
+            trendSystemImage: trendString,
+            change: change,
+            date: bg.dateString,
+            sixHourReadingsGlucose: sixHourReadingsGlucose,
+            sixHourReadingsDate: sixHourReadingsDate
+        )
     }
 }
 
@@ -97,6 +110,7 @@ extension LiveActivityAttributes.ContentState {
 
     private var currentActivity: ActiveActivity?
     private var latestGlucose: BloodGlucose?
+    private var sixHourReadings: [BloodGlucose]?
 
     init(resolver: Resolver) {
         injectServices(resolver)
@@ -189,15 +203,22 @@ extension LiveActivityBridge: GlucoseObserver {
         // backfill latest glucose if contained in this update
         if glucose.count > 1 {
             latestGlucose = glucose[glucose.count - 2]
+
+            if glucose.count < 73 {
+                sixHourReadings = glucose.dropLast()
+            } else {
+                sixHourReadings = glucose.dropLast().suffix(72)
+            }
         }
         defer {
             self.latestGlucose = glucose.last
         }
 
-        guard let bg = glucose.last, let content = LiveActivityAttributes.ContentState(
+        guard let bg = glucose.last, let historicReadings = sixHourReadings, let content = LiveActivityAttributes.ContentState(
             new: bg,
             prev: latestGlucose,
-            mmol: settings.units == .mmolL
+            mmol: settings.units == .mmolL,
+            sixHourReadings: historicReadings
         ) else {
             // no bg or value stale. Don't update the activity if there already is one, just let it turn stale so that it can still be used once current bg is available again
             return

LiveActivity/LiveActivity.swift

@@ -1,4 +1,5 @@
 import ActivityKit
+import Charts
 import SwiftUI
 import WidgetKit
 
@@ -41,6 +42,21 @@ struct LiveActivity: Widget {
         }
     }
 
+    @ViewBuilder func chart(context: ActivityViewContext<LiveActivityAttributes>) -> some View {
+        if context.isStale {
+            Text("--")
+        } else {
+            Chart {
+                ForEach(context.state.sixHourReadingsGlucose.indices, id: \.self) { index in
+                    LineMark(
+                        x: .value("Time", context.state.sixHourReadingsDate[index] ?? Date()),
+                        y: .value("Value", context.state.sixHourReadingsGlucose[index] ?? 0)
+                    ).foregroundStyle(Color(red: 0.435, green: 0.812, blue: 0.592))
+                }
+            }
+        }
+    }
+
     var body: some WidgetConfiguration {
         ActivityConfiguration(for: LiveActivityAttributes.self) { context in
             // Lock screen/banner UI goes here
@@ -74,8 +90,12 @@ struct LiveActivity: Widget {
                     changeLabel(context: context).font(.title).padding(.trailing, 5)
                 }
                 DynamicIslandExpandedRegion(.bottom) {
-                    updatedLabel(context: context).font(.caption).foregroundStyle(Color.secondary)
-                        .padding(.bottom, 5)
+                    VStack {
+                        updatedLabel(context: context).font(.caption).foregroundStyle(Color.secondary)
+                            .padding(.bottom, 5)
+                        Spacer()
+                        chart(context: context)
+                    }
                 }
             } compactLeading: {
                 HStack(spacing: 1) {
@@ -100,7 +120,18 @@ private extension LiveActivityAttributes {
 
 private extension LiveActivityAttributes.ContentState {
     static var test: LiveActivityAttributes.ContentState {
-        LiveActivityAttributes.ContentState(bg: "100", trendSystemImage: "arrow.right", change: "+2", date: Date())
+        LiveActivityAttributes.ContentState(
+            bg: "100",
+            trendSystemImage: "arrow.right",
+            change: "+2",
+            date: Date(),
+            sixHourReadingsGlucose: [90, 95, 100],
+            sixHourReadingsDate: [
+                Calendar.current.date(byAdding: .minute, value: -15, to: Date()),
+                Calendar.current.date(byAdding: .minute, value: -10, to: Date()),
+                Calendar.current.date(byAdding: .minute, value: -5, to: Date())
+            ]
+        )
     }
 }