Merge pull request #127 from aryaxt/FixInterfaceOrientationWarning

aryaxt · aryaxt · commit 363306a5c7c9 · 2015-04-11T10:51:47.000-07:00
Fixed interfaceOrientation deprecated warning
diff --git 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;
 			};
diff --git 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>
diff --git a/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m b/SlideMenu/Source/Animations/SlideNavigationContorllerAnimatorSlide.m
@@ -58,7 +58,7 @@ - (void)prepareMenuForAnimation:(Menu)menu
         ? [SlideNavigationController sharedInstance].leftMenu
         : [SlideNavigationController sharedInstance].rightMenu;
 	
-	UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
 	CGRect rect = menuViewController.view.frame;
 	
     if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
@@ -67,9 +67,9 @@ - (void)prepareMenuForAnimation:(Menu)menu
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
-            if (orientation == UIInterfaceOrientationLandscapeRight)
+            if (orientation == UIDeviceOrientationLandscapeRight)
             {
                 rect.origin.y = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
             }
@@ -80,7 +80,7 @@ - (void)prepareMenuForAnimation:(Menu)menu
         }
         else
         {
-            if (orientation == UIInterfaceOrientationPortrait)
+            if (orientation == UIDeviceOrientationPortrait)
             {
                 rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;
             }
@@ -100,7 +100,7 @@ - (void)animateMenu:(Menu)menu withProgress:(CGFloat)progress
         ? [SlideNavigationController sharedInstance].leftMenu
         : [SlideNavigationController sharedInstance].rightMenu;
     
-    UIInterfaceOrientation orientation = [SlideNavigationController sharedInstance].interfaceOrientation;
+    UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
     
     NSInteger location = (menu == MenuLeft)
         ? (self.slideMovement * -1) + (self.slideMovement * progress)
@@ -120,13 +120,13 @@ - (void)animateMenu:(Menu)menu withProgress:(CGFloat)progress
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
-            rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;
+            rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;
         }
         else
         {
-            rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;
+            rect.origin.x = (orientation == UIDeviceOrientationPortrait) ? location : location*-1;
         }
     }
     
@@ -147,8 +147,8 @@ - (void)clearMenu:(Menu)menu
     ? [SlideNavigationController sharedInstance].leftMenu
     : [SlideNavigationController sharedInstance].rightMenu;
     
-    UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;
-    
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
+	
     CGRect rect = menuViewController.view.frame;
     
     if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
@@ -157,7 +157,7 @@ - (void)clearMenu:(Menu)menu
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
             rect.origin.y = 0;
         }
diff --git a/SlideMenu/Source/SlideNavigationController.m b/SlideMenu/Source/SlideNavigationController.m
@@ -520,7 +520,7 @@ - (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completi
 - (void)moveHorizontallyToLocation:(CGFloat)location
 {
 	CGRect rect = self.view.frame;
-	UIInterfaceOrientation orientation = self.interfaceOrientation;
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
 	Menu menu = (self.horizontalLocation >= 0 && location >= 0) ? MenuLeft : MenuRight;
     
     if ((location > 0 && self.horizontalLocation <= 0) || (location < 0 && self.horizontalLocation >= 0)) {
@@ -534,14 +534,14 @@ - (void)moveHorizontallyToLocation:(CGFloat)location
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
             rect.origin.x = 0;
-            rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;
+            rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;
         }
         else
         {
-            rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;
+            rect.origin.x = (orientation == UIDeviceOrientationPortrait) ? location : location*-1;
             rect.origin.y = 0;
         }
     }
@@ -570,16 +570,18 @@ - (CGRect)initialRectForMenu
         return rect;
     }
 	
