mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfixes for delegate, logging, and legacy

Browse Source
This commit is contained in:
Scott Pfeil 2023-04-18 18:21:57 -04:00
parent ba14681a39
commit e61b9ed8f1
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MVMCoreUI/Alerts/AlertOperation.swift
View File

@ -25,7 +25,6 @@ public class AlertOperation: MVMCoreOperation {
} }
private var properties = Properties() private var properties = Properties()
//private var observer: NSKeyValueObservation?
private var cancellable: Cancellable? private var cancellable: Cancellable?
public let alertController: AlertController public let alertController: AlertController
@ -89,26 +88,25 @@ public class AlertOperation: MVMCoreOperation {
stopObservingAlertView() stopObservingAlertView()
cancellable = alertController.publisher(for: \AlertController.visible).sink() { [weak self] visible in cancellable = alertController.publisher(for: \AlertController.visible).sink() { [weak self] visible in
guard let self = self else { return } guard let self = self else { return }
Task { @MainActor in Task {
guard await self.properties.getIsDisplayed() != visible else { return }
await self.properties.set(displayed: visible) await self.properties.set(displayed: visible)
if visible { Task { @MainActor in
self.alertObject.alertDelegate?.alertShown(self.alertController) if visible {
} else { self.alertObject.alertDelegate?.alertShown(self.alertController)
self.alertObject.alertDelegate?.alertDismissed(self.alertController) } else {
self.alertObject.alertDelegate?.alertDismissed(self.alertController)
// Is visible was set to NO, meaning that the alertview is no longer visible.
self.stopObservingAlertView() // Is visible was set to NO, meaning that the alertview is no longer visible.
self.markAsFinished() self.stopObservingAlertView()
self.markAsFinished()
}
} }
} }
} }
// observer = alertController.observe(\AlertController.visible, options: [.old, .new]) { [weak self] (object, change) in
//
// }
} }
private func stopObservingAlertView() { private func stopObservingAlertView() {
//observer?.invalidate()
cancellable?.cancel() cancellable?.cancel()
} }
} }