- Code cleanup

- Simplified logic by avoiding orientation check in multiple placers
- Fix ome animation glitches

Author: aryaxt

SlideMenu/AppDelegate.m

@@ -17,15 +17,15 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
 	MenuViewController *rightMenu = (MenuViewController*)[mainStoryboard
 													   instantiateViewControllerWithIdentifier: @"MenuViewController"];
-	rightMenu.view.backgroundColor = [UIColor yellowColor];
+	rightMenu.view.backgroundColor = [UIColor whiteColor];
 	rightMenu.cellIdentifier = @"rightMenuCell";
 
 	MenuViewController *leftMenu = (MenuViewController*)[mainStoryboard
 														   instantiateViewControllerWithIdentifier: @"MenuViewController"];
-	leftMenu.view.backgroundColor = [UIColor lightGrayColor];
+	leftMenu.view.backgroundColor = [UIColor whiteColor];
 	leftMenu.cellIdentifier = @"leftMenuCell";
 
-	[SlideNavigationController sharedInstance].righMenu = rightMenu;
+	[SlideNavigationController sharedInstance].rightMenu = rightMenu;
 	[SlideNavigationController sharedInstance].leftMenu = leftMenu;
 
     // Override point for customization after application launch.

SlideMenu/Source/SlideNavigationController.m

@@ -41,6 +41,7 @@ @implementation SlideNavigationController
 #define MENU_SHADOW_RADIUS 10
 #define MENU_SHADOW_OPACITY 1
 #define MENU_DEFAULT_SLIDE_OFFSET 60
+#define MENU_FAST_VELOCITY_FOR_SWIPE_FOLLOW_DIRECTION 1000
 
 static SlideNavigationController *singletonInstance;
 
@@ -112,12 +113,6 @@ - (void)viewWillLayoutSubviews
 	self.rightMenu.view.frame = rect;
 }
 
-- (void)viewDidLayoutSubviews
-{
-	[super viewDidLayoutSubviews];
-	
-}
-
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
 	[super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
@@ -142,16 +137,15 @@ - (void)switchToViewController:(UIViewController *)viewController withCompletion
 		return;
 	}
 
-	__block CGRect rect = self.view.frame;
-	
 	if ([self isMenuOpen])
 	{
 		[UIView animateWithDuration:MENU_SLIDE_ANIMATION_DURATION
 							  delay:0
 							options:UIViewAnimationOptionCurveEaseOut
 						 animations:^{
-			[self moveHorizontallyToLocation:(rect.origin.x > 0) ? rect.size.width : -1*rect.size.width];
-			self.view.frame = rect;
+			CGFloat width = self.horizontalSize;
+			CGFloat moveLocation = (self.horizontalLocation> 0) ? width : -1*width;
+			[self moveHorizontallyToLocation:moveLocation];
 		} completion:^(BOOL finished) {
 
 			[super popToRootViewControllerAnimated:NO];
@@ -241,14 +235,7 @@ - (UIBarButtonItem *)barButtonItemForMenu:(Menu)menu
 
 - (BOOL)isMenuOpen
 {
-	if (UIInterfaceOrientationIsLandscape(self.interfaceOrientation))
-	{
-		return (self.view.frame.origin.y == 0) ? NO : YES;
-	}
-	else
-	{
-		return (self.view.frame.origin.x == 0) ? NO : YES;
-	}
+	return (self.horizontalLocation == 0) ? NO : YES;
 }
 
 - (BOOL)shouldDisplayMenu:(Menu)menu forViewController:(UIViewController *)vc
@@ -293,10 +280,9 @@ - (void)openMenu:(Menu)menu withDuration:(float)duration andCompletion:(void (^)
 						options:UIViewAnimationOptionCurveEaseOut
 					 animations:^{
 						 CGRect rect = self.view.frame;
-						 CGFloat width = (UIInterfaceOrientationIsLandscape(self.interfaceOrientation)) ? rect.size.height : rect.size.width;
+						 CGFloat width = self.horizontalSize;
 						 rect.origin.x = (menu == MenuLeft) ? (width - self.slideOffset) : ((width - self.slideOffset )* -1);
 						 [self moveHorizontallyToLocation:rect.origin.x];
-						 //self.view.frame = rect;
 					 }
 					 completion:^(BOOL finished) {
 						 if (completion)
@@ -320,7 +306,6 @@ - (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completi
 						 CGRect rect = self.view.frame;
 						 rect.origin.x = 0;
 						 [self moveHorizontallyToLocation:rect.origin.x];
-						 //self.view.frame = rect;
 					 }
 					 completion:^(BOOL finished) {
 						 if (completion)
@@ -371,6 +356,21 @@ - (CGFloat)horizontalLocation
 	}
 }
 
+- (CGFloat)horizontalSize
+{
+	CGRect rect = self.view.frame;
+	UIInterfaceOrientation orientation = self.interfaceOrientation;
+	
+	if (UIInterfaceOrientationIsLandscape(orientation))
+	{
+		return rect.size.height;
+	}
+	else
+	{
+		return rect.size.width;
+	}
+}
+
 #pragma mark - UINavigationControllerDelegate Methods -
 
 - (void)navigationController:(UINavigationController *)navigationController
@@ -419,8 +419,6 @@ - (void)tapDetected:(UITapGestureRecognizer *)tapRecognizer
 
 - (void)panDetected:(UIPanGestureRecognizer *)aPanRecognizer
 {
-	static NSInteger velocityForFollowingDirection = 1000;
-	
 	CGPoint translation = [aPanRecognizer translationInView:aPanRecognizer.view];
     CGPoint velocity = [aPanRecognizer velocityInView:aPanRecognizer.view];
 
@@ -436,7 +434,6 @@ - (void)panDetected:(UIPanGestureRecognizer *)aPanRecognizer
 
 		if (newHorizontalLocation >= self.minXForDragging && newHorizontalLocation <= self.maxXForDragging)
 			[self moveHorizontallyToLocation:newHorizontalLocation];
-			//self.view.frame = rect;
 
 		self.draggingPoint = translation;
 
@@ -458,7 +455,7 @@ - (void)panDetected:(UIPanGestureRecognizer *)aPanRecognizer
 		NSInteger positiveVelocity = (velocity.x > 0) ? velocity.x : velocity.x * -1;
 
 		// If the speed is high enough follow direction
-		if (positiveVelocity >= velocityForFollowingDirection)
+		if (positiveVelocity >= MENU_FAST_VELOCITY_FOR_SWIPE_FOLLOW_DIRECTION)
 		{
 			// Moving Right
 			if (velocity.x > 0)
@@ -502,7 +499,7 @@ - (NSInteger)minXForDragging
 {
 	if ([self shouldDisplayMenu:MenuRight forViewController:self.topViewController])
 	{
-		return (self.view.frame.size.width - self.slideOffset)  * -1;
+		return (self.horizontalSize - self.slideOffset)  * -1;
 	}
 
 	return 0;
@@ -512,7 +509,7 @@ - (NSInteger)maxXForDragging
 {
 	if ([self shouldDisplayMenu:MenuLeft forViewController:self.topViewController])
 	{
-		return self.view.frame.size.width - self.slideOffset;
+		return self.horizontalSize - self.slideOffset;
 	}
 
 	return 0;