[TIMOB-24731] : iOS Resolve iOS 8 deprecations for willAnimateRotationToInterfaceOrientation

iphone/Classes/TiControllerProtocols.h

@@ -38,9 +38,12 @@
 -(void)viewWillDisappear:(BOOL)animated;
 -(void)viewDidAppear:(BOOL)animated;
 -(void)viewDidDisappear:(BOOL)animated;
--(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
+
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container;
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator;
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container;
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator;
+
 //Focus callbacks from containing or hosting controller
 -(void)gainFocus;
 -(void)resignFocus;

iphone/Classes/TiRootViewController.m

@@ -1286,11 +1286,7 @@ -(void)refreshOrientationWithDuration:(id)unused
 #ifdef FORCE_WITH_MODAL
         [self forceRotateToOrientation:target];
 #else
-        if ([TiUtils isIOS8OrGreater]) {
-            [self rotateHostingViewToOrientation:target fromOrientation:[[UIApplication sharedApplication] statusBarOrientation]];
-        } else {
-            [self manuallyRotateToOrientation:target duration:[[UIApplication sharedApplication] statusBarOrientationAnimationDuration]];
-        }
+        [self rotateHostingViewToOrientation:target fromOrientation:[[UIApplication sharedApplication] statusBarOrientation]];
         forcingRotation = NO;
 #endif
     } else {
@@ -1445,72 +1441,6 @@ -(void)rotateHostingViewToOrientation:(UIInterfaceOrientation)newOrientation fro
 
 }
 
--(void)manuallyRotateToOrientation:(UIInterfaceOrientation)newOrientation duration:(NSTimeInterval)duration
-{
-    if (!forcingRotation) {
-        return;
-    }
-    UIApplication * ourApp = [UIApplication sharedApplication];
-    UIInterfaceOrientation oldOrientation = [ourApp statusBarOrientation];
-    CGAffineTransform transform;
-
-    switch (newOrientation) {
-        case UIInterfaceOrientationPortraitUpsideDown:
-            transform = CGAffineTransformMakeRotation(M_PI);
-            break;
-        case UIInterfaceOrientationLandscapeLeft:
-            transform = CGAffineTransformMakeRotation(-M_PI_2);
-            break;
-        case UIInterfaceOrientationLandscapeRight:
-            transform = CGAffineTransformMakeRotation(M_PI_2);
-            break;
-        default:
-            transform = CGAffineTransformIdentity;
-            break;
-    }
-
-    [self willRotateToInterfaceOrientation:newOrientation duration:duration];
-
-    // Have to batch all of the animations together, so that it doesn't look funky
-    if (duration > 0.0) {
-        [UIView beginAnimations:@"orientation" context:nil];
-        [UIView setAnimationDuration:duration];
-    }
-
-    if ((newOrientation != oldOrientation) && isCurrentlyVisible) {
-        TiViewProxy<TiKeyboardFocusableView> *kfvProxy = [keyboardFocusedProxy retain];
-        BOOL focusAfterBlur = [kfvProxy focused:nil];
-        if (focusAfterBlur) {
-            [kfvProxy blur:nil];
-        }
-        forcingStatusBarOrientation = YES;
-        [ourApp setStatusBarOrientation:newOrientation animated:(duration > 0.0)];
-        forcingStatusBarOrientation = NO;
-        if (focusAfterBlur) {
-            // -- TIMOB-23924 --
-            // For some reason, Apple thinks this is a private selector.
-            // Until they fix it, this is our workaround
-            [kfvProxy performSelector:NSSelectorFromString([NSString stringWithFormat:@"%@c%@:", @"fo", @"us"]) withObject:nil];
-        }
-        [kfvProxy release];
-    }
-
-    UIView * ourView = [self view];
-    [ourView setTransform:transform];
-    [self resizeView];
-
-    [self willAnimateRotationToInterfaceOrientation:newOrientation duration:duration];
-
-    //Propigate this to everyone else. This has to be done INSIDE the animation.
-    [self repositionSubviews];
-
-    if (duration > 0.0) {
-        [UIView commitAnimations];
-    }
-
-    [self didRotateFromInterfaceOrientation:oldOrientation];
-}
-
 #pragma mark - TiOrientationController
 -(void)childOrientationControllerChangedFlags:(id<TiOrientationController>) orientationController;
 {
@@ -1619,28 +1549,40 @@ -(void)viewDidDisappear:(BOOL)animated
     }
     [super viewDidDisappear:animated];
 }
