Update

Author: muukii

Sources/FluidCore/SafeAreaFinder.swift

@@ -16,51 +16,28 @@ public final class SafeAreaFinder: NSObject {
   @available(iOS 13.0, *)
   public weak var windowScene: UIWindowScene?
 
-  public weak var window: UIWindow?
-
   private var currentInsets: UIEdgeInsets? = nil
 
-  private var referenceCounter: Int = 0 {
-    didSet {
-      if referenceCounter > 0 {
-        currentDisplayLink.isPaused = false
-      } else {
-        currentDisplayLink.isPaused = true
-      }
-    }
-  }
-
-  private nonisolated(unsafe) var currentDisplayLink: CADisplayLink!
+  private var isRunning: Bool = false
 
-  public override init() {
-
-    super.init()
-
-    setUpDisplayLink()
-  }
+  private nonisolated(unsafe) var currentDisplayLink: CADisplayLink?
 
   @available(iOS 13.0, *)
-  public init(windowScene: UIWindowScene) {
+  public init(windowScene: UIWindowScene?) {
     self.windowScene = windowScene
 
     super.init()
-
-    setUpDisplayLink()
-  }
-
-  public init(window: UIWindow) {
-    self.window = window
-
-    super.init()
-
-    setUpDisplayLink()
   }
 
   private func setUpDisplayLink() {
+    guard currentDisplayLink == nil else {
+      return
+    }
+
     currentDisplayLink = .init(target: self, selector: #selector(handle))
-    currentDisplayLink.preferredFramesPerSecond = 1
-    currentDisplayLink.add(to: .main, forMode: .default)
-    currentDisplayLink.isPaused = true
+    currentDisplayLink?.preferredFramesPerSecond = 1
+    currentDisplayLink?.add(to: .main, forMode: .default)
+    currentDisplayLink?.isPaused = false
   }
 
   public func request() {
@@ -69,36 +46,47 @@ public final class SafeAreaFinder: NSObject {
   }
 
   public func start() {
-    referenceCounter += 1
+    guard isRunning == false else {
+      request()
+      return
+    }
+
+    isRunning = true
+    setUpDisplayLink()
     request()
   }
 
+  /// Stops polling and releases the display link so the finder can deallocate when its owner goes away.
+  public func stop() {
+    guard isRunning || currentDisplayLink != nil else {
+      return
+    }
+
+    isRunning = false
+    currentInsets = nil
+    currentDisplayLink?.invalidate()
+    currentDisplayLink = nil
+  }
+
+  /// Stops polling. Kept as a compatibility alias for older callers that used the reference-counted API.
   public func pause() {
-    referenceCounter -= 1
+    stop()
   }
 
   deinit {
-    currentDisplayLink?.isPaused = true
     currentDisplayLink?.invalidate()
   }
 
   @objc private dynamic func handle() {
-    if let window {
-      _handle(in: window)
-      return
-    }
 
-    if #available(iOS 13.0, *), let windowScene {
-      guard let window = windowScene.windows.first(where: \.isKeyWindow) ?? windowScene.windows.first else {
-        return
-      }
-      _handle(in: window)
+    guard let windowScene else {
       return
     }
 
-    guard let window = UIApplication.shared.delegate?.window ?? nil else {
+    guard let window = windowScene.windows.first(where: \.isKeyWindow) ?? windowScene.windows.first else {
       return
     }
+
     _handle(in: window)
   }
 

Sources/FluidPictureInPicture/FluidPictureInPictureController.swift

@@ -104,7 +104,7 @@ extension FluidPictureInPictureController {
     let containerView: ContainerView = .init()
 
     let sizeForFloating = CGSize(width: 100, height: 140)
-    let safeAreaFinder = SafeAreaFinder()
+    let safeAreaFinder: SafeAreaFinder
 
     private(set) var state: State = .init() {
       didSet {
@@ -124,6 +124,9 @@ extension FluidPictureInPictureController {
     override init(
       frame: CGRect
     ) {
+
+      self.safeAreaFinder = .init(windowScene: nil)
+
       super.init(frame: frame)
 
       let dragGesture = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture))
@@ -232,7 +235,7 @@ extension FluidPictureInPictureController {
     override func didMoveToWindow() {
       super.didMoveToWindow()
 
-      safeAreaFinder.window = window
+      safeAreaFinder.windowScene = window?.windowScene
 
       if window != nil {
         safeAreaFinder.start()

Sources/FluidSnackbar/FloatingDisplayController.swift

@@ -33,10 +33,6 @@ open class FloatingDisplayController {
 
   // MARK: - Initializers
 
-  public init(edgeTargetSafeArea: FloatingDisplayTarget.EdgeTargetSafeArea) {
-    self.displayTarget = .init(edgeTargetSafeArea: edgeTargetSafeArea)
-  }
-
   @available(iOS 13.0, *)
   public init(
     edgeTargetSafeArea: FloatingDisplayTarget.EdgeTargetSafeArea,

Sources/FluidSnackbar/FloatingDisplayTarget.swift

@@ -40,9 +40,16 @@ public final class FloatingDisplayTarget {
         left: .activeWindow
       )
     }
+
+    fileprivate var containsActiveWindowEdge: Bool {
+      top == .activeWindow
+        || right == .activeWindow
+        || bottom == .activeWindow
+        || left == .activeWindow
+    }
   }
 
-  public enum TargetSafeArea {
+  public enum TargetSafeArea: Equatable {
     case notificationWindow
     case activeWindow
   }
@@ -70,54 +77,17 @@ public final class FloatingDisplayTarget {
   }
 
   public func makeWindowVisible() {
+    _ = notificationViewController.view
     notificationWindow.isHidden = false
-  }
 
-  public func hideWindow() {
-    notificationWindow.isHidden = true
-  }
-
-  public init(edgeTargetSafeArea: EdgeTargetSafeArea) {
-
-    if #available(iOS 13, *) {
-      let windowScene = UIApplication.shared
-        .connectedScenes
-        .lazy
-        .filter({ $0.activationState == .foregroundActive })
-        .compactMap({ $0 as? UIWindowScene })
-        .first
-      if let windowScene {
-        self.safeAreaFinder = .init(windowScene: windowScene)
-        self.notificationViewController = .init(
-          edgeTargetSafeArea: edgeTargetSafeArea,
-          safeAreaFinder: safeAreaFinder
-        )
-        notificationWindow = .init(windowScene: windowScene)
-      } else {
-        self.safeAreaFinder = .init()
-        self.notificationViewController = .init(
-          edgeTargetSafeArea: edgeTargetSafeArea,
-          safeAreaFinder: safeAreaFinder
-        )
-        notificationWindow = .init(frame: .zero)
-      }
-
-    } else {
-      self.safeAreaFinder = .init()
-      self.notificationViewController = .init(
-        edgeTargetSafeArea: edgeTargetSafeArea,
-        safeAreaFinder: safeAreaFinder
-      )
-      notificationWindow = .init(frame: .zero)
+    if notificationViewController.needsActiveWindowSafeArea {
+      safeAreaFinder.start()
     }
+  }
 
-    notificationWindow.windowLevel = UIWindow.Level(rawValue: 5)
+  public func hideWindow() {
     notificationWindow.isHidden = true
-    notificationWindow.backgroundColor = UIColor.clear
-    notificationWindow.frame = UIScreen.main.bounds
-    notificationViewController.beginAppearanceTransition(true, animated: false)
-    notificationWindow.rootViewController = notificationViewController
-    notificationViewController.endAppearanceTransition()
+    safeAreaFinder.stop()
   }
 
   @available(iOS 13.0, *)
@@ -142,11 +112,11 @@ public final class FloatingDisplayTarget {
     notificationViewController.endAppearanceTransition()
   }
 
-  deinit {      
-    Task { @MainActor [notificationWindow] in      
+  deinit {
+    Task { @MainActor [safeAreaFinder, notificationWindow] in
+      safeAreaFinder.stop()
       notificationWindow.isHidden = false
     }
-    
   }
 
 }
@@ -185,6 +155,10 @@ extension FloatingDisplayTarget {
     private let edgeTargetSafeArea: EdgeTargetSafeArea
     private let safeAreaFinder: SafeAreaFinder
 
+    fileprivate var needsActiveWindowSafeArea: Bool {
+      edgeTargetSafeArea.containsActiveWindowEdge
+    }
+
     init(
       edgeTargetSafeArea: EdgeTargetSafeArea,
       safeAreaFinder: SafeAreaFinder
@@ -236,7 +210,7 @@ extension FloatingDisplayTarget {
 
         addLayoutGuide(_safeAreaLayoutGuide)
 
-        var containsActievWindowSafeAreaEdge: Bool = false
+        var containsActiveWindowSafeAreaEdge: Bool = false
 
         switch edgeTargetSafeArea.top {
         case .notificationWindow:
@@ -245,7 +219,7 @@ extension FloatingDisplayTarget {
         case .activeWindow:
           activeWindowSafeAreaLayoutGuideConstraintTop = topAnchor.constraint(
             equalTo: _safeAreaLayoutGuide.topAnchor)
-          containsActievWindowSafeAreaEdge = true
+          containsActiveWindowSafeAreaEdge = true
         }
 
         switch edgeTargetSafeArea.right {
@@ -256,7 +230,7 @@ extension FloatingDisplayTarget {
         case .activeWindow:
           activeWindowSafeAreaLayoutGuideConstraintRight = rightAnchor.constraint(
             equalTo: _safeAreaLayoutGuide.rightAnchor)
-          containsActievWindowSafeAreaEdge = true
+          containsActiveWindowSafeAreaEdge = true
         }
 
         switch edgeTargetSafeArea.bottom {
@@ -267,7 +241,7 @@ extension FloatingDisplayTarget {
         case .activeWindow:
           activeWindowSafeAreaLayoutGuideConstraintBottom = bottomAnchor.constraint(
             equalTo: _safeAreaLayoutGuide.bottomAnchor)
-          containsActievWindowSafeAreaEdge = true
+          containsActiveWindowSafeAreaEdge = true
         }
 
         switch edgeTargetSafeArea.left {
@@ -277,10 +251,10 @@ extension FloatingDisplayTarget {
         case .activeWindow:
           activeWindowSafeAreaLayoutGuideConstraintLeft = leftAnchor.constraint(
             equalTo: _safeAreaLayoutGuide.leftAnchor)
-          containsActievWindowSafeAreaEdge = true
+          containsActiveWindowSafeAreaEdge = true
         }
 
-        if containsActievWindowSafeAreaEdge {
+        if containsActiveWindowSafeAreaEdge {
 
           NSLayoutConstraint.activate(
             [
@@ -295,7 +269,6 @@ extension FloatingDisplayTarget {
           NotificationCenter.default.addObserver(
             self, selector: #selector(handleInsetsUpdate), name: SafeAreaFinder.notificationName,
             object: nil)
-          safeAreaFinder.start()
         }
       }
 
@@ -335,10 +308,9 @@ extension FloatingDisplayTarget {
       }
 
       deinit {
-        Task { @MainActor [hasSafeAreaFinderActivated, safeAreaFinder] in
-          if hasSafeAreaFinderActivated {
-            safeAreaFinder.pause()
-          }
+        NotificationCenter.default.removeObserver(self)
+        Task { @MainActor [safeAreaFinder] in
+          safeAreaFinder.stop()
         }
       }
     }