Merge branch 'trio/live-activity-redesign' of github.com:dnzxy/Open-iAPS into trio/live-activity-redesign

FreeAPS/Sources/Services/LiveActivity/Data/DataManager.swift

@@ -59,7 +59,7 @@ extension LiveActivityBridge {
             key: "date",
             ascending: false,
             fetchLimit: 1,
-            propertiesToFetch: ["enabled"]
+            propertiesToFetch: ["enabled", "name"]
         )
 
         guard let overrideResults = results as? [[String: Any]] else {
@@ -68,7 +68,7 @@ extension LiveActivityBridge {
 
         await context.perform {
             self.isOverridesActive = overrideResults.first.map {
-                OverrideData(isActive: $0["enabled"] as? Bool ?? false)
+                OverrideData(isActive: $0["enabled"] as? Bool ?? false, overrideName: $0["name"] as? String ?? "Override")
             }
         }
     }

FreeAPS/Sources/Services/LiveActivity/Data/OverrideData.swift

@@ -2,4 +2,5 @@ import Foundation
 
 struct OverrideData {
     let isActive: Bool
+    let overrideName: String
 }

FreeAPS/Sources/Services/LiveActivity/LiveActitiyAttributes.swift

@@ -32,6 +32,7 @@ struct LiveActivityAttributes: ActivityAttributes {
         let iob: Decimal
         let unit: String
         let isOverrideActive: Bool
+        let overrideName: String
     }
 
     let startDate: Date

FreeAPS/Sources/Services/LiveActivity/LiveActivityAttributes+Helper.swift

@@ -103,7 +103,8 @@ extension LiveActivityAttributes.ContentState {
                 cob: Decimal(determination?.cob ?? 0),
                 iob: determination?.iob ?? 0 as Decimal,
                 unit: settings.units.rawValue,
-                isOverrideActive: override?.isActive ?? false
+                isOverrideActive: override?.isActive ?? false,
+                overrideName: override?.overrideName ?? "Override"
             )
 
         case .simple:

LiveActivity/LiveActivity.swift

@@ -101,6 +101,21 @@ struct LiveActivityView: View {
                 LiveActivityChartView(context: context, additionalState: detailedViewState)
                     .frame(maxWidth: UIScreen.main.bounds.width * 0.9)
                     .frame(height: 80)
+                    .overlay(alignment: .topTrailing) {
+                        if detailedViewState.isOverrideActive {
+                            HStack {
+                                Text("\(detailedViewState.overrideName)")
+                                    .font(.footnote)
+                                    .fontWeight(.bold)
+                                    .foregroundStyle(.white)
+                            }
+                            .padding(6)
+                            .background {
+                                RoundedRectangle(cornerRadius: 10)
+                                    .fill(Color.purple.opacity(colorScheme == .dark ? 0.6 : 0.8))
+                            }
+                        }
+                    }
 
                 HStack {
                     ForEach(context.state.itemOrder, id: \.self) { item in