Configurable Live Activity Grid Slots + Full InfoType Snapshot Coverage#547
Merged
bjorkert merged 37 commits intoloopandlearn:live-activityfrom Mar 15, 2026
Merged
Conversation
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- staleDate on every ActivityContent now tracks the renewal deadline, so the system shows Apple's built-in stale indicator if renewal fails - Add laRenewalFailed StorageValue; set on Activity.request() failure, cleared on any successful LA start - Observe willEnterForegroundNotification: retry startIfNeeded() if a previous renewal attempt failed - New-first renewal order: request the replacement LA before ending the old one — if the request throws the existing LA stays alive so the user keeps live data until the system kills it at the 8-hour mark Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Restore renewalThreshold to 7.5 * 3600 (testing complete) - Add showRenewalOverlay: Bool to GlucoseSnapshot (Codable, default false) - GlucoseSnapshotBuilder sets it true when now >= laRenewBy - 1800 (30 minutes before the renewal deadline) - Lock screen: 60% gray overlay with "Tap to update" centered in white, layered above the existing isNotLooping overlay - DI expanded: RenewalOverlayView applied to leading/trailing/bottom regions; "Tap to update" text shown on the bottom region only - showRenewalOverlay resets to false automatically on renewal since laRenewBy is updated and the next snapshot rebuild clears the flag Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Overlay rendering:
- Replace Group{if condition{ZStack{RoundedRectangle...}}} with a
permanently-present ZStack toggled via .opacity(). The Group/if
pattern causes SwiftUI sizing ambiguity when the condition transitions
from false→true inside an .overlay(), producing a zero-size result.
The .opacity() approach keeps a stable view hierarchy.
- Same fix applied to RenewalOverlayView used on DI expanded regions.
Foreground restart:
- handleForeground() was calling startIfNeeded(), which finds the
still-alive (failed-to-renew) LA in Activity.activities and reuses
it, doing nothing useful. Fixed to manually nil out current, cancel
all tasks, await activity.end(.immediate), then startFromCurrentState().
Overlay timing:
- Changed warning window from 30 min (1800s) to 20 min (1200s) before
the renewal deadline, matching the intended test cadence.
Logging:
- handleForeground: log on every foreground event with laRenewalFailed value
- renewIfNeeded: log how many seconds past the deadline when firing
- GlucoseSnapshotBuilder: log when overlay activates with seconds to deadline
- performRefresh: log when sending an update with the overlay visible
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Normal renewal path (renewIfNeeded success): - Build a fresh snapshot with showRenewalOverlay: false for the new LA's initial content — it has a new deadline so the overlay should never be visible from the first frame. - Save that fresh snapshot to GlucoseSnapshotStore so the next duplicate check has the correct baseline and doesn't suppress the first real BG update. Foreground restart path (handleForeground): - Zero laRenewBy before calling startFromCurrentState() so GlucoseSnapshotBuilder computes showRenewalOverlay = false for the seed snapshot. startIfNeeded() then sets the new deadline after the request succeeds. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
With renewalThreshold=20min and the hardcoded 1200s warning window, renewBy-1200 = start, so showRenewalOverlay is always true from the moment the LA begins. Extract a named renewalWarning constant (5 min for testing) so the warning window is always less than the threshold. The builder now reads LiveActivityManager.renewalWarning instead of a hardcoded literal. Production values to restore before merging: renewalThreshold = 7.5 * 3600 renewalWarning = 20 * 60 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ynchronously APNSClient was missing showRenewalOverlay from the push payload, so background APNs updates never delivered the overlay flag to the extension — only foreground direct ActivityKit updates did. In handleForeground, laRenewBy is now zeroed synchronously before spawning the async end/restart Task. This means any snapshot built between the foreground notification and the new LA start (e.g. from viewDidAppear's startFromCurrentState) computes showRenewalOverlay = false rather than reading the stale expired deadline. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…e path Reset laRenewBy and laRenewalFailed synchronously before tearing down the failed LA, then await activity.end() before calling startFromCurrentState(). This guarantees Activity.activities is clear when startIfNeeded() runs, so it takes the fresh-request path and writes a new laRenewBy. startFromCurrentState rebuilds the snapshot with showRenewalOverlay=false (laRenewBy=0), saves it to the store, then startIfNeeded uses that clean snapshot as the seed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- SettingsMenuView: rename "APN" menu entry to "Live Activity" - Storage: add laEnabled: Bool StorageValue (default false) - APNSettingsView: on/off toggle bound to laEnabled; APNs key fields and Restart button shown only when enabled; disabling immediately ends any running LA - LiveActivityManager: - forceRestart() (@mainactor) ends all running activities, resets laRenewBy and laRenewalFailed, then calls startFromCurrentState() - laEnabled guard added to startFromCurrentState(), refreshFromCurrentState(), handleForeground(), and handleDidBecomeActive() - didBecomeActiveNotification observer calls forceRestart() on every foreground transition when laEnabled is true - RestartLiveActivityIntent: AppIntent + ForegroundContinuableIntent; sets laEnabled, validates credentials, opens settings deep link if missing, otherwise calls forceRestart() in foreground; LoopFollowAppShortcuts exposes the intent with Siri phrase Note: RestartLiveActivityIntent.swift must be added to the app target in Xcode. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…ctivityIntent - LiveActivityManager: handleDidBecomeActive() calls @mainactor forceRestart() via Task { @mainactor in ... } to satisfy Swift concurrency isolation - RestartLiveActivityIntent: drop ForegroundContinuableIntent — continueInForeground() was renamed to continueInForeground(_:alwaysConfirm:) in the iOS 26 SDK and requires iOS 26+; the didBecomeActiveNotification observer handles restart when the app comes to foreground, making explicit continuation unnecessary Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
continueInForeground(_:alwaysConfirm:) is iOS 26+ only. On earlier versions, forceRestart() runs directly via the existing background audio session — no foreground continuation needed. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…rceRestart forceRestart() was killing the LA that the RestartLiveActivityIntent had just created, because continueInForeground() triggers didBecomeActive. startFromCurrentState() reuses an existing active LA via startIfNeeded() and only creates one if none is present — no destructive race. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
APNSettingsView: - "Restart Live Activity" button shows "Live Activity Restarted" for 2 seconds and disables itself during that window to prevent double-taps - Toggle observes Storage.shared.laEnabled via onReceive so it reflects changes made externally (e.g. by the App Intent / Shortcuts) LiveActivityManager: - handleDidBecomeActive posts .liveActivityDidForeground after startFromCurrentState - Notification.Name.liveActivityDidForeground extension defined here MainViewController: - Observes .liveActivityDidForeground; navigates to Snoozer tab if an alarm is currently active, otherwise navigates to tab 0 (Home) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…latest data The 5-second debounce on refreshFromCurrentState means a BG update arriving while the app is foreground won't reach the LA before the user returns to the lock screen. When the debounce fires in background, isForeground=false so the direct ActivityKit update is skipped. Fix: observe willResignActiveNotification, cancel the pending debounce, and immediately push the latest snapshot via direct ActivityKit update while the app is still foreground-active. The APNs push is also sent as a backup. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Compact: - Trailing now shows delta instead of trend arrow (leading already showed BG) Expanded leading: - Large BG value at top - Second row: trend arrow, delta, and "Proj: X" in smaller text below Expanded trailing: - IOB and COB (moved from bottom) Expanded bottom: - "Updated at: HH:mm" (moved from trailing) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Proj label now uses same size (13), weight (semibold), and opacity (0.9) as the delta text beside it - Added 6pt trailing padding to the expanded DI trailing VStack so the IOB decimal is not clipped by the Dynamic Island edge Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Per maintainer preference, the APNs credentials (Key ID and Key) remain in their own "APN" settings screen. A new separate "Live Activity" settings screen contains the enable/disable toggle and the Restart Live Activity button. - APNSettingsView: restored to Key ID + Key only (no toggle or restart button) - LiveActivitySettingsView: new view with laEnabled toggle and restart button (with 2-second confirmation feedback); toggle stays in sync via onReceive - SettingsMenuView: "APN" entry restored; new "Live Activity" entry added with dot.radiowaves icon; Sheet.liveActivity case wired to LiveActivitySettingsView Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…l PR loopandlearn#539) Resolves conflicts between our branch and upstream commits: - 32a6dd0: Mac Catalyst build fix (#if !targetEnvironment(macCatalyst) guards) - e737bce: Live Activity auto-renewal PR (loopandlearn#539) Our additions are preserved on top: - laEnabled toggle with Storage backing - forceRestart() for button and AppIntent - handleDidBecomeActive / handleWillResignActive observers - willResignActive flush to ensure lock screen shows latest data - liveActivityDidForeground notification for tab navigation - Notification.Name extension Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- widgetURL on lock screen LA → opens app via loopfollow://la-tap - Link views in expanded DI regions → same URL on tap - AppDelegate.application(_:open:) handles loopfollow://la-tap and posts .liveActivityDidForeground so MainViewController navigates to Snoozer (if alarm active) or Home tab — fires only on LA/DI taps, not every foreground - Notification.Name.liveActivityDidForeground moved outside #if macCatalyst so AppDelegate can reference it unconditionally - handleDidBecomeActive no longer posts .liveActivityDidForeground (was firing on every app foreground, not just LA taps) - attachStateObserver: .dismissed state (user swipe) sets laEnabled = false so the LA does not auto-restart when the app foregrounds - LiveActivitySettingsView: toggling ON calls startFromCurrentState() Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Adds endOnTerminate() to LiveActivityManager — blocks up to 3 s using Task.detached + DispatchSemaphore so the async activity.end() completes before the process exits. Called from applicationWillTerminate so the LA clears from the lock screen immediately on force-quit. laEnabled is preserved so the LA restarts correctly on next launch. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…l dismiss - Manual LA swipe-away sets dismissedByUser (in-memory) instead of laEnabled = false, preserving the user's preference - startFromCurrentState() guards on !dismissedByUser so the LA does not auto-restart on foreground, BG refresh, or handleDidBecomeActive - forceRestart() clears dismissedByUser before starting, so the Restart button and App Intent both work as the explicit re-enable mechanism - Toggle ON in settings calls forceRestart() (clears flag + starts) instead of startFromCurrentState() which would have been blocked by the flag - dismissedByUser resets to false on app relaunch (in-memory only), so a kill + relaunch starts the LA fresh as expected Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
navigateOnLAForeground now checks tabBarController.presentedViewController and dismisses it before switching to the target tab, matching the existing pattern used elsewhere in MainViewController for the same scenario. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Navigation fix: - loopfollow://la-tap URL can arrive before applicationDidBecomeActive while UIKit is still restoring the view hierarchy from background. At that moment tabBarController.presentedViewController is nil so the Settings modal is never dismissed and the navigation notification fires too early. - Now stores a pendingLATapNavigation flag if app is not yet .active, and fires the notification in applicationDidBecomeActive when the full view hierarchy (including presented modals) is restored. LA reappear fix: - performRefresh() calls startIfNeeded() directly, bypassing the dismissedByUser guard that only exists in startFromCurrentState(). On every BG refresh with laEnabled=true and current==nil (post-dismiss), it would recreate the LA. - Added !dismissedByUser guard to refreshFromCurrentState() so the entire refresh pipeline is skipped while dismissed, matching the existing guard in startFromCurrentState(). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
With scene-based lifecycle (iOS 13+), widget/LA tap URLs are delivered to scene(_:openURLContexts:) on UIWindowSceneDelegate — AppDelegate.application (_:open:url:options:) is never called. Our previous handler was dead code. SceneDelegate now implements scene(_:openURLContexts:) which posts .liveActivityDidForeground on the next run loop (via DispatchQueue.main.async) to let the view hierarchy fully settle before navigateOnLAForeground() runs. Also handles the edge case where the URL arrives before sceneDidBecomeActive by storing a pendingLATapNavigation flag. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Lock screen layout: - Left column: glucose + trend arrow, delta below (replaces "Last Update:") - Right grid: 4 configurable slots read from LAAppGroupSettings (defaults: IOB/COB/Proj/empty) - Footer: centered HH:MM update time at reduced opacity Slot configuration: - LiveActivitySlotOption enum with all 22 InfoType-aligned cases - LAAppGroupSettings.setSlots() / slots() persisted to App Group UserDefaults - Uniqueness enforced: selecting an option clears it from any other slot - Settings UI: "Grid slots" section with 4 pickers in LiveActivitySettingsView - Changes take effect immediately (refreshFromCurrentState called on save) GlucoseSnapshot extended with 19 new fields covering all InfoType items: override, recBolus, battery, pumpBattery, basalRate, pumpReservoirU, autosens, tdd, targetLowMgdl/High, isfMgdlPerU, carbRatio, carbsToday, profileName, sageInsertTime, cageInsertTime, iageInsertTime, minBgMgdl/Max Storage.swift: 13 new UserDefaults-backed fields for the above metrics Controllers updated to write new Storage fields on each data fetch: Basals, DeviceStatus, DeviceStatusLoop, DeviceStatusOpenAPS, Carbs, Profile, IAge Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…pe slots - Storage.swift: keep our extended InfoType storage fields (lastBasal, lastPump, etc.) alongside upstream's laEnabled/laRenewBy/laRenewalFailed - LiveActivitySettingsView.swift: keep our configurable grid slots section (upstream had no slots) - project.pbxproj: take upstream's removal of CryptoSwift (replaced by CryptoKit) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Untrack docs/PR_configurable_slots.md (local-only reference doc) - Add docs/PR_configurable_slots.md and docs/LiveActivityTestPlan.md to .gitignore Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Draft
MtlPhil
added a commit
to achkars-org/LoopFollow
that referenced
this pull request
Mar 15, 2026
Upstream commits merged: - fec3f79: PR loopandlearn#547 merged (configurable grid slots + InfoType coverage) - 83ba7c5: Linting — indentation, struct→enum for LiveActivitySlotDefaults, blank line cleanup in Storage.swift and LiveActivitySlotConfig.swift - a20f3ec: Fix PRODUCT_BUNDLE_IDENTIFIER for Tests Conflict resolutions: all whitespace/style-only, took upstream version. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
GlucoseSnapshotwith 19 new fields covering all InfoType items (basal, pump, autosens, TDD, ISF, CR, target, ages, carbs today, profile name, min/max BG, override)Changes
Lock screen layout redesign (
LoopFollowLAExtension/LoopFollowLiveActivity.swift)The previous layout had glucose + a fixed four-slot grid side by side with no clear hierarchy. The new layout:
Delta: ±Xbelow in a smaller semibold fontLAAppGroupSettings.slots(), read from the shared App Group containerLast Update: HH:MMcentered below both columnsA new
SlotViewstruct handles dispatch for all 22 slot cases. Fifteen newLAFormatstatic methods were added to format each metric consistently (locale-aware number formatting, unit suffix, graceful—for nil/unavailable values).Configurable slot picker UI (
LoopFollow/LiveActivitySettingsView.swift)A new Grid slots section appears in the Live Activity settings screen with four pickers labelled Top left, Top right, Bottom left, Bottom right. Selecting a metric for one slot automatically clears that metric from any other slot (uniqueness enforced). Changes take effect immediately —
LiveActivityManager.shared.refreshFromCurrentState(reason: "slot config changed")is called on every picker change.Slot type definitions (
LoopFollow/LiveActivity/LAAppGroupSettings.swift)LiveActivitySlotOptionenum (22 cases:none,delta,projectedBG,minMax,iob,cob,recBolus,autosens,tdd,basal,pump,pumpBattery,battery,target,isf,carbRatio,sage,cage,iage,carbsToday,override,profile)displayName(used in Settings picker) andgridLabel(used inside the MetricBlock on the LA card) computed propertiesisOptionalflag —truefor metrics that may be absent; the widget renders—in those casesLiveActivitySlotDefaultsstruct with out-of-the-box defaults: IOB / COB / Projected BG / EmptyLAAppGroupSettings.setSlots()/slots()— persist and read the 4-slot configuration via the shared App GroupUserDefaultscontainer, so the extension always sees the current user selectionExtended GlucoseSnapshot (
LoopFollow/LiveActivity/GlucoseSnapshot.swift)Added 19 new stored properties. All are optional or have safe defaults so decoding an older snapshot (e.g. from a push that arrived before the app updated) never crashes:
overrideString?Observable.shared.overriderecBolusDouble?Observable.shared.recBolusbatteryDouble?Observable.shared.batterypumpBatteryDouble?Observable.shared.pumpBatterybasalRateStringStorage.shared.lastBasalpumpReservoirUDouble?Storage.shared.lastPumpReservoirUautosensDouble?Storage.shared.lastAutosenstddDouble?Storage.shared.lastTddtargetLowMgdlDouble?Storage.shared.lastTargetLowMgdltargetHighMgdlDouble?Storage.shared.lastTargetHighMgdlisfMgdlPerUDouble?Storage.shared.lastIsfMgdlPerUcarbRatioDouble?Storage.shared.lastCarbRatiocarbsTodayDouble?Storage.shared.lastCarbsTodayprofileNameString?Storage.shared.lastProfileNamesageInsertTimeTimeIntervalStorage.shared.sageInsertTimecageInsertTimeTimeIntervalStorage.shared.cageInsertTimeiageInsertTimeTimeIntervalStorage.shared.iageInsertTimeminBgMgdlDouble?Storage.shared.lastMinBgMgdlmaxBgMgdlDouble?Storage.shared.lastMaxBgMgdlAll glucose-valued fields are stored in mg/dL; conversion to mmol/L happens at display time in
LAFormat, consistent with the existing snapshot design.Age-based fields (SAGE, CAGE, IAGE) are stored as Unix epoch
TimeInterval(0 = not set).LAFormat.age(insertTime:)computes the human-readable age string at render time usingDateComponentsFormatterwith.positionalstyle and[.day, .hour]units.GlucoseSnapshotBuilder (
LoopFollow/LiveActivity/GlucoseSnapshotBuilder.swift)Extended
build(from:)to populate all 19 new fields fromObservable.sharedandStorage.shared.Storage additions (
LoopFollow/Storage/Storage.swift)13 new
StorageValue-backed fields in a dedicated "Live Activity extended InfoType data" section:Controller writes
Each data-fetching controller now writes one additional
Storage.sharedvalue alongside its existinginfoManager.updateInfoDatacall:Basals.swiftlastBasalDeviceStatus.swiftlastPumpReservoirUDeviceStatusLoop.swiftlastIsfMgdlPerU,lastCarbRatio,lastTargetLowMgdl,lastTargetHighMgdl,lastMinBgMgdl,lastMaxBgMgdlDeviceStatusOpenAPS.swiftlastAutosens,lastTdd,lastIsfMgdlPerU,lastCarbRatio,lastTargetLowMgdl,lastTargetHighMgdl,lastMinBgMgdl,lastMaxBgMgdlCarbs.swiftlastCarbsTodayProfile.swiftlastProfileNameIAge.swiftiageInsertTime