6 changed files with 96 additions and 118 deletions
--- a/SlideMenu.xcodeproj/project.pbxproj
+++ b/SlideMenu.xcodeproj/project.pbxproj
@ -525,7 +525,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SlideMenu/SlideMenu-Prefix.pch";
 				INFOPLIST_FILE = "SlideMenu/SlideMenu-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
@ -537,7 +536,6 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "SlideMenu/SlideMenu-Prefix.pch";
 				INFOPLIST_FILE = "SlideMenu/SlideMenu-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
 			};
--- a/SlideMenu/AppDelegate.m
+++ b/SlideMenu/AppDelegate.m
@ -42,11 +42,6 @@
        NSLog(@"Opened %@", menu);
    }];
    
-    [[NSNotificationCenter defaultCenter] addObserverForName:SlideNavigationControllerWillOpen object:nil queue:nil usingBlock:^(NSNotification *note) {
-        NSString *menu = note.userInfo[@"menu"];
-        NSLog(@"Opening %@", menu);
-    }];
-    
    [[NSNotificationCenter defaultCenter] addObserverForName:SlideNavigationControllerDidReveal object:nil queue:nil usingBlock:^(NSNotification *note) {
        NSString *menu = note.userInfo[@"menu"];
        NSLog(@"Revealed %@", menu);
--- a/SlideMenu/SlideMenu-Info.plist
+++ b/SlideMenu/SlideMenu-Info.plist
@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.aryaxt.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<string>com.aryaxt.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
--- a/SlideMenu/Source/SlideNavigationController.h
+++ b/SlideMenu/Source/SlideNavigationController.h
@ -48,8 +48,6 @@ extern NSString * const SlideNavigationControllerDidOpen;
 extern NSString  *const SlideNavigationControllerDidClose;
 extern NSString  *const SlideNavigationControllerDidReveal;

-extern NSString *const SlideMenuOpenAfterSwipeKey;
-
@property (nonatomic, assign) BOOL avoidSwitchingToSameClassViewController;
@property (nonatomic, assign) BOOL enableSwipeGesture;
@property (nonatomic, assign) BOOL enableShadow;
@ -60,8 +58,7 @@ extern NSString *const SlideMenuOpenAfterSwipeKey;
@property (nonatomic, assign) CGFloat portraitSlideOffset;
@property (nonatomic, assign) CGFloat landscapeSlideOffset;
@property (nonatomic, assign) CGFloat panGestureSideOffset;
-@property (nonatomic, assign) CGFloat menuOpenAnimationDuration;
-@property (nonatomic, assign) CGFloat menuCloseAnimationDuration;
+@property (nonatomic, assign) CGFloat menuRevealAnimationDuration;
@property (nonatomic, assign) UIViewAnimationOptions menuRevealAnimationOption;
@property (nonatomic, strong) id <SlideNavigationContorllerAnimator> menuRevealAnimator;

@ -78,6 +75,4 @@ extern NSString *const SlideMenuOpenAfterSwipeKey;
 - (void)toggleRightMenu;
 - (BOOL)isMenuOpen;

- (void)prepareMenuForReveal:(Menu)menu;
-
@end
--- a/SlideMenu/Source/SlideNavigationController.m
+++ b/SlideMenu/Source/SlideNavigationController.m
@ -47,12 +47,8 @@ NSString * const SlideNavigationControllerDidOpen = @"SlideNavigationControllerD
 NSString * const SlideNavigationControllerDidClose = @"SlideNavigationControllerDidClose";
 NSString  *const SlideNavigationControllerDidReveal = @"SlideNavigationControllerDidReveal";

-NSString *const SlideMenuOpenAfterSwipeKey = @"SlideMenuOpenAfterSwipeKey";
-
 #define MENU_SLIDE_ANIMATION_DURATION .3
-#define MENU_SLIDE_OPEN_ANIMATION_DURATION .4
-#define MENU_SLIDE_CLOSE_ANIMATION_DURATION .2
-#define MENU_SLIDE_ANIMATION_OPTION UIViewAnimationOptionCurveLinear
+#define MENU_SLIDE_ANIMATION_OPTION UIViewAnimationOptionCurveEaseOut
 #define MENU_QUICK_SLIDE_ANIMATION_DURATION .18
 #define MENU_IMAGE @"menu-button"
 #define MENU_SHADOW_RADIUS 10
@ -123,8 +119,7 @@ static SlideNavigationController *singletonInstance;
 	
 	singletonInstance = self;
 	
-	self.menuOpenAnimationDuration = MENU_SLIDE_OPEN_ANIMATION_DURATION;
-        self.menuCloseAnimationDuration = MENU_SLIDE_CLOSE_ANIMATION_DURATION;
+	self.menuRevealAnimationDuration = MENU_SLIDE_ANIMATION_DURATION;
 	self.menuRevealAnimationOption = MENU_SLIDE_ANIMATION_OPTION;
 	self.landscapeSlideOffset = MENU_DEFAULT_SLIDE_OFFSET;
 	self.portraitSlideOffset = MENU_DEFAULT_SLIDE_OFFSET;
@ -145,7 +140,7 @@ static SlideNavigationController *singletonInstance;
    
    // When menu open we disable user interaction
    // When rotates we want to make sure that userInteraction is enabled again
-    //[self enableTapGestureToCloseMenu:NO];
+    [self enableTapGestureToCloseMenu:NO];
    
    if (self.menuNeedsLayout)
    {
@ -156,7 +151,7 @@ static SlideNavigationController *singletonInstance;
        if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0") && [self isMenuOpen])
        {
            Menu menu = (self.horizontalLocation > 0) ? MenuLeft : MenuRight;
-            [self openMenu:menu withCompletion:nil];
+            [self openMenu:menu withDuration:0 andCompletion:nil];
        }
        
        self.menuNeedsLayout = NO;
@ -213,7 +208,8 @@ static SlideNavigationController *singletonInstance;
 }

 - (void)switchToViewController:(UIViewController *)viewController
-                popType:(PopType)poptype
+		 withSlideOutAnimation:(BOOL)slideOutAnimation
+					   popType:(PopType)poptype
 				 andCompletion:(void (^)())completion
 {
 	if (self.avoidSwitchingToSameClassViewController && [self.topViewController isKindOfClass:viewController.class])
@ -221,87 +217,95 @@ static SlideNavigationController *singletonInstance;
 		[self closeMenuWithCompletion:completion];
 		return;
 	}
-    
-    void (^switchAndCallCompletion)(BOOL) = ^(BOOL closeMenuBeforeCallingCompletion) {
-        if (poptype == PopTypeAll) {
-            [self setViewControllers:@[viewController]];
-        }
-        else {
-            [super popToRootViewControllerAnimated:NO];
-            [super pushViewController:viewController animated:NO];
-        }
-        
-        if (closeMenuBeforeCallingCompletion)
-        {
-            [self closeMenuWithCompletion:^{
-                if (completion)
-                    completion();
-            }];
-        }
-        else
-        {
-            if (completion)
-                completion();
-        }
-    };
-    
-//    if ([self isMenuOpen])
-//    {
-//        if (slideOutAnimation)
-//        {
-//            [UIView animateWithDuration:(slideOutAnimation) ? self.menuRevealAnimationDuration : 0
-//                                  delay:0
-//                                options:self.menuRevealAnimationOption
-//                             animations:^{
-//                                 CGFloat width = self.horizontalSize;
-//                                 CGFloat moveLocation = (self.horizontalLocation> 0) ? width : -1*width;
-//                                 [self moveHorizontallyToLocation:moveLocation];
-//                             } completion:^(BOOL finished) {
-//                                 switchAndCallCompletion(YES);
-//                             }];
-//        }
-//        else
-//        {
-//            switchAndCallCompletion(YES);
-//        }
-//    }
-//    else
-//    {
-//        switchAndCallCompletion(NO);
-//    }
-    
-    switchAndCallCompletion([self isMenuOpen]);
+	
+	void (^switchAndCallCompletion)(BOOL) = ^(BOOL closeMenuBeforeCallingCompletion) {
+		if (poptype == PopTypeAll) {
+			[self setViewControllers:@[viewController]];
+		}
+		else {
+			[super popToRootViewControllerAnimated:NO];
+			[super pushViewController:viewController animated:NO];
+		}
+		
+		if (closeMenuBeforeCallingCompletion)
+		{
+			[self closeMenuWithCompletion:^{
+				if (completion)
+					completion();
+			}];
+		}
+		else
+		{
+			if (completion)
+				completion();
+		}
+	};
+	
+	if ([self isMenuOpen])
+	{
+		if (slideOutAnimation)
+		{
+			[UIView animateWithDuration:(slideOutAnimation) ? self.menuRevealAnimationDuration : 0
+								  delay:0
+								options:self.menuRevealAnimationOption
+							 animations:^{
+								 CGFloat width = self.horizontalSize;
+								 CGFloat moveLocation = (self.horizontalLocation> 0) ? width : -1*width;
+								 [self moveHorizontallyToLocation:moveLocation];
+							 } completion:^(BOOL finished) {
+								 switchAndCallCompletion(YES);
+							 }];
+		}
+		else
+		{
+			switchAndCallCompletion(YES);
+		}
+	}
+	else
+	{
+		switchAndCallCompletion(NO);
+	}
 }

 - (void)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
 }

 - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
 				  withSlideOutAnimation:(BOOL)slideOutAnimation
 						  andCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeRoot andCompletion:completion];
 }

 - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
 						 withCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
 }

 - (void)popAllAndSwitchToViewController:(UIViewController *)viewController
 		 withSlideOutAnimation:(BOOL)slideOutAnimation
 				 andCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController popType:PopTypeAll andCompletion:completion];
