Support for multiple SwiftEntryKit instances working in parallel

Source/Infra/EKContentView.swift

@@ -12,6 +12,7 @@ protocol EntryContentViewDelegate: AnyObject {
  func changeToActive(withAttributes attributes: EKAttributes)
  func changeToInactive(withAttributes attributes: EKAttributes, pushOut: Bool)
  func didFinishDisplaying(entry: EKEntryView, keepWindowActive: Bool, dismissCompletionHandler: SwiftEntryKit.DismissCompletionHandler?)
+ var safeAreaInsets: UIEdgeInsets { get }
 }
 
 class EKContentView: UIView {
@@ -119,7 +120,7 @@ class EKContentView: UIView {
 
  // Define a spacer to catch top / bottom offsets
  var spacerView: UIView!
- let safeAreaInsets = EKWindowProvider.safeAreaInsets
+ let safeAreaInsets = entryDelegate.safeAreaInsets
  let overrideSafeArea = attributes.positionConstraints.safeArea.isOverridden
 
  if !overrideSafeArea && safeAreaInsets.hasVerticalInsets && !attributes.position.isCenter {

Source/Infra/EKEntryView.swift

@@ -8,6 +8,10 @@
 
 import UIKit
 
+protocol EntryViewDelegate: AnyObject {
+ var safeAreaInsets: UIEdgeInsets { get }
+}
+
 class EKEntryView: EKStyleView {
 
  struct Content {
@@ -28,6 +32,8 @@ class EKEntryView: EKStyleView {
  }
 
  // MARK: Props
+
+ private weak var delegate: EntryViewDelegate!
 
  /** Background view */
  private var backgroundView: EKBackgroundView!
@@ -53,8 +59,9 @@ class EKEntryView: EKStyleView {
  }()
 
  // MARK: Setup
- init(newEntry content: Content) {
+ init(newEntry content: Content, delegate: EntryViewDelegate) {
  self.content = content
+ self.delegate = delegate
  super.init(frame: UIScreen.main.bounds)
  setupContentView()
  applyDropShadow()
@@ -161,9 +168,9 @@ class EKEntryView: EKStyleView {
  var bottomInset: CGFloat = 0
  switch attributes.position {
  case .top:
- topInset = -EKWindowProvider.safeAreaInsets.top
+ topInset = -delegate.safeAreaInsets.top
  case .bottom, .center:
- bottomInset = EKWindowProvider.safeAreaInsets.bottom
+ bottomInset = delegate.safeAreaInsets.bottom
  }
 
  backgroundView.layoutToSuperview(.top, offset: topInset)

Source/Infra/EKRootViewController.swift

@@ -11,6 +11,7 @@ import UIKit
 protocol EntryPresenterDelegate: AnyObject {
  var isResponsiveToTouches: Bool { set get }
  func displayPendingEntryOrRollbackWindow(dismissCompletionHandler: SwiftEntryKit.DismissCompletionHandler?)
+ var safeAreaInsets: UIEdgeInsets { get }
 }
 
 class EKRootViewController: UIViewController {
@@ -213,7 +214,10 @@ extension EKRootViewController {
 // MARK: - EntryScrollViewDelegate
 
 extension EKRootViewController: EntryContentViewDelegate {
-
+ var safeAreaInsets: UIEdgeInsets {
+ delegate.safeAreaInsets
+ }
+
  func didFinishDisplaying(entry: EKEntryView, keepWindowActive: Bool, dismissCompletionHandler: SwiftEntryKit.DismissCompletionHandler?) {
  guard !isDisplaying else {
  return

Source/Infra/EKWindow.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 class EKWindow: UIWindow {
- 
+
  var isAbleToReceiveTouches = false
 
  init(with rootVC: UIViewController) {
@@ -37,7 +37,7 @@ class EKWindow: UIWindow {
  return super.hitTest(point, with: event)
  }
 
- guard let rootVC = EKWindowProvider.shared.rootVC else {
+ guard let rootVC = rootViewController as? EKRootViewController else {
  return nil
  }
 

Source/Infra/EKWindowProvider.swift

@@ -8,21 +8,18 @@
 
 import UIKit
 
-final class EKWindowProvider: EntryPresenterDelegate {
- 
+final class EKWindowProvider: EntryPresenterDelegate, EntryViewDelegate {
+
  /** The artificial safe area insets */
- static var safeAreaInsets: UIEdgeInsets {
+ var safeAreaInsets: UIEdgeInsets {
  if #available(iOS 11.0, *) {
- return EKWindowProvider.shared.entryWindow?.rootViewController?.view?.safeAreaInsets ?? UIApplication.shared.keyWindow?.rootViewController?.view.safeAreaInsets ?? .zero
+ return entryWindow?.rootViewController?.view?.safeAreaInsets ?? UIApplication.shared.keyWindow?.rootViewController?.view.safeAreaInsets ?? .zero
  } else {
  let statusBarMaxY = UIApplication.shared.statusBarFrame.maxY
  return UIEdgeInsets(top: statusBarMaxY, left: 0, bottom: 10, right: 0)
  }
  }
-
- /** Single access point */
- static let shared = EKWindowProvider()
-
+
  /** Current entry window */
  var entryWindow: EKWindow!
 
@@ -43,7 +40,7 @@ final class EKWindowProvider: EntryPresenterDelegate {
  private weak var entryView: EKEntryView!
 
  /** Cannot be instantiated, customized, inherited */
- private init() {}
+ init() {}
 
  var isResponsiveToTouches: Bool {
  set {
@@ -139,13 +136,13 @@ final class EKWindowProvider: EntryPresenterDelegate {
 
  /** Display a view using attributes */
  func display(view: UIView, using attributes: EKAttributes, presentInsideKeyWindow: Bool, rollbackWindow: SwiftEntryKit.RollbackWindow) {
- let entryView = EKEntryView(newEntry: .init(view: view, attributes: attributes))
+ let entryView = EKEntryView(newEntry: .init(view: view, attributes: attributes), delegate: self)
  display(entryView: entryView, using: attributes, presentInsideKeyWindow: presentInsideKeyWindow, rollbackWindow: rollbackWindow)
  }
 
  /** Display a view controller using attributes */
  func display(viewController: UIViewController, using attributes: EKAttributes, presentInsideKeyWindow: Bool, rollbackWindow: SwiftEntryKit.RollbackWindow) {
- let entryView = EKEntryView(newEntry: .init(viewController: viewController, attributes: attributes))
+ let entryView = EKEntryView(newEntry: .init(viewController: viewController, attributes: attributes), delegate: self)
  display(entryView: entryView, using: attributes, presentInsideKeyWindow: presentInsideKeyWindow, rollbackWindow: rollbackWindow)
  }
 
@@ -159,12 +156,10 @@ final class EKWindowProvider: EntryPresenterDelegate {
  switch rollbackWindow! {
  case .main:
  if let mainRollbackWindow = mainRollbackWindow {
- mainRollbackWindow.makeKeyAndVisible()
- } else {
- UIApplication.shared.keyWindow?.makeKeyAndVisible()
+ mainRollbackWindow.becomeKey()
  }
  case .custom(window: let window):
- window.makeKeyAndVisible()
+ window.becomeKey()
  }
  }