From 0fbcea82c73671d8fdfffa1cd6030d90f891b3f8 Mon Sep 17 00:00:00 2001
From: Jay Lyerly <jay@oakcity.io>
Date: Wed, 12 Oct 2016 12:56:54 -0400
Subject: [PATCH 1/2] Add shouldAutorotate to the Config class.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a viewcontroller is created to host the message view, this property controls whether that viewcontroller with auto rotate when the device orientation changes.
Also update the demo’s “Explor” screen to include this option.
---
 Demo/Demo/Base.lproj/Main.storyboard       | 62 ++++++++++++++++------
 Demo/Demo/ExploreViewController.swift      | 10 ++++
 SwiftMessages/Presenter.swift              |  6 +--
 SwiftMessages/SwiftMessages.swift          |  8 +++
 SwiftMessages/UIViewController+Utils.swift | 18 ++++---
 SwiftMessages/WindowViewController.swift   |  8 ++-
 6 files changed, 84 insertions(+), 28 deletions(-)

diff --git a/Demo/Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard
index 727642ce..a257ea37 100644
--- a/Demo/Demo/Base.lproj/Main.storyboard
+++ b/Demo/Demo/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11198.2" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="JQZ-C5-7mw">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="JQZ-C5-7mw">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
@@ -37,7 +37,7 @@
                                 <rect key="frame" x="0.0" y="92" width="375" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2n5-7h-3B5" id="Q5r-8D-38q">
-                                    <frame key="frameInset" width="375" height="79.5"/>
+                                    <frame key="frameInset" width="375" height="79"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="TITLE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Icl-Ci-lfe">
@@ -70,7 +70,7 @@
                                 <rect key="frame" x="0.0" y="172" width="375" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Pm-kC-YGr" id="LmG-UL-Bu8">
-                                    <frame key="frameInset" width="342" height="79.5"/>
+                                    <frame key="frameInset" width="342" height="79"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="EXPLORE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TbM-iT-SVg">
@@ -124,7 +124,7 @@
                             <tableViewSection headerTitle="Presentation" id="ifN-uy-lWX">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="nYa-Hy-Lda" userLabel="Presentation style cell">
-                                        <rect key="frame" x="0.0" y="119.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="120" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nYa-Hy-Lda" id="WC1-5B-Pa4">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -153,7 +153,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="eMM-fw-ePY" userLabel="Presentation context cell">
-                                        <rect key="frame" x="0.0" y="184.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="185" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eMM-fw-ePY" id="qjs-CO-J4K">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -183,7 +183,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="fnL-fA-GeP" userLabel="Duration cell">
-                                        <rect key="frame" x="0.0" y="249.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="250" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fnL-fA-GeP" id="xfk-SM-u8I">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -214,7 +214,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="hkB-YI-YQX" userLabel="Dim mode cell">
-                                        <rect key="frame" x="0.0" y="314.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="315" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hkB-YI-YQX" id="6ov-9U-ABh">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -243,8 +243,37 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="WaV-bX-Is6" userLabel="Theme cell">
+                                        <rect key="frame" x="0.0" y="380" width="600" height="65"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WaV-bX-Is6" id="HXE-Gz-bpy">
+                                            <frame key="frameInset" width="600" height="65"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AUTOROTATE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ic5-7L-mb9">
+                                                    <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Y5E-ms-OZS">
+                                                    <segments>
+                                                        <segment title="True"/>
+                                                        <segment title="False"/>
+                                                    </segments>
+                                                </segmentedControl>
+                                            </subviews>
+                                            <constraints>
+                                                <constraint firstItem="Ic5-7L-mb9" firstAttribute="top" secondItem="HXE-Gz-bpy" secondAttribute="topMargin" id="7wg-26-e7T"/>
+                                                <constraint firstItem="Y5E-ms-OZS" firstAttribute="leading" secondItem="HXE-Gz-bpy" secondAttribute="leadingMargin" constant="10" id="9ep-BV-hDw"/>
+                                                <constraint firstItem="Y5E-ms-OZS" firstAttribute="top" secondItem="Ic5-7L-mb9" secondAttribute="bottom" constant="5" id="JIM-Lq-m5n"/>
+                                                <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="Y5E-ms-OZS" secondAttribute="trailing" constant="10" id="Xyd-fM-m55"/>
+                                                <constraint firstItem="Ic5-7L-mb9" firstAttribute="leading" secondItem="HXE-Gz-bpy" secondAttribute="leadingMargin" constant="10" id="bcA-hI-fqj"/>
+                                                <constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="Y5E-ms-OZS" secondAttribute="bottom" id="zDi-Zx-CYs"/>
+                                            </constraints>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="zQR-VC-Yl3" userLabel="Drop shadow cell">
-                                        <rect key="frame" x="0.0" y="379.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="445" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zQR-VC-Yl3" id="RZq-YF-8fo">
                                             <frame key="frameInset" width="600" height="44"/>
