Remove excess method

remove reverse when menu did end close

SlideMenu.xcodeproj/project.pbxproj

@@ -525,6 +525,7 @@
 				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;
 			};
@@ -536,6 +537,7 @@
 				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;
 			};

SlideMenu/AppDelegate.m

@@ -42,6 +42,11 @@
         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);

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>

SlideMenu/Source/SlideNavigationController.h

@@ -48,6 +48,8 @@ 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;
@@ -58,7 +60,8 @@ extern NSString  *const SlideNavigationControllerDidReveal;
 @property (nonatomic, assign) CGFloat portraitSlideOffset;
 @property (nonatomic, assign) CGFloat landscapeSlideOffset;
 @property (nonatomic, assign) CGFloat panGestureSideOffset;
-@property (nonatomic, assign) CGFloat menuRevealAnimationDuration;
+@property (nonatomic, assign) CGFloat menuOpenAnimationDuration;
+@property (nonatomic, assign) CGFloat menuCloseAnimationDuration;
 @property (nonatomic, assign) UIViewAnimationOptions menuRevealAnimationOption;
 @property (nonatomic, strong) id <SlideNavigationContorllerAnimator> menuRevealAnimator;
 
@@ -75,4 +78,6 @@ extern NSString  *const SlideNavigationControllerDidReveal;
 - (void)toggleRightMenu;
 - (BOOL)isMenuOpen;
 
+- (void)prepareMenuForReveal:(Menu)menu;
+
 @end

SlideMenu/Source/SlideNavigationController.m

@@ -47,8 +47,12 @@ 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_ANIMATION_OPTION UIViewAnimationOptionCurveEaseOut
+#define MENU_SLIDE_OPEN_ANIMATION_DURATION .4
+#define MENU_SLIDE_CLOSE_ANIMATION_DURATION .2
+#define MENU_SLIDE_ANIMATION_OPTION UIViewAnimationOptionCurveLinear
 #define MENU_QUICK_SLIDE_ANIMATION_DURATION .18
 #define MENU_IMAGE @"menu-button"
 #define MENU_SHADOW_RADIUS 10
@@ -119,7 +123,8 @@ static SlideNavigationController *singletonInstance;
 	
 	singletonInstance = self;
 	
-	self.menuRevealAnimationDuration = MENU_SLIDE_ANIMATION_DURATION;
+	self.menuOpenAnimationDuration = MENU_SLIDE_OPEN_ANIMATION_DURATION;
+        self.menuCloseAnimationDuration = MENU_SLIDE_CLOSE_ANIMATION_DURATION;
 	self.menuRevealAnimationOption = MENU_SLIDE_ANIMATION_OPTION;
 	self.landscapeSlideOffset = MENU_DEFAULT_SLIDE_OFFSET;
 	self.portraitSlideOffset = MENU_DEFAULT_SLIDE_OFFSET;
@@ -140,7 +145,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)
     {
@@ -151,7 +156,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 withDuration:0 andCompletion:nil];
+            [self openMenu:menu withCompletion:nil];
         }
         
         self.menuNeedsLayout = NO;
@@ -208,8 +213,7 @@ static SlideNavigationController *singletonInstance;
 }
 
 - (void)switchToViewController:(UIViewController *)viewController
-		 withSlideOutAnimation:(BOOL)slideOutAnimation
-					   popType:(PopType)poptype
+                popType:(PopType)poptype
 				 andCompletion:(void (^)())completion
 {
 	if (self.avoidSwitchingToSameClassViewController && [self.topViewController isKindOfClass:viewController.class])
@@ -217,95 +221,87 @@ 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);
-	}
+    
+    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)switchToViewController:(UIViewController *)viewController withCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
 }
 
 - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
 				  withSlideOutAnimation:(BOOL)slideOutAnimation
 						  andCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
 }
 
 - (void)popToRootAndSwitchToViewController:(UIViewController *)viewController
 						 withCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController withSlideOutAnimation:YES popType:PopTypeRoot andCompletion:completion];
+	[self switchToViewController:viewController popType:PopTypeRoot andCompletion:completion];
 }
 
 - (void)popAllAndSwitchToViewController:(UIViewController *)viewController
 		 withSlideOutAnimation:(BOOL)slideOutAnimation
 				 andCompletion:(void (^)())completion
 {
-	[self switchToViewController:viewController withSlideOutAnimation:slideOutAnimation popType:PopTypeAll andCompletion:completion];
+	[self switchToViewController:viewController popType:PopTypeAll andCompletion:completion];
 }
 
 - (void)popAllAndSwitchToViewController:(UIViewController *)viewController
 						 withCompletion:(void (^)())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];
