diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 6d88c11..3657d50 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - SideMenu (0.1.2) + - SideMenu (0.1.3) DEPENDENCIES: - SideMenu (from `../`) @@ -9,6 +9,6 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - SideMenu: baaf4e43b0cbddcee96782e5a31399800750b0d7 + SideMenu: 99057bf6a172dcb7f2fd750d29bc3440dd5a0144 COCOAPODS: 0.39.0 diff --git a/Example/Pods/Local Podspecs/SideMenu.podspec.json b/Example/Pods/Local Podspecs/SideMenu.podspec.json index 7fe69ce..a2ecde0 100644 --- a/Example/Pods/Local Podspecs/SideMenu.podspec.json +++ b/Example/Pods/Local Podspecs/SideMenu.podspec.json @@ -1,6 +1,6 @@ { "name": "SideMenu", - "version": "0.1.2", + "version": "0.1.3", "summary": "SideMenu is a simple and versatile side menu control.", "description": "SideMenu is a simple and versatile side menu control. It's highly customizable, but can also be implemented in storyboard without a single line of code. The are three standard animation styles to choose from along with several other options for further customization if desired. Just type SideMenuManager.menu... and code completion will show you everything you can customize.", "homepage": "https://github.com/jonkykong/SideMenu", @@ -11,7 +11,7 @@ }, "source": { "git": "https://github.com/jonkykong/SideMenu.git", - "tag": "0.1.2" + "tag": "0.1.3" }, "platforms": { "ios": "8.0" diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 6d88c11..3657d50 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - SideMenu (0.1.2) + - SideMenu (0.1.3) DEPENDENCIES: - SideMenu (from `../`) @@ -9,6 +9,6 @@ EXTERNAL SOURCES: :path: ../ SPEC CHECKSUMS: - SideMenu: baaf4e43b0cbddcee96782e5a31399800750b0d7 + SideMenu: 99057bf6a172dcb7f2fd750d29bc3440dd5a0144 COCOAPODS: 0.39.0 diff --git a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SideMenu.xcscheme b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SideMenu.xcscheme index 6cf480f..b93be4d 100644 --- a/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SideMenu.xcscheme +++ b/Example/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SideMenu.xcscheme @@ -14,7 +14,7 @@ buildForArchiving = "YES"> diff --git a/Example/Pods/Target Support Files/SideMenu/Info.plist b/Example/Pods/Target Support Files/SideMenu/Info.plist index 88ff137..f9f1a73 100644 --- a/Example/Pods/Target Support Files/SideMenu/Info.plist +++ b/Example/Pods/Target Support Files/SideMenu/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.1.2 + 0.1.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/SideMenu/Info.plist b/Example/SideMenu/Info.plist index fab4b93..91513ae 100644 --- a/Example/SideMenu/Info.plist +++ b/Example/SideMenu/Info.plist @@ -25,7 +25,7 @@ UILaunchStoryboardName LaunchScreen UIMainStoryboardFile - Main + Example UIRequiredDeviceCapabilities armv7 diff --git a/Example/SideMenu/Main.storyboard b/Example/SideMenu/Main.storyboard index 3cef256..32fa018 100644 --- a/Example/SideMenu/Main.storyboard +++ b/Example/SideMenu/Main.storyboard @@ -243,10 +243,10 @@ - + - + @@ -379,10 +379,10 @@ - + - + diff --git a/Example/SideMenu/MainViewController.swift b/Example/SideMenu/MainViewController.swift index a5c3d08..617ddb9 100644 --- a/Example/SideMenu/MainViewController.swift +++ b/Example/SideMenu/MainViewController.swift @@ -26,8 +26,8 @@ class MainViewController: UIViewController { private func setupSideMenu() { // Define the menus - SideMenuManager.menuLeftNavigationController = storyboard!.instantiateViewControllerWithIdentifier("LeftMenuNavigationController") as? UIMenuNavigationController - SideMenuManager.menuRightNavigationController = storyboard!.instantiateViewControllerWithIdentifier("RightMenuNavigationController") as? UIMenuNavigationController + SideMenuManager.menuLeftNavigationController = storyboard!.instantiateViewControllerWithIdentifier("LeftMenuNavigationController") as? UISideMenuNavigationController + SideMenuManager.menuRightNavigationController = storyboard!.instantiateViewControllerWithIdentifier("RightMenuNavigationController") as? UISideMenuNavigationController // Enable gestures. The left and/or right menus must be set up above for these to work. // Note that these continue to work on the Navigation Controller independent of the View Controller it displays! diff --git a/Pod/Classes/SideMenuManager.swift b/Pod/Classes/SideMenuManager.swift index 3757733..9246e38 100644 --- a/Pod/Classes/SideMenuManager.swift +++ b/Pod/Classes/SideMenuManager.swift @@ -12,7 +12,7 @@ SideMenuManager.menuAddScreenEdgePanGesturesToPresent(toView: self.navigationController!.view) */ -public class UIMenuNavigationController: UINavigationController { +public class UISideMenuNavigationController: UINavigationController { @IBInspectable public var leftSide:Bool = false { didSet { @@ -193,7 +193,7 @@ public class SideMenuManager: UIPercentDrivenInteractiveTransition, UIViewContro // prevent instantiation private override init() {} - public static var menuLeftNavigationController: UIMenuNavigationController? { + public static var menuLeftNavigationController: UISideMenuNavigationController? { willSet { if menuLeftNavigationController != nil { let originalBlurEffectStyle = menuBlurEffectStyle @@ -214,7 +214,7 @@ public class SideMenuManager: UIPercentDrivenInteractiveTransition, UIViewContro } } - public static var menuRightNavigationController: UIMenuNavigationController? { + public static var menuRightNavigationController: UISideMenuNavigationController? { willSet { if menuRightNavigationController != nil { let originalBlurEffectStyle = menuBlurEffectStyle diff --git a/SideMenu.podspec b/SideMenu.podspec index c6b15e9..5783951 100644 --- a/SideMenu.podspec +++ b/SideMenu.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = "SideMenu" - s.version = "0.1.2" + s.version = "0.1.3" s.summary = "SideMenu is a simple and versatile side menu control." # This description is used to generate tags and improve search results. diff --git a/etc/Screenshot.png b/etc/Screenshot.png deleted file mode 100644 index c2e5e1b..0000000 Binary files a/etc/Screenshot.png and /dev/null differ diff --git a/etc/Screenshot1.png b/etc/Screenshot1.png new file mode 100644 index 0000000..7a1188a Binary files /dev/null and b/etc/Screenshot1.png differ diff --git a/etc/Screenshot2.png b/etc/Screenshot2.png new file mode 100644 index 0000000..0351375 Binary files /dev/null and b/etc/Screenshot2.png differ diff --git a/etc/Screenshot3.png b/etc/Screenshot3.png new file mode 100644 index 0000000..6a2ac63 Binary files /dev/null and b/etc/Screenshot3.png differ