handsomecode · okonor · Jun 7, 2017 · Apr 18, 2017 · Apr 18, 2017 · Apr 25, 2017
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,61 @@
+# Change Log
+All notable changes to the library will be documented in this file.
+
+## [Unreleased]
+### Added
+- UITabBarController and UINavigationController menu items support
+- Rotation support
+- Public methods documentation in code
+- CHANGELOG file
+
+### Changed
+- Renamed `showMenu()`/`hideMenu()` methods to `showSideMenu()`/`hideSideMenu()`
+- Reworked [Sample](./Sample)
+
+### Fixed
+- Customization of spring animation parameters: [Issue #17]
+- Displaying horizontal images in [Sample](./Sample)
+
+**Migration notes**
+
+- To mark UIViewController as item of SideMenu you should adopt `SideMenuItemContent` protocol instead of inheritance.
+To show menu you should call `showSideMenu()` method from this protocol.
+```swift
+import InteractiveSideMenu
+
+class KittyViewController: UIViewController, SideMenuItemContent {
+
+    @IBAction func openMenu(_ sender: UIButton) {
+        showSideMenu()
+    }
+}
+```
+-  To customize animation you should now update ```transitionOptions``` property in ```MenuContainerViewColtroller``` class.
+```swift
+override func viewDidLoad() {
+    super.viewDidLoad()
+    let screenSize: CGRect = UIScreen.main.bounds
+    self.transitionOptions = TransitionOptions(duration: 0.4, visibleContentWidth: screenSize.width / 6)
+    ...
+}
+```
+
+- Now you have possibility to update customization settings using ```viewWillTransition(to:with:)``` mehod.
+```swift
+override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransition(to: size, with: coordinator)
+    var options = TransitionOptions()
+    options.duration = size.width < size.height ? 0.4 : 0.6
+    options.visibleContentWidth = size.width / 6
+    self.transitionOptions = options
+}
+```
+
+## 1.0 - 2017-01-23
+### Added
+- Left SideMenu with possibility to customize menu animation and content    
+- Sample demonstrating using SideMenu library
+- README file
+
+[Unreleased]: https://github.com/handsomecode/InteractiveSideMenu/compare/master...feature/nav_and_tab_controllers_support
+[Issue #17]: https://github.com/handsomecode/InteractiveSideMenu/issues/17
diff --git a/InteractiveSideMenu.podspec b/InteractiveSideMenu.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "InteractiveSideMenu"
-  s.version      = "1.0"
+  s.version      = "2.0"
   s.summary      = "Interactive Side Menu in Swift"
   s.homepage     = "https://github.com/handsomecode/InteractiveSideMenu"
   s.license      = "Apache 2.0 license"
@@ -13,4 +13,4 @@ Pod::Spec.new do |s|
   s.source_files  = "Sources/*.swift"
 
   s.pod_target_xcconfig = { 'SWIFT_VERSION' => '3' }
-end
+end
diff --git a/InteractiveSideMenu.xcodeproj/project.pbxproj b/InteractiveSideMenu.xcodeproj/project.pbxproj
@@ -102,7 +102,7 @@
 		881EF07A1E30FFE40035DEB4 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0820;
+				LastUpgradeCheck = 0830;
 				ORGANIZATIONNAME = Handsome;
 				TargetAttributes = {
 					881EF0821E30FFE40035DEB4 = {
@@ -258,12 +258,15 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = is.handsome.InteractiveSideMenu;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -279,11 +282,13 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "";
 				DEFINES_MODULE = YES;
+				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = is.handsome.InteractiveSideMenu;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme b/InteractiveSideMenu.xcodeproj/xcshareddata/xcschemes/InteractiveSideMenu.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ It supports following customization:
 - Using spring animation with params customization
 - Animation options like animation curve
 
+All these parameters could vary for different orientations.
+
 # Installation
 
 ## CocoaPods
@@ -31,12 +33,14 @@ github "handsomecode/InteractiveSideMenu"
 
 
 # Usage
-You should use 3 basic ViewControllers for creating subclasses for implementing your side menu.
+To implement your side menu you should create subclasses of basic View Controllers.
 - ```MenuContainerViewController``` is a host for menu and content views
 - ```MenuViewController``` is a container for menu view
-- ```MenuItemContentControlller``` is a container for content that corresponds menu item
 
-To setup your side menu you shoud do 3 things:
+Also, ensure that every menu item ViewController adopts relevant protocol.
+- ```SideMenuItemContent``` is a ViewController's protocol for data that corresponds menu item
+
+To setup your side menu you need to do three things:
 - Provide implementation of base ```MenuViewController``` and assing it to  ```menuViewController``` property
 - Provide implementation of menu content and assing array of content controllers to ```contentViewControllers``` property
 - Select initial content controller by calling ```selectContentViewController(_ selectedContentVC: MenuItemContentViewController)```
@@ -48,11 +52,8 @@ class HostViewController: MenuContainerViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
         menuViewController = self.storyboard!.instantiateViewController(withIdentifier: "NavigationMenu") as! MenuViewController
-
-		contentViewControllers = contentControllers()
-
+	contentViewControllers = contentControllers()
         selectContentViewController(contentViewControllers.first!)
     }
 
@@ -61,40 +62,53 @@ class HostViewController: MenuContainerViewController {
     	contentList.append(self.storyboard?.instantiateViewController(withIdentifier: "First") as! MenuItemContentViewController)
     	contentList.append(self.storyboard?.instantiateViewController(withIdentifier: "Second") as! MenuItemContentViewController)
     	return contentList
-	}
+    }
 }
 ```
 
-To show menu you should call ```showMenu()``` method that is available in MenuItemContentViewController class.
+To show menu, call ```showSideMenu()``` method from `SideMenuItemContent` protocol.
 ```swift
 import InteractiveSideMenu
 
-class FirstViewController: MenuItemContentViewController {
+class KittyViewController: UIViewController, SideMenuItemContent {
 
-    @IBAction func didOpenMenu(_ sender: UIButton) {
-        showMenu()
+    @IBAction func openMenu(_ sender: UIButton) {
+        showSideMenu()
     }
 }
 ``` 
 
-To change content view you should choose desired content controller and hide menu.
+To change content view, choose desired content controller and hide menu.
 ```swift
-let index = 2 // second menu item
-guard let menuContainerViewController = self.menuContainerViewController else { return }
-let contentController = menuContainerViewController.contentViewControllers[index]
-menuContainerViewController.selectContentViewController(contentController)
-menuContainerViewController.hideMenu()
+    let index = 2 // second menu item
+    guard let menuContainerViewController = self.menuContainerViewController else { return }
+    let contentController = menuContainerViewController.contentViewControllers[index]
+    menuContainerViewController.selectContentViewController(contentController)
+    menuContainerViewController.hideMenu()
  ```
 
- To customize animation for menu opening or closing you should override ```menuTransitionOptionsBuilder()``` method that is available in ```MenuContainerViewColtroller``` class.
+To customize animation for menu opening or closing, update ```transitionOptions``` property that is available in ```MenuContainerViewColtroller``` class. Initial setup could be done, for example, on controller's ```viewDidLoad()```.
  ```swift
- override func menuTransitionOptionsBuilder() -> TransitionOptionsBuilder? {
-    return TransitionOptionsBuilder() { builder in
-        builder.duration = 0.5
-        builder.contentScale = 1
-    }
+override func viewDidLoad() {
+    super.viewDidLoad()
+    let screenSize: CGRect = UIScreen.main.bounds
+    self.transitionOptions = TransitionOptions(duration: 0.4, visibleContentWidth: screenSize.width / 6)
+    ...
 }
-  ```
+```
+
+Also, you have possibility to update customization settings, e.g. set another options for landscape orientation. To do it, override ```viewWillTransition(to:with:)``` mehod and add desired parameters to ```transitionOptions``` property.
+```swift
+override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
+    super.viewWillTransition(to: size, with: coordinator)
+    var options = TransitionOptions()
+    options.duration = size.width < size.height ? 0.4 : 0.6
+    options.visibleContentWidth = size.width / 6
+    self.transitionOptions = options
+}
+```
+
+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.
 
  See [Sample](./Sample) for more details.
 

diff --git a/Sample/Sample.xcodeproj/project.pbxproj b/Sample/Sample.xcodeproj/project.pbxproj
@@ -11,10 +11,12 @@
 		881EF0AD1E3102E30035DEB4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 881EF0AB1E3102E30035DEB4 /* Main.storyboard */; };
 		881EF0AF1E3102E30035DEB4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 881EF0AE1E3102E30035DEB4 /* Assets.xcassets */; };
 		881EF0B21E3102E30035DEB4 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 881EF0B01E3102E30035DEB4 /* LaunchScreen.storyboard */; };
-		881EF0BD1E31037D0035DEB4 /* FirstViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0B91E31037D0035DEB4 /* FirstViewController.swift */; };
+		881EF0BD1E31037D0035DEB4 /* KittyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0B91E31037D0035DEB4 /* KittyViewController.swift */; };
 		881EF0BE1E31037D0035DEB4 /* HostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0BA1E31037D0035DEB4 /* HostViewController.swift */; };
 		881EF0BF1E31037D0035DEB4 /* NavigationMenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0BB1E31037D0035DEB4 /* NavigationMenuViewController.swift */; };