+	[self switchToViewController:viewController popType:PopTypeAll andCompletion:completion];
 }
 
 - (void)toggleLeftMenu
@@ -472,8 +468,23 @@ static SlideNavigationController *singletonInstance;
 	return NO;
 }
 
-- (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)())completion
+- (CGFloat)openingPart
 {
+    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];
@@ -491,12 +502,16 @@ static SlideNavigationController *singletonInstance;
 						 if (completion)
 							 completion();
                          
-                         [self postNotificationWithName:SlideNavigationControllerDidOpen forMenu:menu];
+                         [self postNotificationWithName:SlideNavigationControllerDidOpen forMenu:menu withExtParams:@{
+                                                                                                                      SlideMenuOpenAfterSwipeKey : @(afterSwipe)
+                                                                                                                      }];
 					 }];
 }
 
-- (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completion
+- (void)closeMenuWithCompletion:(void (^)())completion
 {
+    NSTimeInterval duration = self.menuCloseAnimationDuration * [self openingPart];
+    
 	[self enableTapGestureToCloseMenu:NO];
     
      Menu menu = (self.horizontalLocation > 0) ? MenuLeft : MenuRight;
@@ -655,22 +670,17 @@ static SlideNavigationController *singletonInstance;
 
 - (void)postNotificationWithName:(NSString *)name forMenu:(Menu)menu
 {
-    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];
+    [self postNotificationWithName:name forMenu:menu withExtParams:nil];
 }
 
-#pragma mark - UINavigationControllerDelegate Methods -
-
-- (void)navigationController:(UINavigationController *)navigationController
-	  willShowViewController:(UIViewController *)viewController
-					animated:(BOOL)animated
+- (void)postNotificationWithName:(NSString *)name forMenu:(Menu)menu withExtParams:(NSDictionary *)extParams
 {
-	if ([self shouldDisplayMenu:MenuLeft forViewController:viewController])
-		viewController.navigationItem.leftBarButtonItem = [self barButtonItemForMenu:MenuLeft];
-	
-	if ([self shouldDisplayMenu:MenuRight forViewController:viewController])
-		viewController.navigationItem.rightBarButtonItem = [self barButtonItemForMenu:MenuRight];
+    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]];
 }
 
 - (CGFloat)slideOffset
@@ -733,8 +743,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];
     
@@ -771,11 +781,11 @@ static SlideNavigationController *singletonInstance;
 				if (currentX > 0)
 				{
 					if ([self shouldDisplayMenu:menu forViewController:self.visibleViewController])
-						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
+						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
 				}
 				else
 				{
-					[self closeMenuWithDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
+					[self closeMenuWithCompletion:nil];
 				}
 			}
 			// Moving Left
@@ -783,12 +793,12 @@ static SlideNavigationController *singletonInstance;
 			{
 				if (currentX > 0)
 				{
-					[self closeMenuWithDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
+                    [self closeMenuWithCompletion:nil];
 				}
 				else
 				{
 					if ([self shouldDisplayMenu:menu forViewController:self.visibleViewController])
-						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight withDuration:MENU_QUICK_SLIDE_ANIMATION_DURATION andCompletion:nil];
+						[self openMenu:(velocity.x > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
 				}
 			}
 		}
@@ -797,7 +807,7 @@ static SlideNavigationController *singletonInstance;
 			if (currentXOffset < (self.horizontalSize - self.slideOffset)/2)
 				[self closeMenuWithCompletion:nil];
 			else
-				[self openMenu:(currentX > 0) ? MenuLeft : MenuRight withCompletion:nil];
+				[self openMenu:(currentX > 0) ? MenuLeft : MenuRight afterSwipe:YES withCompletion:nil];
 		}
     }
 }

iOS-Slide-Menu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name = 'iOS-Slide-Menu'
-    s.version = '1.4.5'
+    s.version = '1.4.6'
     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.5'}
+    s.source = {:git => 'https://github.com/aryaxt/iOS-Slide-Menu.git', :tag => '1.4.6'}
     s.platform = :ios, '6.0'
     s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}'
     s.resources = ['SlideMenu/Source/Assets/**/*']