Remove excess method

Slide menu open/close animation depends on currently opening part
Slide menu notifications extends params added
2015-10-30 03:45:46 +03:00 · 2015-10-29 23:55:01 +03:00 · 2015-10-23 17:19:45 +03:00 · 2015-10-07 18:30:01 +03:00 · 2015-10-07 18:08:40 +03:00 · 2015-10-06 14:21:09 +03:00
8 changed files with 150 additions and 98 deletions
--- a/README.md
+++ b/README.md
@ -33,9 +33,9 @@ Setup
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
 	LeftMenuViewController *leftMenu = [[LeftMenuViewController alloc] init];
-        RightMenuViewController *righMenu = [[RightMenuViewController alloc] init];
+        RightMenuViewController *rightMenu = [[RightMenuViewController alloc] init];
 	
-	[SlideNavigationController sharedInstance].righMenu = rightMenu;
+	[SlideNavigationController sharedInstance].rightMenu = rightMenu;
 	[SlideNavigationController sharedInstance].leftMenu = leftMenu;
 	
    // Override point for customization after application launch.
@ -96,6 +96,10 @@ Behaves exactly the same as leftbarButtonItem, but it's used as the right button
 Default value of portraitSlideOffset is 60. This means when the menu is open, the width of the visible portion of the navigation controller is 60 pixels in portrait mode
 ###### landscapeSlideOffset
 Default value of portraitSlideOffset is 60. This means when the menu is open, the width of the visible portion of the navigation controller is 60 pixels in landscape mode
+###### menuRevealAnimationDuration
+Default value of animation duration is .3, this property allows configuring animation duration
+###### menuRevealAnimationOption
+Defaults to UIViewAnimationOptionCurveEaseOut, you can change this property to configure animation options
 ###### menuRevealAnimator
 menuRevealAnimator is used to animate the left/right menu during reveal. The default value is nil, that means no animations occure when opening/closing the menu. 

--- a/SlideMenu.xcodeproj/project.pbxproj
+++ b/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;
 			};
--- a/SlideMenu/AppDelegate.m
+++ b/SlideMenu/AppDelegate.m
@ -23,6 +23,7 @@
 	
 	[SlideNavigationController sharedInstance].rightMenu = rightMenu;
 	[SlideNavigationController sharedInstance].leftMenu = leftMenu;
+	[SlideNavigationController sharedInstance].menuRevealAnimationDuration = .18;
 	
 	// Creating a custom bar button for right menu
 	UIButton *button  = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
@ -41,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);
--- a/Classes/RightMenuViewController.m
+++ b/Classes/RightMenuViewController.m
@ -80,31 +80,38 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
 	id <SlideNavigationContorllerAnimator> revealAnimator;
+	CGFloat animationDuration = 0;
 	
 	switch (indexPath.row)
 	{
 		case 0:
 			revealAnimator = nil;
+			animationDuration = .19;
 			break;
 			
 		case 1:
 			revealAnimator = [[SlideNavigationContorllerAnimatorSlide alloc] init];
+			animationDuration = .19;
 			break;
 			
 		case 2:
 			revealAnimator = [[SlideNavigationContorllerAnimatorFade alloc] init];
+			animationDuration = .18;
 			break;
 			
 		case 3:
 			revealAnimator = [[SlideNavigationContorllerAnimatorSlideAndFade alloc] initWithMaximumFadeAlpha:.8 fadeColor:[UIColor blackColor] andSlideMovement:100];
+			animationDuration = .19;
 			break;
 			
 		case 4:
 			revealAnimator = [[SlideNavigationContorllerAnimatorScale alloc] init];
+			animationDuration = .22;
 			break;
 			
 		case 5:
 			revealAnimator = [[SlideNavigationContorllerAnimatorScaleAndFade alloc] initWithMaximumFadeAlpha:.6 fadeColor:[UIColor blackColor] andMinimumScale:.8];
+			animationDuration = .22;
 			break;
 			
 		default:
@ -112,6 +119,7 @@
 	}
 	
 	[[SlideNavigationController sharedInstance] closeMenuWithCompletion:^{
+		[SlideNavigationController sharedInstance].menuRevealAnimationDuration = animationDuration;
 		[SlideNavigationController sharedInstance].menuRevealAnimator = revealAnimator;
 	}];
 }