+	[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeAll andCompletion:completion];
 }

 - (void)popAllAndSwitchToViewController:(UIViewController *)viewController
 						 withCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController popType:PopTypeAll andCompletion:completion];
+	[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeAll andCompletion:completion];
+}
+
+- (void)closeMenuWithCompletion:(void (^)())completion
+{
+	[self closeMenuWithDuration:self.menuRevealAnimationDuration andCompletion:completion];
+}
+
+- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion
+{
+	[self openMenu:menu withDuration:self.menuRevealAnimationDuration andCompletion:completion];
 }

 - (void)toggleLeftMenu
@ -468,23 +472,8 @@ static SlideNavigationController *singletonInstance;
 	return NO;
 }

- (CGFloat)openingPart
+- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)())completion
 {
-    CGFloat slideOffset = self.slideOffset;
-    CGFloat absHorizontalLocation = (CGFloat)fabs(self.horizontalLocation);
-    
-    return MIN(1.f, absHorizontalLocation/slideOffset);
-}
-
- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion
-{
-    [self openMenu:menu afterSwipe:NO withCompletion:completion];
-}
-
- (void)openMenu:(Menu)menu afterSwipe:(BOOL)afterSwipe withCompletion:(void (^)())completion
-{
-    NSTimeInterval duration = self.menuOpenAnimationDuration * (1.f - [self openingPart]);
-    
 	[self enableTapGestureToCloseMenu:YES];

 	[self prepareMenuForReveal:menu];
@ -502,16 +491,12 @@ static SlideNavigationController *singletonInstance;
 						 if (completion)
 							 completion();
                         
-                         [self postNotificationWithName:SlideNavigationControllerDidOpen forMenu:menu withExtParams:@{
-                                                                                                                      SlideMenuOpenAfterSwipeKey : @(afterSwipe)
-                                                                                                                      }];
+                         [self postNotificationWithName:SlideNavigationControllerDidOpen forMenu:menu];
 					 }];
 }

