Fix custom presentation style positioning

Author: wtmoose

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## 4.1.2
+
+### Bug Fixes
+* Custom presentation styles using `TopBottomAnimation` now display properly under top and bottom bars.
+
 ## 4.1.1
 
 ### Features

SwiftMessages.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
     spec.name             = 'SwiftMessages'
-    spec.version          = '4.1.1'
+    spec.version          = '4.1.2'
     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.1'}
+    spec.source           = {:git => 'https://github.com/SwiftKickMobile/SwiftMessages.git', :tag => '4.1.2'}
     spec.platform         = :ios, '8.0'
     spec.ios.deployment_target = '8.0'
     spec.source_files     = 'SwiftMessages/**/*.swift'

SwiftMessages/UIViewController+Utils.swift

@@ -13,12 +13,12 @@ private let fullScreenStyles: [UIModalPresentationStyle] = [.fullScreen, .overFu
 extension UIViewController {
 
     func sm_selectPresentationContextTopDown(_ config: SwiftMessages.Config) -> UIViewController {
-        let presentationStyle = config.presentationStyle
+        let topBottomStyle = config.presentationStyle.topBottomStyle
         if let presented = sm_presentedFullScreenViewController() {
             return presented.sm_selectPresentationContextTopDown(config)
-        } else if case .top = presentationStyle, let navigationController = sm_selectNavigationControllerTopDown() {
+        } else if case .top? = topBottomStyle, let navigationController = sm_selectNavigationControllerTopDown() {
             return navigationController
-        } else if case .bottom = presentationStyle, let tabBarController = sm_selectTabBarControllerTopDown() {
+        } else if case .bottom? = topBottomStyle, let tabBarController = sm_selectTabBarControllerTopDown() {
             return tabBarController
         }
         return WindowViewController(windowLevel: self.view.window?.windowLevel ?? UIWindowLevelNormal, config: config)
@@ -60,15 +60,15 @@ extension UIViewController {
     }
 
     func sm_selectPresentationContextBottomUp(_ config: SwiftMessages.Config) -> UIViewController {
-        let presentationStyle = config.presentationStyle
+        let topBottomStyle = config.presentationStyle.topBottomStyle
         if let parent = parent {
             if let navigationController = parent as? UINavigationController {
-                if case .top = presentationStyle, navigationController.sm_isVisible(view: navigationController.navigationBar) {
+                if case .top? = topBottomStyle, navigationController.sm_isVisible(view: navigationController.navigationBar) {
                     return navigationController
                 }
                 return navigationController.sm_selectPresentationContextBottomUp(config)
             } else if let tabBarController = parent as? UITabBarController {
-                if case .bottom = presentationStyle, tabBarController.sm_isVisible(view: tabBarController.tabBar) {
+                if case .bottom? = topBottomStyle, tabBarController.sm_isVisible(view: tabBarController.tabBar) {
                     return tabBarController
                 }
                 return tabBarController.sm_selectPresentationContextBottomUp(config)
@@ -94,3 +94,17 @@ extension UIViewController {
         return true
     }
 }
+
+extension SwiftMessages.PresentationStyle {
+    /// A temporary workaround to allow custom presentation contexts using `TopBottomAnimation`
+    /// to display properly behind bars. THe long term solution is to refactor all of the
+    /// presentation context logic to work with safe area insets.
+    var topBottomStyle: TopBottomAnimation.Style? {
+        switch self {
+        case .top: return .top
+        case .bottom: return .bottom
+        case .custom(let animator): return (animator as? TopBottomAnimation)?.style
+        case .center: return nil
+        }
+    }
+}