InfoBarCoordinator as ResponseRouterCoordinator

cleevio · Sep 16, 2024 · 4e6798e · 4e6798e
1 parent 579d154
commit 4e6798e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/Sources/FlowPilotInfoBar/InfoBarCoordinator.swift b/Sources/FlowPilotInfoBar/InfoBarCoordinator.swift
@@ -6,12 +6,12 @@
 //
 
 import Foundation
-import CleevioRouters
+import FlowPilot
 import SwiftUI
 import CleevioCore
 
 #if canImport(UIKit)
-open class InfoBarCoordinator<InfoBarView: View, InfoBarContent>: ResponseRouterCoordinator {
+open class InfoBarCoordinator<InfoBarView: View, InfoBarContent>: ResponseRouterCoordinator<Void> {
     let frame: CGRect
     let content: InfoBarContent
     let viewModel: InfoBarViewModel<InfoBarContent>
@@ -48,30 +48,12 @@ open class InfoBarCoordinator<InfoBarView: View, InfoBarContent>: ResponseRouter
             .filter { !$0 }
             .delay(for: 0.1, scheduler: DispatchQueue.main)
             .sink(receiveValue: { [weak self] _ in
+                self?.response(with: ())
                 self?.dismiss()
             })
             .store(in: cancelBag)
 
         present(viewController, animated: animated)
     }
-
-    open func startAndWaitForDismiss() async {
-        start()
-        var shouldCallContinuation = true
-
-        await withCheckedContinuation { continuation in
-            viewModel.$isMessageShown
-                .dropFirst()
-                .filter { !$0 }
-                .delay(for: 0.1, scheduler: DispatchQueue.main)
-                .sink(receiveValue: { _ in
-                    if shouldCallContinuation {
-                        shouldCallContinuation = false
-                        continuation.resume()
-                    }
-                })
-                .store(in: cancelBag)
-        }
-    }
 }
 #endif
diff --git a/Sources/FlowPilotInfoBar/InfoBarWindowRouter.swift b/Sources/FlowPilotInfoBar/InfoBarWindowRouter.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import CleevioRouters
+import FlowPilot
 import CleevioUI
 
 #if canImport(UIKit)