Get current message being displayed without specifying an id

Author: wtmoose

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 4.1.1
+
+### Features
+* #152 Get current message being displayed without specifying an `id`
+
 ## 4.1.0
 
 ### Features

SwiftMessages.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
     spec.name             = 'SwiftMessages'
-    spec.version          = '4.1.0'
+    spec.version          = '4.1.1'
     spec.license          = { :type => 'MIT' }
     spec.homepage         = 'https://github.com/SwiftKickMobile/SwiftMessages'
     spec.authors          = { 'Timothy Moose' => 'tim@swiftkick.it' }
     spec.summary          = 'A very flexible message bar for iOS written in Swift.'
-    spec.source           = {:git => 'https://github.com/SwiftKickMobile/SwiftMessages.git', :tag => '4.1.0'}
+    spec.source           = {:git => 'https://github.com/SwiftKickMobile/SwiftMessages.git', :tag => '4.1.1'}
     spec.platform         = :ios, '8.0'
     spec.ios.deployment_target = '8.0'
     spec.source_files     = 'SwiftMessages/**/*.swift'

SwiftMessages/SwiftMessages.swift

@@ -405,7 +405,7 @@ open class SwiftMessages {
      */
     open func hide(id: String) {
         messageQueue.sync {
-            if id == current?.id {
+            if id == _current?.id {
                 hideCurrent()
             }
             queue = queue.filter { $0.id != id }
@@ -429,7 +429,7 @@ open class SwiftMessages {
                     return
                 }
             }
-            if id == current?.id {
+            if id == _current?.id {
                 hideCurrent()
             }
             queue = queue.filter { $0.id != id }
@@ -486,7 +486,7 @@ open class SwiftMessages {
     fileprivate var queue: [Presenter] = []
     fileprivate var delays = Delays()
     fileprivate var counts: [String : Int] = [:]
-    fileprivate var current: Presenter? = nil {
+    fileprivate var _current: Presenter? = nil {
         didSet {
             if oldValue != nil {
                 let delayTime = DispatchTime.now() + pauseBetweenMessages
@@ -500,7 +500,7 @@ open class SwiftMessages {
     fileprivate func enqueue(presenter: Presenter) {
         if presenter.config.ignoreDuplicates {
             counts[presenter.id] = (counts[presenter.id] ?? 0) + 1
-            if current?.id == presenter.id && current?.isHiding == false { return }
+            if _current?.id == presenter.id && _current?.isHiding == false { return }
             if queue.filter({ $0.id == presenter.id }).count > 0 { return }
         }
         func doEnqueue() {
@@ -520,9 +520,9 @@ open class SwiftMessages {
     }
 
     fileprivate func dequeueNext() {
-        guard self.current == nil, queue.count > 0 else { return }
+        guard self._current == nil, queue.count > 0 else { return }
         let current = queue.removeFirst()
-        self.current = current
+        self._current = current
         // Set `autohideToken` before the animation starts in case
         // the dismiss gesture begins before we've queued the autohide
         // block on animation completion.
@@ -545,31 +545,31 @@ open class SwiftMessages {
                 }
             } catch {
                 strongSelf.messageQueue.sync {
-                    strongSelf.current = nil
+                    strongSelf._current = nil
                 }
             }
         }
     }
 
     fileprivate func internalHide(id: String) {
-        if id == current?.id {
+        if id == _current?.id {
             hideCurrent()
         }
         queue = queue.filter { $0.id != id }
         delays.ids.remove(id)
     }
 
     fileprivate func hideCurrent() {
-        guard let current = current, !current.isHiding else { return }
+        guard let current = _current, !current.isHiding else { return }
         let delay = current.delayHide ?? 0
         DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self, weak current] in
             guard let strongCurrent = current else { return }
             strongCurrent.hide { (completed) in
                 guard completed, let strongSelf = self, let strongCurrent = current else { return }
                 strongSelf.messageQueue.sync {
-                    guard strongSelf.current === strongCurrent else { return }
+                    guard strongSelf._current === strongCurrent else { return }
                     strongSelf.counts[strongCurrent.id] = nil
-                    strongSelf.current = nil
+                    strongSelf._current = nil
                 }
             }
         }
@@ -578,7 +578,7 @@ open class SwiftMessages {
     fileprivate weak var autohideToken: AnyObject?
 
     fileprivate func queueAutoHide() {
-        guard let current = current else { return }
+        guard let current = _current else { return }
         autohideToken = current
         if let pauseDuration = current.pauseDuration {
             let delayTime = DispatchTime.now() + pauseDuration
@@ -598,6 +598,19 @@ open class SwiftMessages {
 
 extension SwiftMessages {
 
+    /**
+     Returns the message view of type `T` if it is currently being shown or hidden.
+
+     - Returns: The view of type `T` if it is currently being shown or hidden.
+     */
+    public func current<T: UIView>() -> T? {
+        var view: T?
+        messageQueue.sync {
+            view = _current?.view as? T
+        }
+        return view
+    }
+
     /**
      Returns a message view with the given `id` if it is currently being shown or hidden.
 
@@ -607,7 +620,7 @@ extension SwiftMessages {
     public func current<T: UIView>(id: String) -> T? {
         var view: T?
         messageQueue.sync {
-            if let current = current, current.id == id {
+            if let current = _current, current.id == id {
                 view = current.view as? T
             }
         }
@@ -670,7 +683,7 @@ extension SwiftMessages: PresenterDelegate {
     }
 
     private func presenter(forAnimator animator: Animator) -> Presenter? {
-        if let current = current, animator === current.animator {
+        if let current = _current, animator === current.animator {
             return current
         }
         let queued = queue.filter { $0.animator === animator }