better rotation support

kyoji2 · kyoji2 · commit cfb81f94424f · 2013-09-30T17:31:24.000+08:00
fix Sumi-Interactive#46 fix Sumi-Interactive#50
diff --git a/SIAlertView/SIAlertView.m b/SIAlertView/SIAlertView.m
@@ -36,15 +36,13 @@
 static SIAlertBackgroundWindow *__si_alert_background_window;
 static SIAlertView *__si_alert_current_view;
 
-#ifdef __IPHONE_7_0
-@interface UIWindow (SIAlert_StatusBarUtils)
+@interface UIWindow (SIAlert_Utils)
 
-- (UIViewController *)viewControllerForStatusBarStyle;
-- (UIViewController *)viewControllerForStatusBarHidden;
+- (UIViewController *)currentViewController;
 
 @end
 
-@implementation UIWindow (SIAlert_StatusBarUtils)
+@implementation UIWindow (SIAlert_Utils)
 
 - (UIViewController *)currentViewController
 {
@@ -55,6 +53,18 @@ - (UIViewController *)currentViewController
     return viewController;
 }
 
+@end
+
+#ifdef __IPHONE_7_0
+@interface UIWindow (SIAlert_StatusBarUtils)
+
+- (UIViewController *)viewControllerForStatusBarStyle;
+- (UIViewController *)viewControllerForStatusBarHidden;
+
+@end
+
+@implementation UIWindow (SIAlert_StatusBarUtils)
+
 - (UIViewController *)viewControllerForStatusBarStyle
 {
     UIViewController *currentViewController = [self currentViewController];
@@ -223,16 +233,28 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInte
 
 - (NSUInteger)supportedInterfaceOrientations
 {
+    UIViewController *viewController = [self.alertView.oldKeyWindow currentViewController];
+    if (viewController) {
+        return [viewController supportedInterfaceOrientations];
+    }
     return UIInterfaceOrientationMaskAll;
 }
 
 - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation
 {
+    UIViewController *viewController = [self.alertView.oldKeyWindow currentViewController];
+    if (viewController) {
+        return [viewController shouldAutorotateToInterfaceOrientation:toInterfaceOrientation];
+    }
     return YES;
 }
 
 - (BOOL)shouldAutorotate
 {
+    UIViewController *viewController = [self.alertView.oldKeyWindow currentViewController];
+    if (viewController) {
+        return [viewController shouldAutorotate];
+    }
     return YES;
 }
 
diff --git a/SIAlertViewExample/SIAlertViewExample/ViewController.m b/SIAlertViewExample/SIAlertViewExample/ViewController.m
@@ -10,6 +10,7 @@
 #import "SIAlertView.h"
 
 #define TEST_UIAPPEARANCE 1
+#define TEST_AUTO_ROTATE 0
 
 @interface ViewController ()
 
@@ -225,7 +226,11 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfa
 
 - (BOOL)shouldAutorotate
 {
+#if TEST_AUTO_ROTATE
     return YES;
+#else
+    return NO;
+#endif
 }
 
 @end

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#import "SIAlertView.h"`
`11`	`11`
`12`	`12`	`#define TEST_UIAPPEARANCE 1`
	`13`	`+#define TEST_AUTO_ROTATE 0`
`13`	`14`
`14`	`15`	`@interface ViewController ()`
`15`	`16`
`@@ -225,7 +226,11 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfa`
`225`	`226`
`226`	`227`	`- (BOOL)shouldAutorotate`
`227`	`228`	`{`
	`229`	`+#if TEST_AUTO_ROTATE`
`228`	`230`	`return YES;`
	`231`	`+#else`
	`232`	`+ return NO;`
	`233`	`+#endif`
`229`	`234`	`}`
`230`	`235`
`231`	`236`	`@end`