Merge remote-tracking branch 'origin/develop'

Author: Olga Konoreva

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 All notable changes of the library will be documented in this file.
 
+## 2.1 - [2017-10-23]
+### Added
+- Swift 4 support
+- Code refactoring
+- Check if menu is opened before a transition
+
+### Fixed
+- Small UI fix of Sample, associated with iOS 11
+
 ## 2.0 - [2017-06-07]
 ### Added
 - UITabBarController and UINavigationController menu items support
@@ -59,5 +68,6 @@ override func viewWillTransition(to size: CGSize, with coordinator: UIViewContro
 - Sample demonstrating using SideMenu library
 - README file
 
+[2017-10-23]: https://github.com/handsomecode/InteractiveSideMenu/compare/2.0...2.1
 [2017-06-07]: https://github.com/handsomecode/InteractiveSideMenu/compare/1.0...2.0
 [Issue #17]: https://github.com/handsomecode/InteractiveSideMenu/issues/17

InteractiveSideMenu.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		84E2E6751F15401000E5FF37 /* Options.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E2E6741F15401000E5FF37 /* Options.swift */; };
+		84E2E6771F15406600E5FF37 /* MenuTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E2E6761F15406600E5FF37 /* MenuTransitioningDelegate.swift */; };
 		881EF0921E3101130035DEB4 /* InteractiveSideMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 881EF0901E3101130035DEB4 /* InteractiveSideMenu.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		881EF0971E3101B80035DEB4 /* MenuAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0931E3101B80035DEB4 /* MenuAnimator.swift */; };
 		881EF0981E3101B80035DEB4 /* MenuContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0941E3101B80035DEB4 /* MenuContainerViewController.swift */; };
@@ -15,6 +17,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		84E2E6741F15401000E5FF37 /* Options.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Options.swift; sourceTree = "<group>"; };
+		84E2E6761F15406600E5FF37 /* MenuTransitioningDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuTransitioningDelegate.swift; sourceTree = "<group>"; };
 		881EF0831E30FFE40035DEB4 /* InteractiveSideMenu.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = InteractiveSideMenu.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		881EF08F1E3101130035DEB4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		881EF0901E3101130035DEB4 /* InteractiveSideMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InteractiveSideMenu.h; sourceTree = "<group>"; };
@@ -54,6 +58,8 @@
 		881EF08E1E3101130035DEB4 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
+				84E2E6741F15401000E5FF37 /* Options.swift */,
+				84E2E6761F15406600E5FF37 /* MenuTransitioningDelegate.swift */,
 				881EF0931E3101B80035DEB4 /* MenuAnimator.swift */,
 				881EF0941E3101B80035DEB4 /* MenuContainerViewController.swift */,
 				881EF0951E3101B80035DEB4 /* MenuItemContentViewController.swift */,
@@ -145,8 +151,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				881EF0971E3101B80035DEB4 /* MenuAnimator.swift in Sources */,
+				84E2E6771F15406600E5FF37 /* MenuTransitioningDelegate.swift in Sources */,
 				881EF0981E3101B80035DEB4 /* MenuContainerViewController.swift in Sources */,
 				881EF0991E3101B80035DEB4 /* MenuItemContentViewController.swift in Sources */,
