Merge pull request #7 from inloop/feature/update-demo-app-with-new-functions

Feature/update demo app with new functions

Author: Vilém Kurz

Example/UIViewController-DisplayInDrawer/Base.lproj/Main.storyboard

@@ -41,7 +41,7 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gE4-qu-Fbg">
-                                <rect key="frame" x="62.5" y="8" width="35" height="44"/>
+                                <rect key="frame" x="16" y="8" width="35" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="LSn-eT-hFL"/>
                                 </constraints>
@@ -51,7 +51,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n2S-kO-F6i">
-                                <rect key="frame" x="20" y="60" width="120" height="44"/>
+                                <rect key="frame" x="59" y="8" width="120" height="44"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="44" id="Jk5-Ug-mff"/>
                                 </constraints>
@@ -61,7 +61,7 @@
                                 </connections>
                             </button>
                             <imageView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sun" translatesAutoresizingMaskIntoConstraints="NO" id="9aL-bC-GCL">
-                                <rect key="frame" x="182" y="83" width="121.5" height="121.5"/>
+                                <rect key="frame" x="182.5" y="83" width="121.5" height="121.5"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="9aL-bC-GCL" secondAttribute="height" multiplier="1:1" id="9fQ-wl-ggV"/>
                                 </constraints>
@@ -72,27 +72,63 @@
                                     <constraint firstAttribute="width" secondItem="WHI-2I-FcN" secondAttribute="height" multiplier="1588:1008" id="cF5-Q9-QYV"/>
                                 </constraints>
                             </imageView>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="cye-0H-NTU">
+                                <rect key="frame" x="130" y="59" width="51" height="31"/>
+                                <connections>
+                                    <action selector="useMiddlePositionSwitchDidChangeValue:" destination="vXZ-lx-hvc" eventType="valueChanged" id="szN-08-Ppg"/>
+                                </connections>
+                            </switch>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="use middle position" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hsr-oB-V4F">
+                                <rect key="frame" x="16" y="67" width="110" height="14.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L4w-pG-YSK">
+                                <rect key="frame" x="187" y="8" width="110" height="44"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="44" id="rbb-OR-JVg"/>
+                                </constraints>
+                                <state key="normal" title="Change content"/>
+                                <connections>
+                                    <action selector="changeContentButtonPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="VYf-DU-oi2"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="n2S-kO-F6i" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" multiplier="0.5" id="1Wd-Ls-ASv"/>
                             <constraint firstItem="9aL-bC-GCL" firstAttribute="width" secondItem="kh9-bI-dsS" secondAttribute="width" multiplier="0.38" priority="999" id="3Ij-WH-oeg"/>
-                            <constraint firstItem="n2S-kO-F6i" firstAttribute="top" secondItem="gE4-qu-Fbg" secondAttribute="bottom" constant="8" id="46E-Pa-N96"/>
+                            <constraint firstItem="hsr-oB-V4F" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="4nW-J5-0mh"/>
+                            <constraint firstItem="cye-0H-NTU" firstAttribute="centerY" secondItem="hsr-oB-V4F" secondAttribute="centerY" id="9q3-nv-XpF"/>
+                            <constraint firstItem="cye-0H-NTU" firstAttribute="trailing" secondItem="n2S-kO-F6i" secondAttribute="trailing" id="B06-F6-Yjn"/>
                             <constraint firstItem="WHI-2I-FcN" firstAttribute="width" secondItem="kh9-bI-dsS" secondAttribute="width" id="BQz-L6-pQX"/>
+                            <constraint firstItem="gE4-qu-Fbg" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" id="C2y-IK-33N"/>
                             <constraint firstAttribute="trailingMargin" secondItem="9aL-bC-GCL" secondAttribute="trailing" id="C6x-nZ-IJW"/>
+                            <constraint firstItem="hsr-oB-V4F" firstAttribute="top" secondItem="gE4-qu-Fbg" secondAttribute="bottom" constant="15" id="FEW-r5-nD2"/>
+                            <constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="L4w-pG-YSK" secondAttribute="trailing" constant="7" id="JuE-3v-kmg"/>
+                            <constraint firstItem="L4w-pG-YSK" firstAttribute="centerY" secondItem="n2S-kO-F6i" secondAttribute="centerY" id="KnJ-r3-IaO"/>
                             <constraint firstItem="WHI-2I-FcN" firstAttribute="top" secondItem="9aL-bC-GCL" secondAttribute="bottom" constant="8" id="KoQ-kH-Qqy"/>
                             <constraint firstItem="WHI-2I-FcN" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="L9z-XR-MVL"/>
