Remove storyboard, migrate to SwiftUI layout

LoopFollow/Alarm/AlarmsContainerView.swift

@@ -4,28 +4,35 @@
 import SwiftUI
 
 struct AlarmsContainerView: View {
-    var onBack: (() -> Void)?
+    private let embedsInNavigationStack: Bool
+
+    init(embedsInNavigationStack: Bool = true) {
+        self.embedsInNavigationStack = embedsInNavigationStack
+    }
 
     var body: some View {
-        NavigationStack {
-            AlarmListView()
-                .toolbar {
-                    if let onBack {
-                        ToolbarItem(placement: .navigationBarLeading) {
-                            Button(action: onBack) {
-                                Image(systemName: "chevron.left")
-                            }
-                        }
-                    }
-                    ToolbarItem(placement: .navigationBarTrailing) {
-                        NavigationLink {
-                            AlarmSettingsView()
-                        } label: {
-                            Image(systemName: "gearshape")
-                        }
-                    }
+        Group {
+            if embedsInNavigationStack {
+                NavigationStack {
+                    content
                 }
+            } else {
+                content
+            }
         }
         .preferredColorScheme(Storage.shared.appearanceMode.value.colorScheme)
     }
+
+    private var content: some View {
+        AlarmListView()
+            .toolbar {
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    NavigationLink {
+                        AlarmSettingsView()
+                    } label: {
+                        Image(systemName: "gearshape")
+                    }
+                }
+            }
+    }
 }

LoopFollow/Application/AppDelegate.swift

@@ -1,15 +1,14 @@
 // LoopFollow
 // AppDelegate.swift
 
-import CoreData
+import AVFoundation
 import EventKit
 import UIKit
 import UserNotifications
 
-@main
 class AppDelegate: UIResponder, UIApplicationDelegate {
-    var window: UIWindow?
     let notificationCenter = UNUserNotificationCenter.current()
+    private let speechSynthesizer = AVSpeechSynthesizer()
 
     func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         LogManager.shared.log(category: .general, message: "App started")
@@ -65,14 +64,49 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         // Detect Before-First-Unlock launch. If protected data is unavailable here,
         // StorageValues were cached from encrypted UserDefaults and need a reload
-        // on the first foreground after the user unlocks.
+        // once the device is unlocked.
         let bfu = !UIApplication.shared.isProtectedDataAvailable
         Storage.shared.needsBFUReload = bfu
         LogManager.shared.log(category: .general, message: "BFU check: isProtectedDataAvailable=\(!bfu), needsBFUReload=\(bfu)")
 
+        // Recovery is driven from AppDelegate (not MainViewController) because under
+        // the SwiftUI App lifecycle the home tab's UIHostingController is materialized
+        // lazily — on a BG-only launch (BGAppRefreshTask, BLE wake) MainViewController
+        // may not exist when the device is unlocked, and would miss willEnterForeground.
+        // protectedDataDidBecomeAvailable fires the moment file protection lifts and
+        // is the authoritative signal; willEnterForeground is a fallback.
+        let nc = NotificationCenter.default
+        nc.addObserver(self, selector: #selector(protectedDataDidBecomeAvailable), name: UIApplication.protectedDataDidBecomeAvailableNotification, object: nil)
+        nc.addObserver(self, selector: #selector(handleWillEnterForeground), name: UIApplication.willEnterForegroundNotification, object: nil)
+
+        // Race guard: protected data may have become available between the check
+        // above and the observer registration just now.
+        if Storage.shared.needsBFUReload, UIApplication.shared.isProtectedDataAvailable {
+            performBFUReloadIfNeeded()
+        }
+
         return true
     }
 
+    // MARK: - BFU recovery
+
+    @objc private func protectedDataDidBecomeAvailable() {
+        performBFUReloadIfNeeded()
+    }
+
+    @objc private func handleWillEnterForeground() {
+        performBFUReloadIfNeeded()
+    }
+
+    private func performBFUReloadIfNeeded() {
+        guard Storage.shared.needsBFUReload else { return }
+        Storage.shared.needsBFUReload = false
+        LogManager.shared.log(category: .general, message: "BFU reload triggered — reloading all StorageValues")
+        Storage.shared.reloadAll()
+        LogManager.shared.log(category: .general, message: "BFU reload complete: url='\(Storage.shared.url.value)'")
+        NotificationCenter.default.post(name: .bfuReloadCompleted, object: nil)
+    }
+
     func applicationWillTerminate(_: UIApplication) {
         #if !targetEnvironment(macCatalyst)
             LiveActivityManager.shared.endOnTerminate()
@@ -126,85 +160,35 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         completionHandler(.newData)
     }
 
-    // MARK: - URL handling
-
-    // Note: with scene-based lifecycle (iOS 13+), URLs are delivered to
-    // SceneDelegate.scene(_:openURLContexts:) — not here. The scene delegate
-    // handles <urlScheme>://la-tap for Live Activity tap navigation.
-
-    // MARK: UISceneSession Lifecycle
-
     func application(_: UIApplication, willFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // set the "prevent screen lock" option when the app is started
-        // This method doesn't seem to be working anymore. Added to view controllers as solution offered on SO
         UIApplication.shared.isIdleTimerDisabled = Storage.shared.screenlockSwitchState.value
-
         return true
     }
 
-    func application(_: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options _: UIScene.ConnectionOptions) -> UISceneConfiguration {
-        // Called when a new scene session is being created.
-        // Use this method to select a configuration to create the new scene with.
-        UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
-    }
-
-    func application(_: UIApplication, didDiscardSceneSessions _: Set<UISceneSession>) {
-        // Called when the user discards a scene session.
-        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
-        // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
-    }
+    // MARK: - Quick Actions
 
-    // MARK: - Core Data stack
-
-    lazy var persistentContainer: NSPersistentCloudKitContainer = {
-        /*
-         The persistent container for the application. This implementation
-         creates and returns a container, having loaded the store for the
-         application to it. This property is optional since there are legitimate
-         error conditions that could cause the creation of the store to fail.
-         */
-        let container = NSPersistentCloudKitContainer(name: "LoopFollow")
-        container.loadPersistentStores(completionHandler: { _, error in
-            if let error = error as NSError? {
-                // Replace this implementation with code to handle the error appropriately.
-                // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-
-                /*
-                 Typical reasons for an error here include:
-                 * The parent directory does not exist, cannot be created, or disallows writing.
-                 * The persistent store is not accessible, due to permissions or data protection when the device is locked.
-                 * The device is out of space.
-                 * The store could not be migrated to the current model version.
-                 Check the error message to determine what the actual problem was.
-                 */
-                fatalError("Unresolved error \(error), \(error.userInfo)")
-            }
-        })
-        return container
-    }()
-
-    // MARK: - Core Data Saving support
-
-    func saveContext() {
-        let context = persistentContainer.viewContext
-        if context.hasChanges {
-            do {
-                try context.save()
-            } catch {
-                // Replace this implementation with code to handle the error appropriately.
-                // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-                let nserror = error as NSError
-                fatalError("Unresolved error \(nserror), \(nserror.userInfo)")
-            }
+    func application(_: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
+        guard let bundleIdentifier = Bundle.main.bundleIdentifier else {
+            completionHandler(false)
+            return
+        }
+        let expectedType = bundleIdentifier + ".toggleSpeakBG"
+        if shortcutItem.type == expectedType {
+            Storage.shared.speakBG.value.toggle()
+            let message = Storage.shared.speakBG.value ? "BG Speak is now on" : "BG Speak is now off"
+            let utterance = AVSpeechUtterance(string: message)
+            speechSynthesizer.speak(utterance)
+            completionHandler(true)
+        } else {
+            completionHandler(false)
         }
     }
 
     func userNotificationCenter(_: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
         if response.actionIdentifier == "OPEN_APP_ACTION" {
-            if let window {
-                window.rootViewController?.dismiss(animated: true, completion: nil)
-                window.rootViewController?.present(MainViewController(), animated: true, completion: nil)
-            }
+            // Dismiss any presented modal/sheet so the user actually sees Home
+            UIApplication.shared.topMost?.dismiss(animated: true)
+            Observable.shared.selectedTabIndex.value = 0
         }
 
         if response.actionIdentifier == "snooze" {
@@ -225,6 +209,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     }
 }
 
+extension Notification.Name {
+    /// Posted by AppDelegate after a Before-First-Unlock recovery completes
+    /// (Storage.reloadAll has run with the now-decrypted UserDefaults).
+    static let bfuReloadCompleted = Notification.Name("LoopFollow.bfuReloadCompleted")
+}
+
 extension AppDelegate: UNUserNotificationCenterDelegate {
     func userNotificationCenter(_: UNUserNotificationCenter,
                                 willPresent notification: UNNotification,