--(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     for (id<TiWindowProtocol> thisWindow in containedWindows) {
-        [thisWindow willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+        [thisWindow viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
     }
-    [self updateOrientationHistory:toInterfaceOrientation];
-    [self rotateDefaultImageViewToOrientation:toInterfaceOrientation];
-    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    UIInterfaceOrientation interfaceOrientation = (UIInterfaceOrientation)[[UIDevice  currentDevice] orientation];
+    [self updateOrientationHistory:interfaceOrientation];
+    [self rotateDefaultImageViewToOrientation:interfaceOrientation];
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 }
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
     for (id<TiWindowProtocol> thisWindow in containedWindows) {
-        [thisWindow willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+        [thisWindow systemLayoutFittingSizeDidChangeForChildContentContainer:container];
     }
-    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [super systemLayoutFittingSizeDidChangeForChildContentContainer:container];
 }
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    for (id<TiWindowProtocol> thisWindow in containedWindows) {
+        [thisWindow willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+    }
+    [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+}
+
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
     for (id<TiWindowProtocol> thisWindow in containedWindows) {
-        [thisWindow didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+        [thisWindow preferredContentSizeDidChangeForChildContentContainer:container];
     }
-    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    [super preferredContentSizeDidChangeForChildContentContainer:container];
 }
 
 #pragma mark - Status Bar Appearance

iphone/Classes/TiUIScrollableViewProxy.m

@@ -336,13 +336,28 @@ -(CGFloat)autoHeightForSize:(CGSize)size
     return result;
 }
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     if ([self viewAttached]) {
         [(TiUIScrollableView*)[self view] manageRotation];
     }
 }
 
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
+{
+
+}
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+
+}
+
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
+{
+
+}
+
 -(void)willChangeLayout
 {
 #ifndef TI_USE_AUTOLAYOUT

iphone/Classes/TiUITabGroup.h

@@ -29,10 +29,11 @@
 
 -(UITabBar*)tabbar;
 
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator;
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container;
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator;
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container;
 
--(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration;
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation;
 @end
 
 #endif

iphone/Classes/TiUITabGroup.m

@@ -432,25 +432,30 @@ -(void) setActiveTabIconTint_:(id)value
 		controller.tabBar.tintColor = color.color;
 	}
 	else {
-		controller.tabBar.selectedImageTintColor = color.color; //deprecated for >= ios8
+		controller.tabBar.tintColor = color.color;
 	}
 }
 
 #pragma mark Public APIs
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    [controller viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+}
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
-   [controller willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [controller willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
 }
 
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
-    [controller willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [controller systemLayoutFittingSizeDidChangeForChildContentContainer:container];
 }
 
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
-    [controller didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    [controller preferredContentSizeDidChangeForChildContentContainer:container];
 }
 
 -(void)setTranslucent_:(id)value

iphone/Classes/TiUITabGroupProxy.m

@@ -250,29 +250,32 @@ - (void)viewDidDisappear:(BOOL)animated;
     [super viewDidDisappear:animated];
 }
 
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    if ([self viewAttached]) {
+        [(TiUITabGroup *)[self view] viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    }
+}
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
-	if ([self viewAttached])
-	{
-		[(TiUITabGroup *)[self view] willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	}
-	[super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    if ([self viewAttached]) {
+        [(TiUITabGroup *)[self view] willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+    }
 }
 
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
-	if ([self viewAttached])
-	{
-		[(TiUITabGroup *)[self view] willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
-	}
+    if ([self viewAttached]) {
+        [(TiUITabGroup *)[self view] systemLayoutFittingSizeDidChangeForChildContentContainer:container];
+    }
 }
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
-    if ([self viewAttached])
-	{
-		[(TiUITabGroup *)[self view] didRotateFromInterfaceOrientation:fromInterfaceOrientation];
-	}
+    if ([self viewAttached]) {
+        [(TiUITabGroup *)[self view] preferredContentSizeDidChangeForChildContentContainer:container];
+    }
 }
 
 -(UIStatusBarStyle)preferredStatusBarStyle;
@@ -320,4 +323,4 @@ -(void)willChangeSize
 
 @end
 
-#endif
+#endif

iphone/Classes/TiUIWindowProxy.m

@@ -254,12 +254,27 @@ -(BOOL)_handleClose:(id)args
 	return [super _handleClose:args];
 }
 
--(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
-    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
     [self willChangeSize];
 }
 
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
+{
+    [super systemLayoutFittingSizeDidChangeForChildContentContainer:container];
+}
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
+}
+
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
+{
+    [super preferredContentSizeDidChangeForChildContentContainer:container];
+}
+
 - (void)viewWillAppear:(BOOL)animated;    // Called when the view is about to made visible. Default does nothing
 {
     shouldUpdateNavBar = YES;

iphone/Classes/TiUIiOSNavWindowProxy.m

@@ -416,28 +416,37 @@ -(void)resignFocus
     [super resignFocus];
 }
 
--(void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     if ([self viewAttached]) {
-        [navController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+        [navController viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
     }
-    [super willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
 }
--(void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+
+- (void)systemLayoutFittingSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
 {
     if ([self viewAttached]) {
-        [navController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+        [navController systemLayoutFittingSizeDidChangeForChildContentContainer:container];
     }
-    [super willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    [super systemLayoutFittingSizeDidChangeForChildContentContainer:container];
 }
--(void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+
+- (void)willTransitionToTraitCollection:(UITraitCollection *)newCollection withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
 {
     if ([self viewAttached]) {
-        [navController didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+        [navController willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
     }
-    [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    [super willTransitionToTraitCollection:newCollection withTransitionCoordinator:coordinator];
 }
 
+- (void)preferredContentSizeDidChangeForChildContentContainer:(id <UIContentContainer>)container
+{
+    if ([self viewAttached]) {
+        [navController preferredContentSizeDidChangeForChildContentContainer:container];
+    }
+    [super preferredContentSizeDidChangeForChildContentContainer:container];
+}
 
 
 #pragma mark - TiViewProxy overrides
@@ -480,4 +489,4 @@ -(void)willChangeSize
 
 @end
 
-#endif
+#endif