-                            <constraint firstItem="gE4-qu-Fbg" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" multiplier="0.5" id="gpP-x9-sOL"/>
+                            <constraint firstItem="L4w-pG-YSK" firstAttribute="leading" secondItem="n2S-kO-F6i" secondAttribute="trailing" constant="8" id="Xlg-8v-Izd"/>
+                            <constraint firstItem="cye-0H-NTU" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="hsr-oB-V4F" secondAttribute="trailing" constant="4" id="dDG-3A-47S"/>
+                            <constraint firstItem="n2S-kO-F6i" firstAttribute="centerY" secondItem="gE4-qu-Fbg" secondAttribute="centerY" id="g3d-Et-AI6"/>
+                            <constraint firstItem="n2S-kO-F6i" firstAttribute="leading" secondItem="gE4-qu-Fbg" secondAttribute="trailing" constant="8" id="jOe-kH-kiv"/>
                             <constraint firstItem="gE4-qu-Fbg" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="8" id="nN1-xu-vOF"/>
                             <constraint firstAttribute="bottom" secondItem="WHI-2I-FcN" secondAttribute="bottom" id="qxc-6B-GgV"/>
                         </constraints>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout" bottom="YES"/>
                     <navigationItem key="navigationItem" id="xRd-lz-Ipx"/>
+                    <connections>
+                        <outlet property="changeContentButton" destination="L4w-pG-YSK" id="uJ3-lV-Qhe"/>
+                        <outlet property="presentInDrawerButton" destination="n2S-kO-F6i" id="duv-W5-jQx"/>
+                        <outlet property="pushButton" destination="gE4-qu-Fbg" id="Ahy-0R-7iY"/>
+                        <outlet property="useMiddlePositionSwitch" destination="cye-0H-NTU" id="7ww-jB-jah"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="536.25" y="85.563380281690144"/>
+            <point key="canvasLocation" x="536.25" y="85"/>
         </scene>
     </scenes>
     <resources>

Example/UIViewController-DisplayInDrawer/Content.storyboard

@@ -76,6 +76,7 @@
                     </view>
                     <connections>
                         <outlet property="closeButton" destination="rec-5d-zRb" id="ixl-JT-IQH"/>
+                        <outlet property="imageViewWidthConstraint" destination="kKl-Y0-BiY" id="uOH-KB-csx"/>
                         <outlet property="panGestureRecognizer" destination="fqM-oh-g3U" id="jP4-TS-SFx"/>
                         <outlet property="separatorView" destination="wOb-Gp-hc1" id="tlM-G0-l8m"/>
                         <outlet property="textView" destination="44Q-NB-NbD" id="Fgd-gZ-BMe"/>

Example/UIViewController-DisplayInDrawer/ContentViewController.swift