- (void)closeMenuWithCompletion:(void (^)())completion
+- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completion
 {
-    NSTimeInterval duration = self.menuCloseAnimationDuration * [self openingPart];
-    
 	[self enableTapGestureToCloseMenu:NO];
    
     Menu menu = (self.horizontalLocation > 0) ? MenuLeft : MenuRight;
@ -670,17 +655,22 @@ static SlideNavigationController *singletonInstance;

 - (void)postNotificationWithName:(NSString *)name forMenu:(Menu)menu
 {
-    [self postNotificationWithName:name forMenu:menu withExtParams:nil];
+    NSString *menuString = (menu == MenuLeft) ? NOTIFICATION_USER_INFO_MENU_LEFT : NOTIFICATION_USER_INFO_MENU_RIGHT;
+    NSDictionary *userInfo = @{ NOTIFICATION_USER_INFO_MENU : menuString };
+    [[NSNotificationCenter defaultCenter] postNotificationName:name object:nil userInfo:userInfo];
 }

- (void)postNotificationWithName:(NSString *)name forMenu:(Menu)menu withExtParams:(NSDictionary *)extParams
+#pragma mark - UINavigationControllerDelegate Methods -
+
+- (void)navigationController:(UINavigationController *)navigationController
+	  willShowViewController:(UIViewController *)viewController
+					animated:(BOOL)animated
 {
-    NSMutableDictionary *userInfo = extParams ? [extParams mutableCopy] : [NSMutableDictionary dictionary];
-    
-    NSString *menuString = (menu == MenuLeft) ? NOTIFICATION_USER_INFO_MENU_LEFT : NOTIFICATION_USER_INFO_MENU_RIGHT;
-    userInfo[NOTIFICATION_USER_INFO_MENU] = menuString;
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:name object:nil userInfo:[userInfo copy]];
+	if ([self shouldDisplayMenu:MenuLeft forViewController:viewController])
+		viewController.navigationItem.leftBarButtonItem = [self barButtonItemForMenu:MenuLeft];
+	
+	if ([self shouldDisplayMenu:MenuRight forViewController:viewController])
+		viewController.navigationItem.rightBarButtonItem = [self barButtonItemForMenu:MenuRight];
 }

 - (CGFloat)slideOffset