@@ -276,7 +305,7 @@
                             <tableViewSection headerTitle="Styling" id="Ibz-q6-0d2">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="u46-FS-ahC" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="479.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="546" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="u46-FS-ahC" id="A01-Bb-OrK">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -307,7 +336,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="v73-pR-Iy2" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="544.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="611" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v73-pR-Iy2" id="Fdp-gh-OCb">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -339,7 +368,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="0mE-sA-4rN" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="609.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="676" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0mE-sA-4rN" id="eVs-bm-01A">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -369,7 +398,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="4RW-U9-BVB" userLabel="Drop shadow cell">
-                                        <rect key="frame" x="0.0" y="674.5" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="741" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4RW-U9-BVB" id="wdb-hX-CIv">
                                             <frame key="frameInset" width="600" height="44"/>
@@ -401,7 +430,7 @@
                             <tableViewSection headerTitle="CONTENT" id="Mih-L6-PeE">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="ddI-Jn-NgP" userLabel="Title cell">
-                                        <rect key="frame" x="0.0" y="774.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="842" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ddI-Jn-NgP" id="4HG-zA-HtF">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -428,7 +457,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="bdE-R5-mtF" userLabel="Subtitle cell">
-                                        <rect key="frame" x="0.0" y="839.5" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="907" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bdE-R5-mtF" id="E8h-YG-8UX">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -455,7 +484,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="110" id="i0m-Xn-tMe" userLabel="Hiding cell">
-                                        <rect key="frame" x="0.0" y="904.5" width="600" height="110"/>
+                                        <rect key="frame" x="0.0" y="972" width="600" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="i0m-Xn-tMe" id="y4L-XO-6WY">
                                             <frame key="frameInset" width="600" height="110"/>
@@ -587,6 +616,7 @@
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="600" height="1200"/>
                     <connections>
+                        <outlet property="autoRotate" destination="Y5E-ms-OZS" id="7u5-1r-TZN"/>
                         <outlet property="bodyText" destination="Ev4-j7-wY0" id="mD6-Ge-qJY"/>
                         <outlet property="dimMode" destination="iw9-KB-Nyd" id="OiP-ss-kEO"/>
                         <outlet property="dropShadow" destination="sqb-Fg-YR8" id="zUz-6P-IFz"/>
diff --git a/Demo/Demo/ExploreViewController.swift b/Demo/Demo/ExploreViewController.swift
index a5fadbff..b805912c 100644
--- a/Demo/Demo/ExploreViewController.swift
+++ b/Demo/Demo/ExploreViewController.swift
@@ -118,6 +118,15 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {
             break
         }
         
+        switch self.autoRotate.selectedSegmentIndex {
+        case 0:
+            config.shouldAutorotate = true
+        case 1:
+            config.shouldAutorotate = false
+        default:
+            break
+        }
+        
         config.interactiveHide = interactiveHide.isOn
         
         // Set status bar style unless using card view (since it doesn't
