From e3d8d3c31c0105ea864ddff1807d4c7864d91b41 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 26 Aug 2013 21:43:34 -0400 Subject: [PATCH 1/5] statusbar/navbar visibility & news.html [FIXED] Handle statusbar/navbar visibility only from viewWillAppear. [FIXED] URL to news.html. --- MasterPassword/ObjC/iOS/MPMainViewController.m | 3 +++ MasterPassword/ObjC/iOS/MPUnlockViewController.m | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m index 791922cf..01f24ed0 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]; } From 3086baf52338a7312f2edb645ce614f882dd4c46 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 26 Aug 2013 23:17:02 -0400 Subject: [PATCH 2/5] Fix MPAppsVC pager positioning on 4". [FIXED] Manually added pager VC added to wrong superview. --- MasterPassword/ObjC/iOS/MPAppsViewController.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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]; From 19e35dbccda8148f7a95f243558968b6032f1c0d Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 26 Aug 2013 23:18:04 -0400 Subject: [PATCH 3/5] Unclutter the UI and revert to no news. --- Site/2013-05/news.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ -

E-mail us or open support if you have any issues.

+

From ac0d412123507ef4f8951f474a6c97aaa8f34e99 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Mon, 26 Aug 2013 23:19:44 -0400 Subject: [PATCH 4/5] UI fix for iOS 7. [FIXED] New ActionSheet doesn't deal well with spacing in items. [FIXED] UI now works on iOS 7. --- .../ObjC/iOS/MPMainViewController.m | 10 +- MasterPassword/ObjC/iOS/MPiOSAppDelegate.m | 60 +- .../ObjC/iOS/MainStoryboard_iPhone.storyboard | 672 +++++++----------- .../ObjC/iOS/MasterPassword-Info.plist | 4 +- .../project.pbxproj | 21 +- 5 files changed, 310 insertions(+), 457 deletions(-) diff --git a/MasterPassword/ObjC/iOS/MPMainViewController.m b/MasterPassword/ObjC/iOS/MPMainViewController.m index 01f24ed0..b6fa9ee5 100644 --- a/MasterPassword/ObjC/iOS/MPMainViewController.m +++ b/MasterPassword/ObjC/iOS/MPMainViewController.m @@ -772,11 +772,11 @@ } } cancelTitle:[PearlStrings get].commonButtonCancel destructiveTitle:nil otherTitles: - @"？ FAQ ", - @"ⓘ Quick Guide ", - @"⚙ Preferences ", - @"⚐ Other Apps ", - @"✎ Feedback ", + @"FAQ", + @"Overview", + @"User Profile", + @"Other Apps", + @"Feedback", nil]; } diff --git a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m index 2198755c..ae2f774d 100644 --- a/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m +++ b/MasterPassword/ObjC/iOS/MPiOSAppDelegate.m @@ -139,36 +139,36 @@ } #endif - UIImage *navBarImage = [[UIImage imageNamed:@"ui_navbar_container"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 5, 0, 5 )]; - [[UINavigationBar appearance] setBackgroundImage:navBarImage forBarMetrics:UIBarMetricsDefault]; - [[UINavigationBar appearance] setBackgroundImage:navBarImage forBarMetrics:UIBarMetricsLandscapePhone]; - [[UINavigationBar appearance] setTitleTextAttributes: - @{ - UITextAttributeTextColor : [UIColor colorWithRed:1.0f green:1.0f blue:1.0f alpha:1.0f], - UITextAttributeTextShadowColor : [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.8f], - UITextAttributeTextShadowOffset : [NSValue valueWithUIOffset:UIOffsetMake( 0, -1 )], - UITextAttributeFont : [UIFont fontWithName:@"Exo-Bold" size:20.0f] - }]; - - UIImage *navBarButton = [[UIImage imageNamed:@"ui_navbar_button"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 5, 0, 5 )]; - UIImage *navBarBack = [[UIImage imageNamed:@"ui_navbar_back"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 13, 0, 5 )]; - [[UIBarButtonItem appearance] setBackgroundImage:navBarButton forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [[UIBarButtonItem appearance] setBackgroundImage:nil forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone]; - [[UIBarButtonItem appearance] setBackButtonBackgroundImage:navBarBack forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; - [[UIBarButtonItem appearance] setBackButtonBackgroundImage:nil forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone]; - [[UIBarButtonItem appearance] setTitleTextAttributes: - @{ - UITextAttributeTextColor : [UIColor colorWithRed:1.0f green:1.0f blue:1.0f alpha:1.0f], - UITextAttributeTextShadowColor : [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.5f], - UITextAttributeTextShadowOffset : [NSValue valueWithUIOffset:UIOffsetMake( 0, 1 )]//, - // Causes a bug in iOS where image views get oddly stretched... or something. - //UITextAttributeFont: [UIFont fontWithName:@"HelveticaNeue" size:13.0f] - } - forState:UIControlStateNormal]; - - UIImage *toolBarImage = [[UIImage imageNamed:@"ui_toolbar_container"] resizableImageWithCapInsets:UIEdgeInsetsMake( 25, 5, 5, 5 )]; - [[UISearchBar appearance] setBackgroundImage:toolBarImage]; - [[UIToolbar appearance] setBackgroundImage:toolBarImage forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; +// UIImage *navBarImage = [[UIImage imageNamed:@"ui_navbar_container"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 5, 0, 5 )]; +// [[UINavigationBar appearance] setBackgroundImage:navBarImage forBarMetrics:UIBarMetricsDefault]; +// [[UINavigationBar appearance] setBackgroundImage:navBarImage forBarMetrics:UIBarMetricsLandscapePhone]; +// [[UINavigationBar appearance] setTitleTextAttributes: +// @{ +// UITextAttributeTextColor : [UIColor colorWithRed:1.0f green:1.0f blue:1.0f alpha:1.0f], +// UITextAttributeTextShadowColor : [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.8f], +// UITextAttributeTextShadowOffset : [NSValue valueWithUIOffset:UIOffsetMake( 0, -1 )], +// UITextAttributeFont : [UIFont fontWithName:@"Exo-Bold" size:20.0f] +// }]; +// +// UIImage *navBarButton = [[UIImage imageNamed:@"ui_navbar_button"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 5, 0, 5 )]; +// UIImage *navBarBack = [[UIImage imageNamed:@"ui_navbar_back"] resizableImageWithCapInsets:UIEdgeInsetsMake( 0, 13, 0, 5 )]; +// [[UIBarButtonItem appearance] setBackgroundImage:navBarButton forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; +// [[UIBarButtonItem appearance] setBackgroundImage:nil forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone]; +// [[UIBarButtonItem appearance] setBackButtonBackgroundImage:navBarBack forState:UIControlStateNormal barMetrics:UIBarMetricsDefault]; +// [[UIBarButtonItem appearance] setBackButtonBackgroundImage:nil forState:UIControlStateNormal barMetrics:UIBarMetricsLandscapePhone]; +// [[UIBarButtonItem appearance] setTitleTextAttributes: +// @{ +// UITextAttributeTextColor : [UIColor colorWithRed:1.0f green:1.0f blue:1.0f alpha:1.0f], +// UITextAttributeTextShadowColor : [UIColor colorWithRed:0.0f green:0.0f blue:0.0f alpha:0.5f], +// UITextAttributeTextShadowOffset : [NSValue valueWithUIOffset:UIOffsetMake( 0, 1 )]//, +// // Causes a bug in iOS where image views get oddly stretched... or something. +// //UITextAttributeFont: [UIFont fontWithName:@"HelveticaNeue" size:13.0f] +// } +// forState:UIControlStateNormal]; +// +// UIImage *toolBarImage = [[UIImage imageNamed:@"ui_toolbar_container"] resizableImageWithCapInsets:UIEdgeInsetsMake( 25, 5, 5, 5 )]; +// [[UISearchBar appearance] setBackgroundImage:toolBarImage]; +// [[UIToolbar appearance] setBackgroundImage:toolBarImage forToolbarPosition:UIToolbarPositionAny barMetrics:UIBarMetricsDefault]; // UIImage *minImage = [[UIImage imageNamed:@"slider-minimum"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 5, 0, 0)]; // UIImage *maxImage = [[UIImage imageNamed:@"slider-maximum"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 5, 0, 0)]; diff --git a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard index 94fe5514..5616e86e 100644 --- a/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard @@ -1,7 +1,8 @@ - + - + + @@ -23,8 +24,8 @@ - - + + - - - + + - - + + - + - - - + + @@ -96,17 +95,17 @@ - - + + - + - - - + + @@ -139,17 +137,17 @@ - - + + - + - - - + + @@ -182,17 +179,17 @@ - - + + - + - - - + + @@ -225,17 +221,17 @@ - - + + - + - - - + + @@ -268,17 +263,17 @@ - - + + - + - - - + + @@ -311,12 +305,12 @@ - - + + - - - + + @@ -338,8 +331,8 @@ It's an estimate of the amount of time necessary for a hacker with a powerful co - - + + - - - + + - - + + - + - - - + + @@ -407,17 +398,17 @@ Your passwords will be AES-encrypted with your master password. - - + + - + - - - + + @@ -443,12 +433,12 @@ Your passwords will be AES-encrypted with your master password. - - + + - - - + + @@ -518,7 +507,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -535,7 +524,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -549,6 +538,8 @@ Your passwords will be AES-encrypted with your master password. + + @@ -569,7 +560,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -726,7 +717,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -793,7 +784,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -1048,16 +1039,14 @@ L4m3P4sSw0rD - - + + - - @@ -1124,11 +1113,11 @@ L4m3P4sSw0rD - + - + + - + - + - + - + @@ -1345,7 +1335,7 @@ L4m3P4sSw0rD - @@ -1919,10 +1914,15 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + + - + + + + + @@ -1938,7 +1938,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + @@ -1957,8 +1957,8 @@ If you set a custom password, it will be encrypted before it is saved to the clo - - + + - + - + + - + @@ -2365,7 +2357,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + - + @@ -717,7 +726,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -784,7 +793,7 @@ Your passwords will be AES-encrypted with your master password. - + @@ -1039,14 +1048,16 @@ L4m3P4sSw0rD - - + + + + @@ -1113,11 +1124,11 @@ L4m3P4sSw0rD - + - + - - + - + - + - + @@ -1335,7 +1345,7 @@ L4m3P4sSw0rD + @@ -1914,15 +1919,10 @@ If you set a custom password, it will be encrypted before it is saved to the clo - - + - - - - - + @@ -1938,7 +1938,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo - + @@ -1957,8 +1957,8 @@ If you set a custom password, it will be encrypted before it is saved to the clo - - + + - + - + - - + @@ -2357,7 +2365,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo - +