Просмотр исходного кода

Merge pull request #154 from dnzxy/fix-live-activity-widget

Fix #152 Live Activity Widget Items Reverting to Default
polscm32 1 год назад
Родитель
Сommit
868136ba29

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

@@ -115,7 +115,7 @@ extension LiveActivityAttributes.ContentState {
                 overrideDate: override?.date ?? Date(),
                 overrideDuration: override?.duration ?? 0,
                 overrideTarget: override?.target ?? 0,
-                widgetItems: widgetItems ?? LiveActivityAttributes.LiveActivityItem.defaultItems
+                widgetItems: widgetItems ?? [] // set empty array here to silence compiler; this can never be nil
             )
 
         case .simple:

+ 3 - 0
FreeAPS/Sources/Services/LiveActivity/LiveActivityBridge.swift

@@ -149,6 +149,9 @@ final class LiveActivityBridge: Injectable, ObservableObject, SettingsObserver {
         }
         var content: LiveActivityAttributes.ContentState?
 
+        widgetItems = UserDefaults.standard.loadLiveActivityOrderFromUserDefaults() ?? LiveActivityAttributes
+            .LiveActivityItem.defaultItems
+
         if let determination = update as? DeterminationData {
             content = LiveActivityAttributes.ContentState(
                 new: latestGlucose,