-	if (UIInterfaceOrientationIsLandscape(self.interfaceOrientation))
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
+	
+	if (UIDeviceOrientationIsLandscape(orientation))
 	{
         // For some reasons in landscape below the status bar is considered y=0, but in portrait it's considered y=20
-        rect.origin.x = (self.interfaceOrientation == UIInterfaceOrientationLandscapeRight) ? 0 : STATUS_BAR_HEIGHT;
+        rect.origin.x = (orientation == UIDeviceOrientationLandscapeRight) ? 0 : STATUS_BAR_HEIGHT;
         rect.size.width = self.view.frame.size.width-STATUS_BAR_HEIGHT;
 	}
 	else
 	{
         // For some reasons in landscape below the status bar is considered y=0, but in portrait it's considered y=20
-        rect.origin.y = (self.interfaceOrientation == UIInterfaceOrientationPortrait) ? STATUS_BAR_HEIGHT : 0;
+        rect.origin.y = (orientation == UIDeviceOrientationPortrait) ? STATUS_BAR_HEIGHT : 0;
         rect.size.height = self.view.frame.size.height-STATUS_BAR_HEIGHT;
 	}
 	
@@ -608,23 +610,23 @@ - (void)prepareMenuForReveal:(Menu)menu
 - (CGFloat)horizontalLocation
 {
 	CGRect rect = self.view.frame;
-	UIInterfaceOrientation orientation = self.interfaceOrientation;
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
 	
     if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
     {
         return rect.origin.x;
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
-            return (orientation == UIInterfaceOrientationLandscapeRight)
+            return (orientation == UIDeviceOrientationLandscapeRight)
             ? rect.origin.y
             : rect.origin.y*-1;
         }
         else
         {
-            return (orientation == UIInterfaceOrientationPortrait)
+            return (orientation == UIDeviceOrientationPortrait)
             ? rect.origin.x
             : rect.origin.x*-1;
         }
@@ -634,15 +636,15 @@ - (CGFloat)horizontalLocation
 - (CGFloat)horizontalSize
 {
 	CGRect rect = self.view.frame;
-	UIInterfaceOrientation orientation = self.interfaceOrientation;
+	UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;
 	
     if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))
     {
         return rect.size.width;
     }
     else
     {
-        if (UIInterfaceOrientationIsLandscape(orientation))
+        if (UIDeviceOrientationIsLandscape(orientation))
         {
             return rect.size.height;
         }
@@ -675,7 +677,7 @@ - (void)navigationController:(UINavigationController *)navigationController
 
 - (CGFloat)slideOffset
 {
-	return (UIInterfaceOrientationIsLandscape(self.interfaceOrientation))
+	return (UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation))
 		? self.landscapeSlideOffset
 		: self.portraitSlideOffset;
 }