@@ -147,6 +156,7 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {
     @IBOutlet weak var layout: UISegmentedControl!
     @IBOutlet weak var theme: UISegmentedControl!
     @IBOutlet weak var iconStyle: UISegmentedControl!
+    @IBOutlet weak var autoRotate: UISegmentedControl!
     @IBOutlet weak var dropShadow: UISwitch!
     @IBOutlet weak var titleText: UITextField!
     @IBOutlet weak var bodyText: UITextField!
diff --git a/SwiftMessages/Presenter.swift b/SwiftMessages/Presenter.swift
index 60a7e510..a0dc82df 100644
--- a/SwiftMessages/Presenter.swift
+++ b/SwiftMessages/Presenter.swift
@@ -67,7 +67,7 @@ class Presenter: NSObject, UIGestureRecognizerDelegate {
     func getPresentationContext() throws -> UIViewController {
         
         func newWindowViewController(_ windowLevel: UIWindowLevel) -> UIViewController {
-            let viewController = WindowViewController(windowLevel: windowLevel)
+            let viewController = WindowViewController(windowLevel: windowLevel, config: config)
             if windowLevel == UIWindowLevelNormal {
                 viewController.statusBarStyle = config.preferredStatusBarStyle
             }
@@ -77,14 +77,14 @@ class Presenter: NSObject, UIGestureRecognizerDelegate {
         switch config.presentationContext {
         case .automatic:
             if let rootViewController = UIApplication.shared.keyWindow?.rootViewController {
-                return rootViewController.sm_selectPresentationContextTopDown(config.presentationStyle)
+                return rootViewController.sm_selectPresentationContextTopDown(config)
             } else {
                 throw SwiftMessagesError.noRootViewController
             }
         case .window(let level):
             return newWindowViewController(level)
         case .viewController(let viewController):
-            return viewController.sm_selectPresentationContextBottomUp(config.presentationStyle)
+            return viewController.sm_selectPresentationContextBottomUp(config)
         }
     }
     
diff --git a/SwiftMessages/SwiftMessages.swift b/SwiftMessages/SwiftMessages.swift
index fbc3b49d..20ca98e0 100644
--- a/SwiftMessages/SwiftMessages.swift
+++ b/SwiftMessages/SwiftMessages.swift
@@ -176,6 +176,14 @@ open class SwiftMessages: PresenterDelegate {
          the current one. The default is `.Default`.
          */
         public var preferredStatusBarStyle: UIStatusBarStyle?
+        
+        /**
+         If a view controller is created to host the message view, should the view 
+         controller auto rotate?  The default is 'true', meaning it should auto
+         rotate.
+         */
+        public var shouldAutorotate: Bool = true
+
     }
     
     /**
diff --git a/SwiftMessages/UIViewController+Utils.swift b/SwiftMessages/UIViewController+Utils.swift
index fd6e3d23..eaa38cb6 100644
--- a/SwiftMessages/UIViewController+Utils.swift
+++ b/SwiftMessages/UIViewController+Utils.swift
@@ -12,15 +12,16 @@ private let fullScreenStyles: [UIModalPresentationStyle] = [.fullScreen, .overFu
 
 extension UIViewController {
     
-    func sm_selectPresentationContextTopDown(_ presentationStyle: SwiftMessages.PresentationStyle) -> UIViewController {
+    func sm_selectPresentationContextTopDown(_ config: SwiftMessages.Config) -> UIViewController {
+        let presentationStyle = config.presentationStyle
         if let presented = sm_presentedFullScreenViewController() {
-            return presented.sm_selectPresentationContextTopDown(presentationStyle)
+            return presented.sm_selectPresentationContextTopDown(config)
         } else if case .top = presentationStyle, let navigationController = sm_selectNavigationControllerTopDown() {
             return navigationController
         } else if case .bottom = presentationStyle, let tabBarController = sm_selectTabBarControllerTopDown() {
             return tabBarController
         }
-        return WindowViewController(windowLevel: self.view.window?.windowLevel ?? UIWindowLevelNormal)
+        return WindowViewController(windowLevel: self.view.window?.windowLevel ?? UIWindowLevelNormal, config: config)
     }
     
     fileprivate func sm_selectNavigationControllerTopDown() -> UINavigationController? {
@@ -58,27 +59,28 @@ extension UIViewController {
         return nil
     }
 
-    func sm_selectPresentationContextBottomUp(_ presentationStyle: SwiftMessages.PresentationStyle) -> UIViewController {
+    func sm_selectPresentationContextBottomUp(_ config: SwiftMessages.Config) -> UIViewController {
+        let presentationStyle = config.presentationStyle
         if let parent = parent {
             if let navigationController = parent as? UINavigationController {
                 if case .top = presentationStyle, navigationController.sm_isVisible(view: navigationController.navigationBar) {
                     return navigationController
                 }
-                return navigationController.sm_selectPresentationContextBottomUp(presentationStyle)
+                return navigationController.sm_selectPresentationContextBottomUp(config)
             } else if let tabBarController = parent as? UITabBarController {
                 if case .bottom = presentationStyle, tabBarController.sm_isVisible(view: tabBarController.tabBar) {
                     return tabBarController
                 }
-                return tabBarController.sm_selectPresentationContextBottomUp(presentationStyle)
+                return tabBarController.sm_selectPresentationContextBottomUp(config)
             }
         }
         if self.view is UITableView {
             // Never select scroll view as presentation context
             // because, you know, it scrolls.
             if let parent = self.parent {
-                return parent.sm_selectPresentationContextBottomUp(presentationStyle)
+                return parent.sm_selectPresentationContextBottomUp(config)
             } else {
-                return WindowViewController(windowLevel: self.view.window?.windowLevel ?? UIWindowLevelNormal)
+                return WindowViewController(windowLevel: self.view.window?.windowLevel ?? UIWindowLevelNormal, config: config)
             }
         }
         return self
diff --git a/SwiftMessages/WindowViewController.swift b/SwiftMessages/WindowViewController.swift
index f5e3fe2a..a9cbe079 100644
--- a/SwiftMessages/WindowViewController.swift
+++ b/SwiftMessages/WindowViewController.swift
@@ -14,10 +14,16 @@ class WindowViewController: UIViewController
     
     let windowLevel: UIWindowLevel
     var statusBarStyle: UIStatusBarStyle?
+    let config: SwiftMessages.Config
     
-    init(windowLevel: UIWindowLevel = UIWindowLevelNormal)
+    override var shouldAutorotate: Bool {
+        return config.shouldAutorotate
+    }
+    
+    init(windowLevel: UIWindowLevel = UIWindowLevelNormal, config: SwiftMessages.Config)
     {
         self.windowLevel = windowLevel
+        self.config = config
         let window = PassthroughWindow(frame: UIScreen.main.bounds)
         self.window = window
         super.init(nibName: nil, bundle: nil)

From d34390e40d48cce05cc4f4fa0f24e6dbc74c513f Mon Sep 17 00:00:00 2001
From: Timothy Moose <tim@swiftkick.it>
Date: Wed, 12 Oct 2016 16:36:55 -0500
Subject: [PATCH 2/2] Minor internal and demo app cleanup

---
 .../AppIcon.appiconset/Contents.json          | 10 +++
 Demo/Demo/Base.lproj/Main.storyboard          | 89 +++++++++----------
 Demo/Demo/ExploreViewController.swift         | 13 +--
 SwiftMessages/Presenter.swift                 |  3 -
 SwiftMessages/WindowViewController.swift      |  3 +-
 5 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
index 118c98f7..b8236c65 100644
--- a/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
diff --git a/Demo/Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard
index a257ea37..2be9921a 100644
--- a/Demo/Demo/Base.lproj/Main.storyboard
+++ b/Demo/Demo/Base.lproj/Main.storyboard
@@ -29,15 +29,15 @@
             <objects>
                 <tableViewController id="vur-BZ-g1e" customClass="ViewController" customModule="Demo" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="j4a-wU-637">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TitleBody" rowHeight="80" id="2n5-7h-3B5" userLabel="TitleBodyCell" customClass="TitleBodyCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="92" width="375" height="80"/>
+                                <rect key="frame" x="0.0" y="92" width="414" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2n5-7h-3B5" id="Q5r-8D-38q">
-                                    <frame key="frameInset" width="375" height="79"/>
+                                    <frame key="frameInset" width="414" height="79.666666666666671"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="TITLE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Icl-Ci-lfe">
@@ -67,10 +67,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="Explore" rowHeight="80" id="4Pm-kC-YGr" userLabel="ExploreCell" customClass="TitleBodyCell" customModule="Demo" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="172" width="375" height="80"/>
+                                <rect key="frame" x="0.0" y="172" width="414" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4Pm-kC-YGr" id="LmG-UL-Bu8">
-                                    <frame key="frameInset" width="342" height="79"/>
+                                    <frame key="frameInset" width="381" height="79.666666666666671"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="752" text="EXPLORE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TbM-iT-SVg">
@@ -124,7 +124,7 @@
                             <tableViewSection headerTitle="Presentation" id="ifN-uy-lWX">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="nYa-Hy-Lda" userLabel="Presentation style cell">
-                                        <rect key="frame" x="0.0" y="120" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="119.33333333333334" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nYa-Hy-Lda" id="WC1-5B-Pa4">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -153,7 +153,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="eMM-fw-ePY" userLabel="Presentation context cell">
-                                        <rect key="frame" x="0.0" y="185" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="184.33333333333334" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="eMM-fw-ePY" id="qjs-CO-J4K">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -183,7 +183,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="fnL-fA-GeP" userLabel="Duration cell">
-                                        <rect key="frame" x="0.0" y="250" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="249.33333333333334" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="fnL-fA-GeP" id="xfk-SM-u8I">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -214,7 +214,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="hkB-YI-YQX" userLabel="Dim mode cell">
-                                        <rect key="frame" x="0.0" y="315" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="314.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hkB-YI-YQX" id="6ov-9U-ABh">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -243,59 +243,58 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="WaV-bX-Is6" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="380" width="600" height="65"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="zQR-VC-Yl3" userLabel="Interactive hide cell">
+                                        <rect key="frame" x="0.0" y="379.33333333333337" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WaV-bX-Is6" id="HXE-Gz-bpy">
-                                            <frame key="frameInset" width="600" height="65"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zQR-VC-Yl3" id="RZq-YF-8fo">
+                                            <frame key="frameInset" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AUTOROTATE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ic5-7L-mb9">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="INTERACTIVE HIDE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dw8-96-uXk">
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Y5E-ms-OZS">
-                                                    <segments>
-                                                        <segment title="True"/>
-                                                        <segment title="False"/>
-                                                    </segments>
-                                                </segmentedControl>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vdr-7b-DJB"/>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="Ic5-7L-mb9" firstAttribute="top" secondItem="HXE-Gz-bpy" secondAttribute="topMargin" id="7wg-26-e7T"/>
-                                                <constraint firstItem="Y5E-ms-OZS" firstAttribute="leading" secondItem="HXE-Gz-bpy" secondAttribute="leadingMargin" constant="10" id="9ep-BV-hDw"/>
-                                                <constraint firstItem="Y5E-ms-OZS" firstAttribute="top" secondItem="Ic5-7L-mb9" secondAttribute="bottom" constant="5" id="JIM-Lq-m5n"/>
-                                                <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="Y5E-ms-OZS" secondAttribute="trailing" constant="10" id="Xyd-fM-m55"/>
-                                                <constraint firstItem="Ic5-7L-mb9" firstAttribute="leading" secondItem="HXE-Gz-bpy" secondAttribute="leadingMargin" constant="10" id="bcA-hI-fqj"/>
-                                                <constraint firstAttribute="bottomMargin" relation="greaterThanOrEqual" secondItem="Y5E-ms-OZS" secondAttribute="bottom" id="zDi-Zx-CYs"/>
+                                                <constraint firstItem="dw8-96-uXk" firstAttribute="leading" secondItem="RZq-YF-8fo" secondAttribute="leadingMargin" constant="10" id="5Yb-Fn-nX6"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="Vdr-7b-DJB" secondAttribute="trailing" constant="10" id="5oG-04-THv"/>
+                                                <constraint firstItem="dw8-96-uXk" firstAttribute="centerY" secondItem="RZq-YF-8fo" secondAttribute="centerY" id="6Td-Pc-Kix"/>
+                                                <constraint firstItem="Vdr-7b-DJB" firstAttribute="centerY" secondItem="dw8-96-uXk" secondAttribute="centerY" id="7bs-jn-bU1"/>
+                                                <constraint firstItem="dw8-96-uXk" firstAttribute="top" secondItem="RZq-YF-8fo" secondAttribute="topMargin" id="rRR-g6-pXq"/>
                                             </constraints>
+                                            <variation key="default">
+                                                <mask key="constraints">
+                                                    <exclude reference="6Td-Pc-Kix"/>
+                                                </mask>
+                                            </variation>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="zQR-VC-Yl3" userLabel="Drop shadow cell">
-                                        <rect key="frame" x="0.0" y="445" width="600" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="jsU-7Q-nnr" userLabel="Auto rotate cell">
+                                        <rect key="frame" x="0.0" y="423.33333333333337" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zQR-VC-Yl3" id="RZq-YF-8fo">
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jsU-7Q-nnr" id="Lyn-8c-LBy">
                                             <frame key="frameInset" width="600" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="INTERACTIVE HIDE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dw8-96-uXk">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AUTO ROTATE" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VW7-M1-Q0o">
                                                     <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vdr-7b-DJB"/>
+                                                <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WfA-vA-cpG"/>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="dw8-96-uXk" firstAttribute="leading" secondItem="RZq-YF-8fo" secondAttribute="leadingMargin" constant="10" id="5Yb-Fn-nX6"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="Vdr-7b-DJB" secondAttribute="trailing" constant="10" id="5oG-04-THv"/>
-                                                <constraint firstItem="dw8-96-uXk" firstAttribute="centerY" secondItem="RZq-YF-8fo" secondAttribute="centerY" id="6Td-Pc-Kix"/>
-                                                <constraint firstItem="Vdr-7b-DJB" firstAttribute="centerY" secondItem="dw8-96-uXk" secondAttribute="centerY" id="7bs-jn-bU1"/>
-                                                <constraint firstItem="dw8-96-uXk" firstAttribute="top" secondItem="RZq-YF-8fo" secondAttribute="topMargin" id="rRR-g6-pXq"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="WfA-vA-cpG" secondAttribute="trailing" constant="10" id="HBd-ud-36Q"/>
+                                                <constraint firstItem="VW7-M1-Q0o" firstAttribute="centerY" secondItem="Lyn-8c-LBy" secondAttribute="centerY" id="Yjw-4P-Xec"/>
+                                                <constraint firstItem="WfA-vA-cpG" firstAttribute="centerY" secondItem="VW7-M1-Q0o" secondAttribute="centerY" id="uuV-KC-8Ti"/>
+                                                <constraint firstItem="VW7-M1-Q0o" firstAttribute="leading" secondItem="Lyn-8c-LBy" secondAttribute="leadingMargin" constant="10" id="vmK-Hu-mBb"/>
+                                                <constraint firstItem="VW7-M1-Q0o" firstAttribute="top" secondItem="Lyn-8c-LBy" secondAttribute="topMargin" id="wyC-LT-Lft"/>
                                             </constraints>
                                             <variation key="default">
                                                 <mask key="constraints">
-                                                    <exclude reference="6Td-Pc-Kix"/>
+                                                    <exclude reference="Yjw-4P-Xec"/>
                                                 </mask>
                                             </variation>
                                         </tableViewCellContentView>
@@ -305,7 +304,7 @@
                             <tableViewSection headerTitle="Styling" id="Ibz-q6-0d2">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="u46-FS-ahC" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="546" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="523.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="u46-FS-ahC" id="A01-Bb-OrK">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -336,7 +335,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="v73-pR-Iy2" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="611" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="588.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v73-pR-Iy2" id="Fdp-gh-OCb">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -368,7 +367,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="0mE-sA-4rN" userLabel="Theme cell">
-                                        <rect key="frame" x="0.0" y="676" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="653.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0mE-sA-4rN" id="eVs-bm-01A">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -398,7 +397,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="4RW-U9-BVB" userLabel="Drop shadow cell">
-                                        <rect key="frame" x="0.0" y="741" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="718.33333333333337" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="4RW-U9-BVB" id="wdb-hX-CIv">
                                             <frame key="frameInset" width="600" height="44"/>
@@ -430,7 +429,7 @@
                             <tableViewSection headerTitle="CONTENT" id="Mih-L6-PeE">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="ddI-Jn-NgP" userLabel="Title cell">
-                                        <rect key="frame" x="0.0" y="842" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="818.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ddI-Jn-NgP" id="4HG-zA-HtF">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -457,7 +456,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="65" id="bdE-R5-mtF" userLabel="Subtitle cell">
-                                        <rect key="frame" x="0.0" y="907" width="600" height="65"/>
+                                        <rect key="frame" x="0.0" y="883.33333333333337" width="600" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bdE-R5-mtF" id="E8h-YG-8UX">
                                             <frame key="frameInset" width="600" height="65"/>
@@ -484,7 +483,7 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="110" id="i0m-Xn-tMe" userLabel="Hiding cell">
-                                        <rect key="frame" x="0.0" y="972" width="600" height="110"/>
+                                        <rect key="frame" x="0.0" y="948.33333333333337" width="600" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="i0m-Xn-tMe" id="y4L-XO-6WY">
                                             <frame key="frameInset" width="600" height="110"/>
@@ -616,7 +615,7 @@
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="600" height="1200"/>
                     <connections>
-                        <outlet property="autoRotate" destination="Y5E-ms-OZS" id="7u5-1r-TZN"/>
+                        <outlet property="autoRotate" destination="WfA-vA-cpG" id="88o-Le-R5E"/>
                         <outlet property="bodyText" destination="Ev4-j7-wY0" id="mD6-Ge-qJY"/>
                         <outlet property="dimMode" destination="iw9-KB-Nyd" id="OiP-ss-kEO"/>
                         <outlet property="dropShadow" destination="sqb-Fg-YR8" id="zUz-6P-IFz"/>
diff --git a/Demo/Demo/ExploreViewController.swift b/Demo/Demo/ExploreViewController.swift
index b805912c..8cd38ac5 100644
--- a/Demo/Demo/ExploreViewController.swift
+++ b/Demo/Demo/ExploreViewController.swift
@@ -117,15 +117,8 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {
         default:
             break
         }
-        
-        switch self.autoRotate.selectedSegmentIndex {
-        case 0:
-            config.shouldAutorotate = true
-        case 1:
-            config.shouldAutorotate = false
-        default:
-            break
-        }
+
+        config.shouldAutorotate = self.autoRotate.isOn
         
         config.interactiveHide = interactiveHide.isOn
         
@@ -156,7 +149,7 @@ class ExploreViewController: UITableViewController, UITextFieldDelegate {
     @IBOutlet weak var layout: UISegmentedControl!
     @IBOutlet weak var theme: UISegmentedControl!
     @IBOutlet weak var iconStyle: UISegmentedControl!
-    @IBOutlet weak var autoRotate: UISegmentedControl!
+    @IBOutlet weak var autoRotate: UISwitch!
     @IBOutlet weak var dropShadow: UISwitch!
     @IBOutlet weak var titleText: UITextField!
     @IBOutlet weak var bodyText: UITextField!
diff --git a/SwiftMessages/Presenter.swift b/SwiftMessages/Presenter.swift
index a0dc82df..09be72a2 100644
--- a/SwiftMessages/Presenter.swift
+++ b/SwiftMessages/Presenter.swift
@@ -68,9 +68,6 @@ class Presenter: NSObject, UIGestureRecognizerDelegate {
         
         func newWindowViewController(_ windowLevel: UIWindowLevel) -> UIViewController {
             let viewController = WindowViewController(windowLevel: windowLevel, config: config)
-            if windowLevel == UIWindowLevelNormal {
-                viewController.statusBarStyle = config.preferredStatusBarStyle
-            }
             return viewController
         }
         
diff --git a/SwiftMessages/WindowViewController.swift b/SwiftMessages/WindowViewController.swift
index a9cbe079..6440526c 100644
--- a/SwiftMessages/WindowViewController.swift
+++ b/SwiftMessages/WindowViewController.swift
@@ -13,7 +13,6 @@ class WindowViewController: UIViewController
     fileprivate var window: UIWindow?
     
     let windowLevel: UIWindowLevel
-    var statusBarStyle: UIStatusBarStyle?
     let config: SwiftMessages.Config
     
     override var shouldAutorotate: Bool {
@@ -47,7 +46,7 @@ class WindowViewController: UIViewController
     }
     
     override public var preferredStatusBarStyle: UIStatusBarStyle {
-        return statusBarStyle ?? UIApplication.shared.statusBarStyle
+        return config.preferredStatusBarStyle ?? UIApplication.shared.statusBarStyle
     }
     
     override var prefersStatusBarHidden: Bool {