--- 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,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,6 +60,9 @@ extern NSString  *const SlideNavigationControllerDidReveal;
@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) UIViewAnimationOptions menuRevealAnimationOption;
@property (nonatomic, strong) id <SlideNavigationContorllerAnimator> menuRevealAnimator;

 + (SlideNavigationController *)sharedInstance;
@ -73,4 +78,6 @@ extern NSString  *const SlideNavigationControllerDidReveal;
 - (void)toggleRightMenu;
 - (BOOL)isMenuOpen;

+- (void)prepareMenuForReveal:(Menu)menu;
+
@end
--- a/SlideMenu/Source/SlideNavigationController.m
+++ b/SlideMenu/Source/SlideNavigationController.m
@ -47,7 +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_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
@ -101,6 +106,16 @@ static SlideNavigationController *singletonInstance;
 	return self;
 }

+- (id)initWithNavigationBarClass:(Class)navigationBarClass toolbarClass:(Class)toolbarClass
+{
+	if (self = [super initWithNavigationBarClass:navigationBarClass toolbarClass:toolbarClass])
+	{
+		[self setup];
+	}
+	
+	return self;
+}
+
 - (void)setup
 {
 	if (singletonInstance)
@ -108,6 +123,9 @@ static SlideNavigationController *singletonInstance;
 	
 	singletonInstance = self;
 	
+	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;
 	self.panGestureSideOffset = 0;
@ -127,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)
    {
@ -138,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;
@ -147,6 +165,8 @@ static SlideNavigationController *singletonInstance;

 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
 {
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+
    self.menuNeedsLayout = YES;
 }

@ -193,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])
@ -202,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) ? MENU_SLIDE_ANIMATION_DURATION : 0
-								  delay:0
-								options:UIViewAnimationOptionCurveEaseOut
-							 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:MENU_SLIDE_ANIMATION_DURATION andCompletion:completion];
-}
-
- (void)openMenu:(Menu)menu withCompletion:(void (^)())completion
-{
-	[self openMenu:menu withDuration:MENU_SLIDE_ANIMATION_DURATION andCompletion:completion];
+	[self switchToViewController:viewController popType:PopTypeAll andCompletion:completion];
 }

 - (void)toggleLeftMenu
@ -457,15 +468,30 @@ 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];
 	
 	[UIView animateWithDuration:duration
 						  delay:0
-						options:UIViewAnimationOptionCurveEaseOut
+						options:self.menuRevealAnimationOption
 					 animations:^{
 						 CGRect rect = self.view.frame;
 						 CGFloat width = self.horizontalSize;
@ -476,19 +502,23 @@ 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;
 	
 	[UIView animateWithDuration:duration
 						  delay:0
-						options:UIViewAnimationOptionCurveEaseOut
+						options:self.menuRevealAnimationOption
 					 animations:^{
 						 CGRect rect = self.view.frame;
 						 rect.origin.x = 0;
@ -640,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
@ -718,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];
    
@ -756,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
@ -768,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];
 				}
 			}
 		}
@ -782,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];
 		}
    }
 }
--- 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.4'
+    s.version = '1.4.6'
    s.summary = 'A Slide Menu for iOS'
    s.homepage = 'https://github.com/aryaxt/iOS-Slide-Menu'
    s.license = {
@ -8,9 +8,9 @@ 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.4'}
+    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}', 'SlideMenu/Source/Assets/*.{png}'
+    s.source_files = 'SlideMenu/Source/*.{h,m}', 'SlideMenu/Source/Animations/*.{h,m}'
    s.resources = ['SlideMenu/Source/Assets/**/*']
    s.framework = 'Foundation', 'UIKit'
    s.requires_arc = true