diff --git a/iOS-Slide-Menu.podspec b/iOS-Slide-Menu.podspec
@@ -1,14 +1,14 @@
 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 = {
       :type => 'MIT',
       :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/**/*']

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ - (void)prepareMenuForAnimation:(Menu)menu`
`58`	`58`	`? [SlideNavigationController sharedInstance].leftMenu`
`59`	`59`	`: [SlideNavigationController sharedInstance].rightMenu;`
`60`	`60`
`61`		`- UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;`
	`61`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
`62`	`62`	`CGRect rect = menuViewController.view.frame;`
`63`	`63`
`64`	`64`	`if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))`
`@@ -67,9 +67,9 @@ - (void)prepareMenuForAnimation:(Menu)menu`
`67`	`67`	`}`
`68`	`68`	`else`
`69`	`69`	`{`
`70`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`70`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`71`	`71`	`{`
`72`		`- if (orientation == UIInterfaceOrientationLandscapeRight)`
	`72`	`+ if (orientation == UIDeviceOrientationLandscapeRight)`
`73`	`73`	`{`
`74`	`74`	`rect.origin.y = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;`
`75`	`75`	`}`
`@@ -80,7 +80,7 @@ - (void)prepareMenuForAnimation:(Menu)menu`
`80`	`80`	`}`
`81`	`81`	`else`
`82`	`82`	`{`
`83`		`- if (orientation == UIInterfaceOrientationPortrait)`
	`83`	`+ if (orientation == UIDeviceOrientationPortrait)`
`84`	`84`	`{`
`85`	`85`	`rect.origin.x = (menu == MenuLeft) ? self.slideMovement*-1 : self.slideMovement;`
`86`	`86`	`}`
`@@ -100,7 +100,7 @@ - (void)animateMenu:(Menu)menu withProgress:(CGFloat)progress`
`100`	`100`	`? [SlideNavigationController sharedInstance].leftMenu`
`101`	`101`	`: [SlideNavigationController sharedInstance].rightMenu;`
`102`	`102`
`103`		`- UIInterfaceOrientation orientation = [SlideNavigationController sharedInstance].interfaceOrientation;`
	`103`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
`104`	`104`
`105`	`105`	`NSInteger location = (menu == MenuLeft)`
`106`	`106`	`? (self.slideMovement * -1) + (self.slideMovement * progress)`
`@@ -120,13 +120,13 @@ - (void)animateMenu:(Menu)menu withProgress:(CGFloat)progress`
`120`	`120`	`}`
`121`	`121`	`else`
`122`	`122`	`{`
`123`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`123`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`124`	`124`	`{`
`125`		`- rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;`
	`125`	`+ rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;`
`126`	`126`	`}`
`127`	`127`	`else`
`128`	`128`	`{`
`129`		`- rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;`
	`129`	`+ rect.origin.x = (orientation == UIDeviceOrientationPortrait) ? location : location*-1;`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`@@ -147,8 +147,8 @@ - (void)clearMenu:(Menu)menu`
`147`	`147`	`? [SlideNavigationController sharedInstance].leftMenu`
`148`	`148`	`: [SlideNavigationController sharedInstance].rightMenu;`
`149`	`149`
`150`		`- UIInterfaceOrientation orientation= [SlideNavigationController sharedInstance].interfaceOrientation;`
`151`		`-`
	`150`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
	`151`	`+`
`152`	`152`	`CGRect rect = menuViewController.view.frame;`
`153`	`153`
`154`	`154`	`if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))`
`@@ -157,7 +157,7 @@ - (void)clearMenu:(Menu)menu`
`157`	`157`	`}`
`158`	`158`	`else`
`159`	`159`	`{`
`160`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`160`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`161`	`161`	`{`
`162`	`162`	`rect.origin.y = 0;`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ - (void)closeMenuWithDuration:(float)duration andCompletion:(void (^)())completi`
`520`	`520`	`- (void)moveHorizontallyToLocation:(CGFloat)location`
`521`	`521`	`{`
`522`	`522`	`CGRect rect = self.view.frame;`
`523`		`- UIInterfaceOrientation orientation = self.interfaceOrientation;`
	`523`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
`524`	`524`	`Menu menu = (self.horizontalLocation >= 0 && location >= 0) ? MenuLeft : MenuRight;`
`525`	`525`
`526`	`526`	`if ((location > 0 && self.horizontalLocation <= 0) \|\| (location < 0 && self.horizontalLocation >= 0)) {`
`@@ -534,14 +534,14 @@ - (void)moveHorizontallyToLocation:(CGFloat)location`
`534`	`534`	`}`
`535`	`535`	`else`
`536`	`536`	`{`
`537`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`537`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`538`	`538`	`{`
`539`	`539`	`rect.origin.x = 0;`
`540`		`- rect.origin.y = (orientation == UIInterfaceOrientationLandscapeRight) ? location : location*-1;`
	`540`	`+ rect.origin.y = (orientation == UIDeviceOrientationLandscapeRight) ? location : location*-1;`
`541`	`541`	`}`
`542`	`542`	`else`
`543`	`543`	`{`
`544`		`- rect.origin.x = (orientation == UIInterfaceOrientationPortrait) ? location : location*-1;`
	`544`	`+ rect.origin.x = (orientation == UIDeviceOrientationPortrait) ? location : location*-1;`
`545`	`545`	`rect.origin.y = 0;`
`546`	`546`	`}`
`547`	`547`	`}`
`@@ -570,16 +570,18 @@ - (CGRect)initialRectForMenu`
`570`	`570`	`return rect;`
`571`	`571`	`}`
`572`	`572`
`573`		`- if (UIInterfaceOrientationIsLandscape(self.interfaceOrientation))`
	`573`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
	`574`	`+`
	`575`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`574`	`576`	`{`
`575`	`577`	`// For some reasons in landscape below the status bar is considered y=0, but in portrait it's considered y=20`
`576`		`- rect.origin.x = (self.interfaceOrientation == UIInterfaceOrientationLandscapeRight) ? 0 : STATUS_BAR_HEIGHT;`
	`578`	`+ rect.origin.x = (orientation == UIDeviceOrientationLandscapeRight) ? 0 : STATUS_BAR_HEIGHT;`
`577`	`579`	`rect.size.width = self.view.frame.size.width-STATUS_BAR_HEIGHT;`
`578`	`580`	`}`
`579`	`581`	`else`
`580`	`582`	`{`
`581`	`583`	`// For some reasons in landscape below the status bar is considered y=0, but in portrait it's considered y=20`
`582`		`- rect.origin.y = (self.interfaceOrientation == UIInterfaceOrientationPortrait) ? STATUS_BAR_HEIGHT : 0;`
	`584`	`+ rect.origin.y = (orientation == UIDeviceOrientationPortrait) ? STATUS_BAR_HEIGHT : 0;`
`583`	`585`	`rect.size.height = self.view.frame.size.height-STATUS_BAR_HEIGHT;`
`584`	`586`	`}`
`585`	`587`
`@@ -608,23 +610,23 @@ - (void)prepareMenuForReveal:(Menu)menu`
`608`	`610`	`- (CGFloat)horizontalLocation`
`609`	`611`	`{`
`610`	`612`	`CGRect rect = self.view.frame;`
`611`		`- UIInterfaceOrientation orientation = self.interfaceOrientation;`
	`613`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
`612`	`614`
`613`	`615`	`if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))`
`614`	`616`	`{`
`615`	`617`	`return rect.origin.x;`
`616`	`618`	`}`
`617`	`619`	`else`
`618`	`620`	`{`
`619`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`621`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`620`	`622`	`{`
`621`		`- return (orientation == UIInterfaceOrientationLandscapeRight)`
	`623`	`+ return (orientation == UIDeviceOrientationLandscapeRight)`
`622`	`624`	`? rect.origin.y`
`623`	`625`	`: rect.origin.y*-1;`
`624`	`626`	`}`
`625`	`627`	`else`
`626`	`628`	`{`
`627`		`- return (orientation == UIInterfaceOrientationPortrait)`
	`629`	`+ return (orientation == UIDeviceOrientationPortrait)`
`628`	`630`	`? rect.origin.x`
`629`	`631`	`: rect.origin.x*-1;`
`630`	`632`	`}`
`@@ -634,15 +636,15 @@ - (CGFloat)horizontalLocation`
`634`	`636`	`- (CGFloat)horizontalSize`
`635`	`637`	`{`
`636`	`638`	`CGRect rect = self.view.frame;`
`637`		`- UIInterfaceOrientation orientation = self.interfaceOrientation;`
	`639`	`+ UIDeviceOrientation orientation = [UIDevice currentDevice].orientation;`
`638`	`640`
`639`	`641`	`if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"8.0"))`
`640`	`642`	`{`
`641`	`643`	`return rect.size.width;`
`642`	`644`	`}`
`643`	`645`	`else`
`644`	`646`	`{`
`645`		`- if (UIInterfaceOrientationIsLandscape(orientation))`
	`647`	`+ if (UIDeviceOrientationIsLandscape(orientation))`
`646`	`648`	`{`
`647`	`649`	`return rect.size.height;`
`648`	`650`	`}`
`@@ -675,7 +677,7 @@ - (void)navigationController:(UINavigationController *)navigationController`
`675`	`677`
`676`	`678`	`- (CGFloat)slideOffset`
`677`	`679`	`{`
`678`		`- return (UIInterfaceOrientationIsLandscape(self.interfaceOrientation))`
	`680`	`+ return (UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation))`
`679`	`681`	`? self.landscapeSlideOffset`
`680`	`682`	`: self.portraitSlideOffset;`
`681`	`683`	`}`