@@ -5,7 +5,7 @@ import UIViewController_DisplayInDrawer
 
 enum ContentMode {
     case fullScreen
-    case drawer
+    case drawer(useMiddlePosition: Bool)
 
     var config: ContentConfig {
         switch self {
@@ -26,6 +26,7 @@ class ContentViewController: UIViewController {
     @IBOutlet private weak var closeButton: UIButton!
     @IBOutlet private weak var separatorView: UIView!
     @IBOutlet private weak var textView: UITextView!
+    @IBOutlet private weak var imageViewWidthConstraint: NSLayoutConstraint!
     @IBOutlet private var panGestureRecognizer: UIPanGestureRecognizer!
     private var panGestureTarget: Any? //You are required to keep a strong reference of it.
     private var mode: ContentMode!
@@ -43,6 +44,7 @@ class ContentViewController: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        textView.text = defaultText
         setupMode()
     }
 
@@ -57,14 +59,40 @@ class ContentViewController: UIViewController {
         setupMode()
     }
 
-    @IBAction private func dismiss() {
+    func changeContent() {
+        toggleText()
+        toggleImage()
+    }
+
+    @IBAction func dismiss() {
         drawerDismissClosure?()
     }
 
     private func setupMode() {
         view.backgroundColor = mode.config.backgroundColor
         closeButton.isHidden = mode.config.isCloseButtonHidden
     }
+
+    private let defaultText = "DEFAULT TEXT: Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."
+    private let defaultImageViewWidthConstant: CGFloat = 0
+    private let shorterText = "SHORTER TEXT: Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat"
+    private let smallerImageviewWidthConstant: CGFloat = -50
+
+    private func toggleImage() {
+        if imageViewWidthConstraint.constant == defaultImageViewWidthConstant {
+            imageViewWidthConstraint.constant = smallerImageviewWidthConstant
+        } else {
+            imageViewWidthConstraint.constant = defaultImageViewWidthConstant
+        }
+    }
+
+    private func toggleText() {
+        if textView.text == defaultText {
+            textView.text = shorterText
+        } else {
+            textView.text = defaultText
+        }
+    }
 }
 
 extension ContentViewController: DrawerConfiguration {
@@ -81,13 +109,17 @@ extension ContentViewController: DrawerConfiguration {
     }
 
     func middlePositionY(for parentHeight: CGFloat) -> CGFloat? {
-        guard isViewLoaded else { return nil }
-        return parentHeight - separatorView.frame.minY
+        guard isViewLoaded, useMiddlePosition else { return nil }
+        return halfOpenPositionY(for: parentHeight)
     }
 
     func bottomPositionY(for parentHeight: CGFloat) -> CGFloat {
         guard isViewLoaded else { return 0 }
-        return parentHeight - 18
+        if useMiddlePosition {
+            return parentHeight - 18
+        } else {
+            return halfOpenPositionY(for: parentHeight)
+        }
     }
 
     func setPanGestureTarget(_ target: Any, action: Selector) {
@@ -101,6 +133,18 @@ extension ContentViewController: DrawerConfiguration {
         let bottomPadding: CGFloat = 16
         return fixedContentHeight + scrollableContentHeight + bottomPadding
     }
+
+    private var useMiddlePosition: Bool {
+        guard let mode = mode,
+            case let ContentMode.drawer(useMiddlePosition) = mode else {
+                return false
+        }
+        return useMiddlePosition
+    }
+
+    private func halfOpenPositionY(for parentHeight: CGFloat) -> CGFloat {
+        return parentHeight - separatorView.frame.minY
+    }
 }
 
 extension UITextView {

Example/UIViewController-DisplayInDrawer/MainViewController.swift

@@ -4,6 +4,17 @@ import UIKit
 import UIViewController_DisplayInDrawer
 
 class MainViewController: UIViewController {
+    @IBOutlet weak var changeContentButton: UIButton!
+    @IBOutlet weak var useMiddlePositionSwitch: UISwitch!
+    @IBOutlet weak var presentInDrawerButton: UIButton!
+    @IBOutlet weak var pushButton: UIButton!
+
+    weak var drawerContentController: ContentViewController? {
+        didSet {
+            refreshButtons()
+        }
+    }
+
     @IBAction func push(_ sender: Any) {
         let controller = makeContentViewController()
         controller.setup(for: .fullScreen)
@@ -12,15 +23,36 @@ class MainViewController: UIViewController {
 
     @IBAction func presentInDrawer(_ sender: Any) {
         let controller = makeContentViewController()
-        controller.setup(for: .drawer)
+        controller.setup(for: .drawer(useMiddlePosition: useMiddlePositionSwitch.isOn))
         navigationController?.displayInDrawer(controller, drawerPositionDelegate: self)
+        drawerContentController = controller
     }
 
     private func makeContentViewController() -> ContentViewController {
         let storyboard = UIStoryboard(name: "Content", bundle: nil)
         let result = storyboard.instantiateInitialViewController() as! ContentViewController
         return result
     }
+
+    @IBAction func useMiddlePositionSwitchDidChangeValue(_ sender: Any) {
+        drawerContentController?.dismiss()
+    }
+    
+    @IBAction func changeContentButtonPressed(_ sender: Any) {
+        drawerContentController?.changeContent()
+    }
+
+    private func refreshButtons() {
+        if drawerContentController != nil {
+            changeContentButton.isEnabled = true
+            presentInDrawerButton.isEnabled = false
+            pushButton.isEnabled = false
+        } else {
+            changeContentButton.isEnabled = false
+            presentInDrawerButton.isEnabled = true
+            pushButton.isEnabled = true
+        }
+    }
 }
 
 extension MainViewController: DrawerPositionDelegate {
@@ -41,6 +73,10 @@ extension MainViewController: DrawerPositionDelegate {
     }
 
     func didDismissDrawer() {
+        // didSet is not called when ARC releases weak property, we must force it manually. Moreover we have to wait for ARC to kick in.
+        DispatchQueue.main.async {
+            self.refreshButtons()
+        }
         NSLog("did dismiss drawer")
     }
 }