Merge pull request #75 from aryaxt/iOS8-Compatability

iOS 8 fixes including bug #66
aryaxt · Oct 1, 2014 · 5aa1fbc · 5aa1fbc
2 parents 8137873 + ffa26fb
commit 5aa1fbc
Show file tree

Hide file tree

Showing 4 changed files with 193 additions and 145 deletions.
diff --git a/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m b/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m
@@ -33,11 +33,11 @@ @implementation SlideNavigationContorllerAnimatorSlide
 
 - (id)init
 {
-	if (self = [self initWithSlideMovement:100])
-	{
-	}
-	
-	return self;
+    if (self = [self initWithSlideMovement:100])
+    {
+    }
+    
+    return self;
 }
 
 - (id)initWithSlideMovement:(CGFloat)slideMovement
@@ -55,98 +55,119 @@ - (id)initWithSlideMovement:(CGFloat)slideMovement
 - (void)prepareMenuForAnimation:(Menu)menu
 {
 	UIViewController *menuViewController = (menu == MenuLeft)
-		? [SlideNavigationController sharedInstance].leftMenu
-		: [SlideNavigationController sharedInstance].rightMenu;
+        ? [SlideNavigationController sharedInstance].leftMenu
+        : [SlideNavigationController sharedInstance].rightMenu;
 
 	UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
 	CGRect rect = menuViewController.view.frame;
 
-	if (UIInterfaceOrientationIsLandscape(orientation))
-	{
-		if (orientation == UIInterfaceOrientationLandscapeRight)
-		{
-			rect.origin.y = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
-		}
-		else
-		{
-			rect.origin.y = (menu == MenuRight) ? self.slideMovement*-1 : self.slideMovement;
-		}
-	}
-	else
-	{
-		if (orientation == UIInterfaceOrientationPortrait)
-		{
-			rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
-		}
-		else
-		{
-			rect.origin.x = (menu == MenuRight) ? self.slideMovement*-1 : self.slideMovement;
-		}
-	}
-
-	menuViewController.view.frame = rect;
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
+    {
+        rect.origin.x = self.slideMovement;
+    }
+    else
+    {
+        if (UIInterfaceOrientationIsLandscape(orientation))
+        {
+            if (orientation == UIInterfaceOrientationLandscapeRight)
+            {
+                rect.origin.y = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
+            }
+            else
+            {
+                rect.origin.y = (menu == MenuRight) ? self.slideMovement*-1 : self.slideMovement;
+            }
+        }
+        else
+        {
+            if (orientation == UIInterfaceOrientationPortrait)
+            {
+                rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
+            }
+            else
+            {
+                rect.origin.x = (menu == MenuRight) ? self.slideMovement*-1 : self.slideMovement;
+            }
+        }
+    }
+
+    menuViewController.view.frame = rect;
 }
 
 - (void)animateMenu:(Menu)menu withProgress:(CGFloat)progress
 {
-	UIViewController *menuViewController = (menu == MenuLeft)
-		? [SlideNavigationController sharedInstance].leftMenu
-		: [SlideNavigationController sharedInstance].rightMenu;
-
-	UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
-
-	NSInteger location = (menu == MenuLeft)
-		? (self.slideMovement * -1) + (self.slideMovement * progress)
-		: (self.slideMovement * (1-progress));
-
-	if (menu == MenuLeft)
-		location = (location > 0) ? 0 : location;
-
-	if (menu == MenuRight)
-		location = (location < 0) ? 0 : location;
-
-	CGRect rect = menuViewController.view.frame;
-
-	if (UIInterfaceOrientationIsLandscape(orientation))
-	{
-		rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;
-	}
-	else
-	{
-		rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;
-	}
-
-	menuViewController.view.frame = rect;
+    UIViewController *menuViewController = (menu == MenuLeft)
+        ? [SlideNavigationController sharedInstance].leftMenu
+        : [SlideNavigationController sharedInstance].rightMenu;
+
+    UIInterfaceOrientation orientation = [SlideNavigationController sharedInstance].interfaceOrientation;
+
+    NSInteger location = (menu == MenuLeft)
+        ? (self.slideMovement * -1) + (self.slideMovement * progress)
+        : (self.slideMovement * (1-progress));
+
+    if (menu == MenuLeft)
+        location = (location > 0) ? 0 : location;
+
+    if (menu == MenuRight)
+        location = (location < 0) ? 0 : location;
+
+    CGRect rect = menuViewController.view.frame;
+
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
+    {
+        rect.origin.x = location;
+    }
+    else
+    {
+        if (UIInterfaceOrientationIsLandscape(orientation))
+        {
+            rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;
+        }
+        else
+        {
+            rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;
+        }
+    }
+
+    menuViewController.view.frame = rect;
 }
 
 - (void)clear
 {
-	[self clearMenu:MenuLeft];
-	[self clearMenu:MenuRight];
+    [self clearMenu:MenuLeft];
+    [self clearMenu:MenuRight];
 }
 
 #pragma mark - Private Method -
 
 - (void)clearMenu:(Menu)menu
 {
-	UIViewController *menuViewController = (menu == MenuLeft)
-		? [SlideNavigationController sharedInstance].leftMenu
-		: [SlideNavigationController sharedInstance].rightMenu;
-
-	UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
-
-	CGRect rect = menuViewController.view.frame;
-
-	if (UIInterfaceOrientationIsLandscape(orientation))
-	{
-		rect.origin.y = 0;
-	}
-	else
-	{
-		rect.origin.x = 0;
-	}
-
-	menuViewController.view.frame = rect;
+    UIViewController *menuViewController = (menu == MenuLeft)
+    ? [SlideNavigationController sharedInstance].leftMenu
+    : [SlideNavigationController sharedInstance].rightMenu;
+
+    UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
+
+    CGRect rect = menuViewController.view.frame;
+
+    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
+    {
+        rect.origin.x = 0;
+    }
+    else
+    {
+        if (UIInterfaceOrientationIsLandscape(orientation))
+        {
+            rect.origin.y = 0;
+        }
+        else
+        {
+            rect.origin.x = 0;
+        }
+    }
+
+    menuViewController.view.frame = rect;
 }
 
 @end
diff --git a/SlideMenu/Source/SlideNavigationController.h b/SlideMenu/Source/SlideNavigationController.h
@@ -28,6 +28,8 @@
 #import <UIKit/UIKit.h>
 #import <QuartzCore/QuartzCore.h>
 
+#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+
 @protocol SlideNavigationControllerDelegate <NSObject>
 @optional
 - (BOOL)slideNavigationControllerShouldDisplayRightMenu;