Wrap up open/dismiss behavior

josh · Apr 6, 2024 · bd7de96 · bd7de96
1 parent f085b8b
commit bd7de96
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 deletions.
diff --git a/Aware/Shared/WindowAction+Async.swift b/Aware/Shared/WindowAction+Async.swift
@@ -18,7 +18,8 @@ private nonisolated(unsafe) let logger = Logger(
 extension OpenWindowAction {
     /// Opens a window that’s associated with the specified identifier and waits until the window actually opens.
     /// Yeah... the default behavior opens the window background but doesn't actually wait till it happens.
-    @MainActor func andWait(id: String) async throws {
+    @MainActor
+    func andWait(id: String) async throws {
         try await withTimeout(.seconds(1)) { @MainActor in
             let clock = ContinuousClock()
             let started = clock.now
@@ -32,9 +33,9 @@ extension OpenWindowAction {
 
             let duration = .now - started
             if duration < .seconds(1) {
-                logger.debug("Window took \(duration) to open")
+                logger.debug("Window took \(duration, privacy: .public) to open")
             } else {
-                logger.error("Window took \(duration) to open")
+                logger.error("Window took \(duration, privacy: .public) to open")
             }
 
             let newCount = UIApplication.shared.connectedScenes.count
@@ -46,7 +47,8 @@ extension OpenWindowAction {
 extension DismissWindowAction {
     /// Dismisses the window that’s associated with the specified identifier and waits until the window actually opens.
     /// Yeah... the default behavior closes the window background but doesn't actually wait till it happens.
-    @MainActor func andWait(id: String) async throws {
+    @MainActor
+    func andWait(id: String) async throws {
         try await withTimeout(.seconds(1)) { @MainActor in
             let clock = ContinuousClock()
             let started = clock.now
@@ -69,6 +71,38 @@ extension DismissWindowAction {
             assert(oldCount - 1 == newCount, "expected 1 window to close")
         }
     }
+
+    @MainActor
+    func withFallbackAndWait(id: String, openWindow: OpenWindowAction, openID: String) async throws {
+        assert(id != openID, "dismiss and open IDs should be different")
+
+        let openWindowCount = UIApplication.shared.connectedScenes.count
+        logger.debug("\(openWindowCount) open windows")
+
+        // If multiple windows are open, dismissWindow SHOULD work
+        if openWindowCount > 1 {
+            logger.info("Dismissing \(id, privacy: .public) window")
+            try await andWait(id: id)
+        } else {
+            // If this is the last window, we need to open the fallback window
+            logger.info("Opening \(openID, privacy: .public) window")
+            try await openWindow.andWait(id: openID)
+
+            logger.info("Dismissing \(id, privacy: .public) window")
+            try await andWait(id: id)
+        }
+    }
+
+    @MainActor
+    func withFallback(id: String, openWindow: OpenWindowAction, openID: String) {
+        Task<Void, Never> {
+            do {
+                try await self.withFallbackAndWait(id: id, openWindow: openWindow, openID: openID)
+            } catch {
+                logger.error("Failed to dismiss \(id, privacy: .public) window: \(error, privacy: .public)")
+            }
+        }
+    }
 }
 
 #endif
diff --git a/Aware/visionOS/LogWindow.swift b/Aware/visionOS/LogWindow.swift
@@ -45,27 +45,7 @@ struct LogWindow: Scene {
                 .toolbar {
                     ToolbarItem(placement: .cancellationAction) {
                         Button("Dismiss", systemImage: "xmark") {
-                            Task<Void, Never> {
-                                do {
-                                    let openWindowCount = UIApplication.shared.connectedScenes.count
-                                    logger.debug("\(openWindowCount) open windows")
-
-                                    // If multiple windows are open, dismissWindow SHOULD work
-                                    if openWindowCount > 1 {
-                                        logger.info("Dismissing Logs window")
-                                        try await dismissWindow.andWait(id: "logs")
-
-                                    } else {
-                                        // If this is the last window open, we need to re-open the main window
-                                        logger.warning("Re-opening Timer window")
-                                        try await openWindow.andWait(id: "timer")
-                                        logger.info("Dismissing Logs window")
-                                        try await dismissWindow.andWait(id: "logs")
-                                    }
-                                } catch {
-                                    logger.error("Failed to dismiss Logs window: \(error, privacy: .public)")
-                                }
-                            }
+                            dismissWindow.withFallback(id: "logs", openWindow: openWindow, openID: "timer")
                         }
                         .labelStyle(.iconOnly)
                     }