Merge remote-tracking branch 'origin/master' into rc/2.13.0

openedx-unsupported · Feb 22, 2018 · 99ad1f4 · 99ad1f4
2 parents bd93c58 + 5bc3770
commit 99ad1f4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/Source/OEXLoginViewController.m b/Source/OEXLoginViewController.m
@@ -763,10 +763,6 @@ - (BOOL) isRTL {
     return [UIApplication sharedApplication].userInterfaceLayoutDirection == UIUserInterfaceLayoutDirectionRightToLeft;
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    return [OEXStyles sharedStyles].standardStatusBarStyle;
-}
-
 - (BOOL) shouldAutorotate {
     return false;
 }

diff --git a/Source/OEXRegistrationViewController.m b/Source/OEXRegistrationViewController.m
@@ -490,10 +490,6 @@ - (void)showProgress:(BOOL)status {
     }
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-    return self.environment.styles.standardStatusBarStyle;
-}
-
 - (BOOL) shouldAutorotate {
     return false;
 }

diff --git a/Source/OEXRouter.m b/Source/OEXRouter.m
@@ -134,15 +134,15 @@ - (UINavigationController *) loginViewController {
     OEXLoginViewController* loginController = [[UIStoryboard storyboardWithName:@"OEXLoginViewController" bundle:nil] instantiateViewControllerWithIdentifier:@"LoginView"];
     loginController.delegate = self;
     loginController.environment = self.environment;
-    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:loginController];
+    ForwardingNavigationController *navController = [[ForwardingNavigationController alloc] initWithRootViewController:loginController];
 
     return navController;
 }
 
 - (void)showSignUpScreenFromController:(UIViewController*)controller completion:(void(^)(void))completion {
     self.registrationCompletion = completion;
     OEXRegistrationViewController* registrationController = [[OEXRegistrationViewController alloc] initWithEnvironment:self.environment];
-    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:registrationController];
+    ForwardingNavigationController *navController = [[ForwardingNavigationController alloc] initWithRootViewController:registrationController];
     registrationController.delegate = self;
 
     [self presentViewController:navController fromController:[controller topMostController] completion:nil];