fix for override user interface style

CHANGELOG.md

@@ -1,6 +1,20 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 9.0.6
+
+### Features
+
+* Add `UIView` associated type to `Event`, e.g. `willShow(UIView)` so that event listeners can inspect the view.
+* Add `Event.id: String?` property so that event listeners can reason about the view's ID.
+
+## 9.0.5
+
+### Fixes
+
+* #482 Fix timing of `KeyboardTrackingView` callbacks.
+* #483 KeyboardTrackingView causes a small space under bottom-style view
+
 ## 9.0.4
 
 * #471 Xcode 13 issue - Enum cases with associated values cannot be marked potentially unavailable with '@available'

Package.swift

@@ -7,7 +7,8 @@ let package = Package(
         .iOS("9.0")
     ],
     products: [
-        .library(name: "SwiftMessages", targets: ["SwiftMessages"])
+        .library(name: "SwiftMessages", targets: ["SwiftMessages"]),
+        .library(name: "SwiftMessages-Dynamic", type: .dynamic, targets: ["SwiftMessages"])
     ],
     targets: [
         .target(

README.md

@@ -156,7 +156,9 @@ config.preferredStatusBarStyle = .lightContent
 
 // Specify one or more event listeners to respond to show and hide events.
 config.eventListeners.append() { event in
-    if case .didHide = event { print("yep") }
+    if case .didHide = event {
+        print("yep id=\(String(describing: event.id)")
+    }
 }
 
 SwiftMessages.show(config: config, view: view)

SwiftMessages.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name             = 'SwiftMessages'
-    spec.version          = '9.0.4'
+    spec.version          = '9.0.6'
     spec.license          = { :type => 'MIT' }
     spec.homepage         = 'https://github.com/SwiftKickMobile/SwiftMessages'
     spec.authors          = { 'Timothy Moose' => 'tim@swiftkick.it' }

SwiftMessages/KeyboardTrackingView.swift

@@ -44,6 +44,18 @@ open class KeyboardTrackingView: UIView {
     /// The margin to maintain between the keyboard and the top of the view.
     @IBInspectable open var topMargin: CGFloat = 0
 
+    /// Subclasses can override this to do something before the change.
+    open func willChange(
+        change: KeyboardTrackingView.Change,
+        userInfo: [AnyHashable : Any]
+    ) {}
+
+    /// Subclasses can override this to do something after the change.
+    open func didChange(
+        change: KeyboardTrackingView.Change,
+        userInfo: [AnyHashable : Any]
+    ) {}
+
     override public init(frame: CGRect) {
         super.init(frame: frame)
         postInit()
@@ -101,11 +113,12 @@ open class KeyboardTrackingView: UIView {
         guard !(isPaused || isAutomaticallyPaused),
             let userInfo = (notification as NSNotification).userInfo,
             let value = userInfo[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue else { return }
+        willChange(change: change, userInfo: userInfo)
+        delegate?.keyboardTrackingViewWillChange(change: change, userInfo: userInfo)
         let keyboardRect = value.cgRectValue
         let thisRect = convert(bounds, to: nil)
         let newHeight = max(0, thisRect.maxY - keyboardRect.minY) + topMargin
         guard heightConstraint.constant != newHeight else { return }
-        delegate?.keyboardTrackingViewWillChange(change: change, userInfo: userInfo)
         animateKeyboardChange(change: change, height: newHeight, userInfo: userInfo)
     }
 
@@ -115,6 +128,7 @@ open class KeyboardTrackingView: UIView {
             let curveNumber = userInfo[UIResponder.keyboardAnimationCurveUserInfoKey] as? NSNumber {
             CATransaction.begin()
             CATransaction.setCompletionBlock {
+                self.didChange(change: change, userInfo: userInfo)
                 self.delegate?.keyboardTrackingViewDidChange(change: change, userInfo: userInfo)
             }
             UIView.beginAnimations(nil, context: nil)

SwiftMessages/MaskingView.swift

@@ -65,6 +65,15 @@ class MaskingView: PassthroughView {
         guard let keyboardTrackingView = keyboardTrackingView,
             view != keyboardTrackingView,
             view != backgroundView else { return }
-        keyboardTrackingView.topAnchor.constraint(greaterThanOrEqualTo: view.bottomAnchor).with(priority: UILayoutPriority(250)).isActive = true
+        let offset: CGFloat
+        if let adjustable = view as? MarginAdjustable {
+            offset = -adjustable.bounceAnimationOffset
+        } else {
+            offset = 0
+        }
+        keyboardTrackingView.topAnchor.constraint(
+            greaterThanOrEqualTo: view.bottomAnchor,
+            constant: offset
+        ).with(priority: UILayoutPriority(250)).isActive = true
     }
 }

SwiftMessages/Presenter.swift

@@ -119,7 +119,7 @@ class Presenter: NSObject {
     func show(completion: @escaping AnimationCompletion) throws {
         try presentationContext = getPresentationContext()
         install()
-        self.config.eventListeners.forEach { $0(.willShow) }
+        self.config.eventListeners.forEach { $0(.willShow(self.view)) }
         showAnimation() { completed in
             completion(completed)
             if completed {
@@ -128,7 +128,7 @@ class Presenter: NSObject {
                 } else {
                     self.showAccessibilityAnnouncement()
                 }
-                self.config.eventListeners.forEach { $0(.didShow) }
+                self.config.eventListeners.forEach { $0(.didShow(self.view)) }
             }
         }
     }
@@ -181,15 +181,15 @@ class Presenter: NSObject {
 
     func hide(animated: Bool, completion: @escaping AnimationCompletion) {
         isHiding = true
-        self.config.eventListeners.forEach { $0(.willHide) }
+        self.config.eventListeners.forEach { $0(.willHide(self.view)) }
         let context = animationContext()
         let action = {
             if let viewController = self.presentationContext.viewControllerValue() as? WindowViewController {
                 viewController.uninstall()
             }
             self.maskingView.removeFromSuperview()
             completion(true)
-            self.config.eventListeners.forEach { $0(.didHide) }
+            self.config.eventListeners.forEach { $0(.didHide(self.view)) }
         }
         guard animated else {
             action()

SwiftMessages/SwiftMessages.swift

@@ -219,10 +219,23 @@ open class SwiftMessages {
      Specifies events in the message lifecycle.
     */
     public enum Event {
-        case willShow
-        case didShow
-        case willHide
-        case didHide
+        case willShow(UIView)
+        case didShow(UIView)
+        case willHide(UIView)
+        case didHide(UIView)
+
+        public var view: UIView {
+            switch self {
+            case .willShow(let view): return view
+            case .didShow(let view): return view
+            case .willHide(let view): return view
+            case .didHide(let view): return view
+            }
+        }
+
+        public var id: String? {
+            return (view as? Identifiable)?.id
+        }
     }
 
     /**

SwiftMessages/WindowViewController.swift

@@ -28,7 +28,9 @@ open class WindowViewController: UIViewController
         window.rootViewController = self
         window.windowLevel = config.windowLevel ?? UIWindow.Level.normal
         if #available(iOS 13, *) {
-            window.overrideUserInterfaceStyle = config.overrideUserInterfaceStyle
+            if window.responds(to: #selector(setter: UIView.overrideUserInterfaceStyle)) {
+                window.setValue(config.overrideUserInterfaceStyle.rawValue, forKeyPath: #keyPath(UIView.overrideUserInterfaceStyle))
+            }
         }
     }