-		881EF0C01E31037D0035DEB4 /* SecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 881EF0BC1E31037D0035DEB4 /* SecondViewController.swift */; };
+		9A15C5481EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 881EF0C71E31049C0035DEB4 /* InteractiveSideMenu.framework */; };
+		9A15C5491EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 881EF0C71E31049C0035DEB4 /* InteractiveSideMenu.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		9A6755031EA8E30C00F0C71D /* TabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A6755021EA8E30C00F0C71D /* TabBarViewController.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -32,27 +34,49 @@
 			remoteGlobalIDString = 881EF0821E30FFE40035DEB4;
 			remoteInfo = InteractiveSideMenu;
 		};
+		9A15C54A1EDD62BC00C4FD75 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 881EF0C21E31049C0035DEB4 /* InteractiveSideMenu.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 881EF0821E30FFE40035DEB4;
+			remoteInfo = InteractiveSideMenu;
+		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		9A15C54C1EDD62BC00C4FD75 /* Embed Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				9A15C5491EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Embed Frameworks */,
+			);
+			name = "Embed Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		881EF0A41E3102E30035DEB4 /* Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Sample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		881EF0A71E3102E30035DEB4 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		881EF0AC1E3102E30035DEB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		881EF0AE1E3102E30035DEB4 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		881EF0B11E3102E30035DEB4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		881EF0B31E3102E30035DEB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		881EF0B91E31037D0035DEB4 /* FirstViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirstViewController.swift; sourceTree = "<group>"; };
+		881EF0B91E31037D0035DEB4 /* KittyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KittyViewController.swift; sourceTree = "<group>"; };
 		881EF0BA1E31037D0035DEB4 /* HostViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = HostViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		881EF0BB1E31037D0035DEB4 /* NavigationMenuViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NavigationMenuViewController.swift; sourceTree = "<group>"; };
-		881EF0BC1E31037D0035DEB4 /* SecondViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecondViewController.swift; sourceTree = "<group>"; };
 		881EF0C21E31049C0035DEB4 /* InteractiveSideMenu.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = InteractiveSideMenu.xcodeproj; path = ../InteractiveSideMenu.xcodeproj; sourceTree = "<group>"; };
+		9A6755021EA8E30C00F0C71D /* TabBarViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TabBarViewController.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		881EF0A11E3102E30035DEB4 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9A15C5481EDD62BC00C4FD75 /* InteractiveSideMenu.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -94,8 +118,8 @@
 		881EF0C11E3103A80035DEB4 /* MenuContentScreens */ = {
 			isa = PBXGroup;
 			children = (
-				881EF0B91E31037D0035DEB4 /* FirstViewController.swift */,
-				881EF0BC1E31037D0035DEB4 /* SecondViewController.swift */,
+				881EF0B91E31037D0035DEB4 /* KittyViewController.swift */,
+				9A6755021EA8E30C00F0C71D /* TabBarViewController.swift */,
 			);
 			name = MenuContentScreens;
 			sourceTree = "<group>";
@@ -118,11 +142,13 @@
 				881EF0A01E3102E30035DEB4 /* Sources */,
 				881EF0A11E3102E30035DEB4 /* Frameworks */,
 				881EF0A21E3102E30035DEB4 /* Resources */,
+				9A15C54C1EDD62BC00C4FD75 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				881EF0C91E3104AD0035DEB4 /* PBXTargetDependency */,
+				9A15C54B1EDD62BC00C4FD75 /* PBXTargetDependency */,
 			);
 			name = Sample;
 			productName = Sample;