+				84E2E6751F15401000E5FF37 /* Options.swift in Sources */,
 				881EF09A1E3101B80035DEB4 /* MenuViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

README.md

@@ -143,6 +143,10 @@ override func viewWillTransition(to size: CGSize, with coordinator: UIViewContro
 Transition options could be used to set different parameters for Compact and Regular sizes as well. Implement ViewController's ```traitCollectionDidChange(_: )``` method to add these settings.
 
  Use [Sample](./Sample) to see implementation details and [CHANGELOG](./CHANGELOG.md) to get more information about updating library from v1.0 to v2.0.
+ 
+# Known Issues
+There is [an issue](https://github.com/handsomecode/InteractiveSideMenu/issues/53) associated with scaling of NavigationBar in iOS 11. Status bar background is hidden during side menu closing if `contentScale < 1`. It’s supposed to be *iOS 11* Navigation Bar issue that's been reported to Apple.
+
 
 # Requirements
 - iOS 8.0+

Sample/Sample/AppDelegate.swift

@@ -53,4 +53,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
 }
-

Sample/Sample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -143,6 +143,11 @@
       "idiom" : "ipad",
       "filename" : "[email protected]",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Sample/Sample/Base.lproj/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0Vz-9K-i9E">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13528" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0Vz-9K-i9E">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13526"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -131,9 +131,12 @@
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="playful cat" translatesAutoresizingMaskIntoConstraints="NO" id="Bnb-ow-Hxx">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                             </imageView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g4R-sn-aDK">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="72.5"/>
+                            <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g4R-sn-aDK">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="67"/>
                                 <color key="backgroundColor" red="0.27659601897689767" green="0.27531419289247383" blue="0.27266927657285167" alpha="0.3859592013888889" colorSpace="custom" customColorSpace="sRGB"/>
+                                <accessibility key="accessibilityConfiguration">
+                                    <accessibilityTraits key="traits" notEnabled="YES"/>
+                                </accessibility>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ERA-XQ-g0N">
                                 <rect key="frame" x="6" y="20" width="44" height="44"/>
@@ -149,11 +152,11 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
+                            <constraint firstItem="g4R-sn-aDK" firstAttribute="bottom" secondItem="ERA-XQ-g0N" secondAttribute="bottom" constant="3" id="EaF-G6-evU"/>
                             <constraint firstItem="Bnb-ow-Hxx" firstAttribute="top" secondItem="mKv-5e-xGD" secondAttribute="top" id="Tby-NP-ybX"/>
                             <constraint firstItem="ERA-XQ-g0N" firstAttribute="leading" secondItem="mKv-5e-xGD" secondAttribute="leading" constant="6" id="ZVL-kv-kNf"/>
                             <constraint firstAttribute="trailing" secondItem="g4R-sn-aDK" secondAttribute="trailing" id="cD2-hF-Hlh"/>
                             <constraint firstAttribute="trailing" secondItem="Bnb-ow-Hxx" secondAttribute="trailing" id="dmN-Fb-ZHD"/>
-                            <constraint firstItem="g4R-sn-aDK" firstAttribute="baseline" secondItem="ERA-XQ-g0N" secondAttribute="baseline" constant="22" id="epz-Po-KkV"/>
                             <constraint firstItem="g4R-sn-aDK" firstAttribute="top" secondItem="mKv-5e-xGD" secondAttribute="top" id="l6N-OA-JNm"/>
                             <constraint firstAttribute="bottom" secondItem="Bnb-ow-Hxx" secondAttribute="bottom" id="loX-cs-71k"/>
                             <constraint firstItem="Bnb-ow-Hxx" firstAttribute="leading" secondItem="mKv-5e-xGD" secondAttribute="leading" id="sEV-X9-tvK"/>
@@ -179,12 +182,15 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="serious cat" translatesAutoresizingMaskIntoConstraints="NO" id="YaS-Hu-v7i">
+                            <imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="serious cat" translatesAutoresizingMaskIntoConstraints="NO" id="YaS-Hu-v7i">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                             </imageView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="toC-UG-sI2">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="72.5"/>
+                            <view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translatesAutoresizingMaskIntoConstraints="NO" id="toC-UG-sI2">
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="67"/>
                                 <color key="backgroundColor" red="0.27659601897689767" green="0.27531419289247383" blue="0.27266927657285167" alpha="0.55054873511904767" colorSpace="custom" customColorSpace="sRGB"/>
+                                <accessibility key="accessibilityConfiguration">
+                                    <accessibilityTraits key="traits" notEnabled="YES"/>
+                                </accessibility>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I55-bD-oRY">
                                 <rect key="frame" x="6" y="20" width="44" height="44"/>
@@ -200,10 +206,10 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
+                            <constraint firstItem="toC-UG-sI2" firstAttribute="bottom" secondItem="I55-bD-oRY" secondAttribute="bottom" constant="3" id="5nJ-1g-1eb"/>
                             <constraint firstItem="YaS-Hu-v7i" firstAttribute="top" secondItem="j8y-r6-qLd" secondAttribute="top" id="7oR-ES-nep"/>
                             <constraint firstItem="YaS-Hu-v7i" firstAttribute="leading" secondItem="j8y-r6-qLd" secondAttribute="leading" id="CXm-j9-YtU"/>
                             <constraint firstAttribute="trailing" secondItem="YaS-Hu-v7i" secondAttribute="trailing" id="EvG-Dg-g4R"/>
-                            <constraint firstItem="toC-UG-sI2" firstAttribute="baseline" secondItem="I55-bD-oRY" secondAttribute="baseline" constant="22" id="OLo-zq-t04"/>
                             <constraint firstItem="I55-bD-oRY" firstAttribute="leading" secondItem="j8y-r6-qLd" secondAttribute="leading" constant="6" id="haG-Lj-wf2"/>
                             <constraint firstItem="toC-UG-sI2" firstAttribute="leading" secondItem="j8y-r6-qLd" secondAttribute="leading" id="lvG-AB-XcK"/>
                             <constraint firstItem="toC-UG-sI2" firstAttribute="top" secondItem="j8y-r6-qLd" secondAttribute="top" id="po0-1I-K7D"/>
@@ -239,8 +245,8 @@
     </scenes>
     <resources>
         <image name="Menu" width="24" height="17"/>
-        <image name="ic_tabbar_playful" width="16" height="16"/>
-        <image name="ic_tabbar_serious" width="16" height="16"/>
+        <image name="ic_tabbar_playful" width="20" height="20"/>
+        <image name="ic_tabbar_serious" width="20" height="20"/>
         <image name="kitty" width="1620" height="1080"/>
         <image name="playful cat" width="500" height="375"/>
         <image name="serious cat" width="1020" height="452"/>

Sample/Sample/HostViewController.swift

@@ -26,7 +26,7 @@ import InteractiveSideMenu
  Has opportunity to show/hide side menu.
  */
 class HostViewController: MenuContainerViewController {
-    
+
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }

Sample/Sample/NavigationMenuViewController.swift

@@ -32,7 +32,7 @@ class NavigationMenuViewController: MenuViewController {
     override var prefersStatusBarHidden: Bool {
         return false
     }
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
 

Sample/Sample/TabBarViewController.swift

@@ -58,6 +58,3 @@ class SecondViewController: UIViewController {
     }
 
 }
-
-
-

Sources/InteractiveSideMenu.h

@@ -25,5 +25,3 @@ FOUNDATION_EXPORT double InteractiveSideMenuVersionNumber;
 FOUNDATION_EXPORT const unsigned char InteractiveSideMenuVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <InteractiveSideMenu/PublicHeader.h>
-
-