Author	SHA1	Message	Date
Anton	d48909d9c4	Remove excess method	2015-10-30 03:45:46 +03:00
Anton	71eb343abe	Slide menu open/close animation depends on currently opening part	2015-10-29 23:55:01 +03:00
Anton	95f692c225	Slide menu notifications extends params added	2015-10-23 17:19:45 +03:00
Nikolai Ashanin	42e62a4dbd	Update SlideNavigationController.m remove reverse when menu did end close	2015-10-07 18:30:01 +03:00
Nikolai Ashanin	2ed9400c82	Update SlideNavigationController.m slide menu open/close different durations	2015-10-07 18:08:40 +03:00
Anton	06deaf308c	View controller is opening when menu is starting to close	2015-10-06 14:21:09 +03:00
Anton	f3b60362da	Add duration on opening and closing animations Some refactoring	2015-08-28 17:38:25 +03:00
Anton	9550d4719b	Slide menu show new controller after menu closing	2015-08-27 17:11:42 +03:00
Anton	d088879c28	Remove tap gesture recognizer disabling on viewWllLayoutSubview event	2015-07-30 19:26:21 +03:00
iON1k	5ef5a8d832	Merge pull request #1 from TouchInstinct/feature/swipeMenuBeginEvent Feature/swipe menu begin event	2015-07-01 16:18:29 +03:00
Павел Круглов	0da57dfd53	Fixed orientation issues.	2015-07-01 15:58:20 +03:00
Павел Круглов	240684c788	Hook point for swipe menu begin.	2015-06-30 18:18:37 +03:00
Павел Круглов	c6c729bb52	Merge commit '7fb3ec03e919a6d4a5c622f224c2277ace85c61f' into feature/swipeMenuBeginEvent	2015-06-30 18:10:29 +03:00
Aryan Ghassemi	7fb3ec03e9	Fixed is landscape issues #138	2015-04-22 20:25:52 -07:00
Aryan Ghassemi	a9ca4b49b0	Update README.md	2015-04-20 14:48:26 -07:00
Aryan Ghassemi	363306a5c7	Merge pull request #127 from aryaxt/FixInterfaceOrientationWarning Fixed interfaceOrientation deprecated warning	2015-04-11 10:51:47 -07:00
Aryan Ghassemi	4ce138d4e9	Update pod spec for version 1.4.6	2015-04-11 10:49:22 -07:00
Aryan Ghassemi	43cb763d79	Fixed interfaceOrientation deprecated warning	2015-04-11 10:43:38 -07:00
Aryan Ghassemi	8681050dd0	Update README.md	2015-03-11 21:48:41 -07:00
Aryan Ghassemi	98591515e6	Merge pull request #128 from aryaxt/Develop Turning shouldRecognizeSimultaneouslyWithGestureRecognizer off	2015-03-11 21:34:46 -07:00
Aryan Ghassemi	1a1b8523ec	Turning shouldRecognizeSimultaneouslyWithGestureRecognizer off it's causing many issues	2015-03-11 21:32:56 -07:00
Aryan Ghassemi	3c1b09fe74	Updated pod spec for version 1.4.5	2015-03-01 19:18:26 -08:00
Aryan Ghassemi	6a9333e81b	Merge pull request #113 from aryaxt/Develop Version 1.4.5	2015-03-01 19:15:53 -08:00
Aryan Ghassemi	07e14208be	Merge pull request #120 from loevborg/master Small change to pod-spec	2015-03-01 19:14:48 -08:00
loevborg	22c03d987e	Removed local representation of pod spec	2015-02-17 14:24:45 +01:00
loevborg	0e1ac70eeb	Changes to pod spec Removed the source/assets-png’s from s.source_files, since this causes warnings when compiling the pod in project. The source/assets is correctly part of the pod spec: s.resources, and this is the only place it should appear	2015-02-17 14:22:39 +01:00
Aryan Ghassemi	2cf2b31c62	Merge pull request #114 from pnicholls/master Added call to super in SlideNavigationController's viewWillTransitionToSize method	2015-02-16 10:28:38 -08:00
Peter Nicholls	f9909b669f	add a missing call to super in the SlideNavigationController viewWillTransitionToSize method	2015-01-31 15:58:06 +11:00
Aryan Ghassemi	792fb82d6b	Update README.md	2015-01-25 08:58:18 -08:00
Aryan	eb2de83daf	#79 and #90 Allow simultaneous gestures to be detected by the menu	2015-01-25 08:50:52 -08:00
Aryan	2786733c82	Code formatting	2015-01-25 08:49:13 -08:00
Aryan	9d38ca4c76	Fixed #103 add initWithNavigationBarClass to slide menu	2015-01-25 08:48:54 -08:00
Aryan Ghassemi	c2638e8935	Merge pull request #102 from masterrr/master fix typo	2014-12-14 12:14:49 -08:00
masterrr	907eee38e8	fix typo	2014-12-11 21:06:20 +03:00
Aryan	4c66f6c25c	Allow configuring animation duration/option	2014-11-28 16:19:34 -08:00