@@ -197,10 +223,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				881EF0C01E31037D0035DEB4 /* SecondViewController.swift in Sources */,
-				881EF0BD1E31037D0035DEB4 /* FirstViewController.swift in Sources */,
+				881EF0BD1E31037D0035DEB4 /* KittyViewController.swift in Sources */,
 				881EF0BE1E31037D0035DEB4 /* HostViewController.swift in Sources */,
 				881EF0BF1E31037D0035DEB4 /* NavigationMenuViewController.swift in Sources */,
+				9A6755031EA8E30C00F0C71D /* TabBarViewController.swift in Sources */,
 				881EF0A81E3102E30035DEB4 /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -213,6 +239,11 @@
 			name = InteractiveSideMenu;
 			targetProxy = 881EF0C81E3104AD0035DEB4 /* PBXContainerItemProxy */;
 		};
+		9A15C54B1EDD62BC00C4FD75 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = InteractiveSideMenu;
+			targetProxy = 9A15C54A1EDD62BC00C4FD75 /* PBXContainerItemProxy */;
+		};
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
@@ -329,8 +360,10 @@
 		881EF0B71E3102E30035DEB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Sample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = is.handsome.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -341,8 +374,10 @@
 		881EF0B81E3102E30035DEB4 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = Sample/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = is.handsome.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";