@ -743,8 +733,8 @@ static SlideNavigationController *singletonInstance;
    else
        currentMenu = (translation.x > 0) ? MenuLeft : MenuRight;
    
-//    if (![self shouldDisplayMenu:currentMenu forViewController:self.topViewController])
-//        return;
+    if (![self shouldDisplayMenu:currentMenu forViewController:self.topViewController])
+        return;
    
    [self prepareMenuForReveal:currentMenu];
    
@ -781,11 +771,11 @@ static SlideNavigationController *singletonInstance;
 				if (currentX > 0)
 				{
 					if ([self shouldDisplayMenu:menu forViewController:self.visibleViewController])
-						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
+						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
 				}
 				else
 				{
-					[self closeMenuWithCompletion:nil];
+					[self closeMenuWithDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
 				}
 			}
 			// Moving Left
@ -793,12 +783,12 @@ static SlideNavigationController *singletonInstance;
 			{
 				if (currentX > 0)
 				{
-                    [self closeMenuWithCompletion:nil];
+					[self closeMenuWithDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
 				}
 				else
 				{
 					if ([self shouldDisplayMenu:menu forViewController:self.visibleViewController])
-						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
+						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
 				}
 			}
 		}
@ -807,7 +797,7 @@ static SlideNavigationController *singletonInstance;
 			if (currentXOffset < (self.horizontalSize - self.slideOffset)/2)
 				[self closeMenuWithCompletion:nil];
 			else
-				[self openMenu:(currentX > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
+				[self openMenu:(currentX > 0) ? MenuLeft : MenuRight withCompletion:nil];
 		}
    }
 }
--- a/iOS-Slide-Menu.podspec
+++ b/iOS-Slide-Menu.podspec
@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
    s.name = 'iOS-Slide-Menu'
-    s.version = '1.4.6'
+    s.version = '1.4.5'
    s.summary = 'A Slide Menu for iOS'
    s.homepage = 'https://github.com/aryaxt/iOS-Slide-Menu'
    s.license = {
@ -8,7 +8,7 @@ Pod::Spec.new do |s|
      :file => 'License.txt'
    }
    s.author = {'Aryan Ghassemi' => 'https://github.com/aryaxt/iOS-Slide-Menu'}
-    s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.6'}
+    s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.5'}
    s.platform = :ios, '6.0'
    s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}'
    s.resources = ['SlideMenu/Source/Assets/**/*']