diff --git a/MasterPassword/ObjC/iOS/MPAppsViewController.m b/MasterPassword/ObjC/iOS/MPAppsViewController.m index 17c23db1..d3e988d2 100644 --- a/MasterPassword/ObjC/iOS/MPAppsViewController.m +++ b/MasterPassword/ObjC/iOS/MPAppsViewController.m @@ -51,10 +51,9 @@ options:nil]; self.pageViewController.dataSource = self; self.pageViewController.delegate = self; + self.pageViewController.view.frame = CGRectFromOriginWithSize( CGPointZero, self.pagePositionView.bounds.size ); [self addChildViewController:self.pageViewController]; - [self.view addSubview:self.pageViewController.view]; - self.pageViewController.view.frame = self.pagePositionView.frame; - [self.pagePositionView removeFromSuperview]; + [self.pagePositionView addSubview:self.pageViewController.view]; [self.pageViewController didMoveToParentViewController:self]; [super viewDidLoad]; diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m index 4974a74f..b6fa9ee5 100644 --- a/MasterPassword/ObjC/iOS/MPMainViewController.m +++ b/MasterPassword/ObjC/iOS/MPMainViewController.m @@ -120,6 +120,9 @@ } - (void)viewWillAppear:(BOOL)animated { + + [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide]; + [self.navigationController setNavigationBarHidden:NO animated:animated]; MPElementEntity *activeElement = [self activeElementForMainThread]; if (activeElement.user != [[MPiOSAppDelegate get] activeUserForMainThread]) diff --git a/MasterPassword/ObjC/iOS/MPUnlockViewController.m b/MasterPassword/ObjC/iOS/MPUnlockViewController.m index 644d209d..d0bbe1a0 100644 --- a/MasterPassword/ObjC/iOS/MPUnlockViewController.m +++ b/MasterPassword/ObjC/iOS/MPUnlockViewController.m @@ -188,7 +188,7 @@ self.uiContainer.alpha = 1; }]; - NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news-dev.html?version=%@", + NSString *newsURL = PearlString( @"http://masterpasswordapp.com/news.html?version=%@", [[PearlInfoPlist get] CFBundleVersion] ); [self.newsView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:newsURL]]]; }]; @@ -245,11 +245,6 @@ [self.marqueeTipTimer invalidate]; - [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationSlide]; - [[NSOperationQueue mainQueue] addOperationWithBlock:^{ - [self.navigationController setNavigationBarHidden:NO animated:animated]; - }]; - [super viewWillDisappear:animated]; } diff --git a/Site/2013-05/news.html b/Site/2013-05/news.html index c432c0da..59085c74 100644 --- a/Site/2013-05/news.html +++ b/Site/2013-05/news.html @@ -16,6 +16,6 @@
- +