diff --git a/MasterPassword/iOS/MPGuideViewController.m b/MasterPassword/iOS/MPGuideViewController.m
index 0dadc753..653d6e85 100644
--- a/MasterPassword/iOS/MPGuideViewController.m
+++ b/MasterPassword/iOS/MPGuideViewController.m
@@ -24,6 +24,13 @@
[self.scrollView autoSizeContent];
}
+- (void)viewDidAppear:(BOOL)animated {
+
+ [[UIApplication sharedApplication] setStatusBarHidden:YES withAnimation:animated? UIStatusBarAnimationSlide: UIStatusBarAnimationNone];
+
+ [super viewDidAppear:animated];
+}
+
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m
index 731cd77b..01d6e53b 100644
--- a/MasterPassword/iOS/MPMainViewController.m
+++ b/MasterPassword/iOS/MPMainViewController.m
@@ -11,6 +11,7 @@
#import "MPAppDelegate_Key.h"
#import "MPAppDelegate_Store.h"
#import "ATConnect.h"
+#import "MPUnlockViewController.h"
@interface MPMainViewController (Private)
@@ -70,7 +71,8 @@
[super viewWillAppear:animated];
if (![MPAppDelegate get].activeUser)
- [self.navigationController performSegueWithIdentifier:@"MP_Unlock" sender:self];
+ [self.navigationController presentViewController:[self.storyboard instantiateViewControllerWithIdentifier:@"MPUnlockViewController"]
+ animated:animated completion:nil];
if (self.activeElement.user != [MPAppDelegate get].activeUser)
self.activeElement = nil;
self.searchDisplayController.searchBar.text = nil;
@@ -417,7 +419,6 @@
case 5:
#endif
{
- [[MPAppDelegate get] forgetSavedKeyFor:[MPAppDelegate get].activeUser];
[[MPAppDelegate get] signOut];
break;
}
diff --git a/MasterPassword/iOS/MPTypeViewController.m b/MasterPassword/iOS/MPTypeViewController.m
index 6fe1fcfe..97ccf3e8 100644
--- a/MasterPassword/iOS/MPTypeViewController.m
+++ b/MasterPassword/iOS/MPTypeViewController.m
@@ -61,16 +61,7 @@
UITableViewCell *cell = [super tableView:tableView cellForRowAtIndexPath:indexPath];
if ([delegate respondsToSelector:@selector(selectedType)])
- if ([delegate selectedType] == [self typeAtIndexPath:indexPath])
- [cell enumerateSubviews:^(UIView *subview, BOOL *stop, BOOL *recurse) {
- if ([subview isKindOfClass:[UIImageView class]]) {
- UIImageView *imageView = ((UIImageView *)subview);
- if (!imageView.highlightedImage)
- imageView.highlightedImage = [imageView.image highlightedImage];
- imageView.highlighted = YES;
- *stop = YES;
- }
- } recurse:NO];
+ cell.selected = ([delegate selectedType] == [self typeAtIndexPath:indexPath]);
return cell;
}
diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m
index 01f29678..6452367e 100644
--- a/MasterPassword/iOS/MPUnlockViewController.m
+++ b/MasterPassword/iOS/MPUnlockViewController.m
@@ -114,7 +114,6 @@
self.avatarToUser = [NSMutableDictionary dictionaryWithCapacity:3];
- self.passwordField.text = nil;
self.avatarsView.decelerationRate = UIScrollViewDecelerationRateFast;
self.avatarsView.clipsToBounds = NO;
self.nameLabel.layer.cornerRadius = 5;
@@ -349,6 +348,7 @@
self.deleteTip.alpha = 0;
} else
if (!self.selectedUser && self.passwordView.alpha == 1) {
+ self.passwordField.text = nil;
self.passwordView.alpha = 0;
self.avatarsView.center = CGPointMake(160, 310);
self.avatarsView.scrollEnabled = YES;
diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
index 852d8655..78f19fb4 100644
--- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
+++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard
@@ -16,18 +16,18 @@
-
-
+
+
-
-
+
+
-
+
-
-
-
+
+
@@ -90,8 +86,8 @@
-
-
+
+
@@ -123,8 +119,8 @@
-
-
+
+
@@ -156,8 +152,8 @@
-
-
+
+
@@ -189,8 +185,8 @@
-
-
+
+
@@ -222,8 +218,8 @@
-
-
+
+
@@ -255,15 +251,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
-
-
+
+
@@ -326,8 +344,8 @@ Your passwords will be AES-encrypted with your master password.
-
-
+
+
@@ -359,6 +377,28 @@ Your passwords will be AES-encrypted with your master password.
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -715,41 +755,41 @@ L4m3P4sSw0rD
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
@@ -946,7 +987,7 @@ L4m3P4sSw0rD
-
+
@@ -1006,11 +1047,11 @@ L4m3P4sSw0rD
-
-
+
+
-
+
-
+
@@ -1078,7 +1119,7 @@ L4m3P4sSw0rD
-
+
@@ -1120,12 +1161,34 @@ L4m3P4sSw0rD
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -1155,7 +1218,7 @@ L4m3P4sSw0rD
-
+
@@ -1188,7 +1251,7 @@ L4m3P4sSw0rD
-
+
diff --git a/MasterPassword/iOS/Settings.bundle/Root.plist b/MasterPassword/iOS/Settings.bundle/Root.plist
index f0ad438e..af9e4cb4 100644
--- a/MasterPassword/iOS/Settings.bundle/Root.plist
+++ b/MasterPassword/iOS/Settings.bundle/Root.plist
@@ -54,7 +54,7 @@
FooterText
- This causes your master password to be remembered while your device is powered on. Similar to your phone's SIM lock, you only need to enter the password once after powering on.
+ When enabled, closing the application will not log out the user. Similar to your phone's SIM lock, you only need to log in once after powering on.
Title
Master Password
Type
@@ -64,9 +64,9 @@
DefaultValue
Key
- rememberKey
+ rememberLogin
Title
- Remember my password
+ Stay logged in
Type
PSToggleSwitchSpecifier
@@ -78,16 +78,6 @@
Type
PSGroupSpecifier
-
- DefaultValue
-
- Key
- saveKey
- Title
- Save my password
- Type
- PSToggleSwitchSpecifier
-
Type
PSGroupSpecifier
diff --git a/Resources/Avatars/avatar-14.png b/Resources/Avatars/avatar-14.png
index c205d009..080b1d12 100644
Binary files a/Resources/Avatars/avatar-14.png and b/Resources/Avatars/avatar-14.png differ
diff --git a/Resources/Default.png b/Resources/Default.png
index ddda7770..ba4d0307 100644
Binary files a/Resources/Default.png and b/Resources/Default.png differ
diff --git a/Resources/Default@2x.png b/Resources/Default@2x.png
index cce897da..6fd16ae7 100644
Binary files a/Resources/Default@2x.png and b/Resources/Default@2x.png differ
diff --git a/Resources/Guide/guide_page_0.png b/Resources/Guide/guide_page_0.png
index 27113c4d..ea255a85 100644
Binary files a/Resources/Guide/guide_page_0.png and b/Resources/Guide/guide_page_0.png differ
diff --git a/Resources/Guide/guide_page_0@2x.png b/Resources/Guide/guide_page_0@2x.png
index da8992e6..11e42d73 100644
Binary files a/Resources/Guide/guide_page_0@2x.png and b/Resources/Guide/guide_page_0@2x.png differ
diff --git a/Resources/Guide/guide_page_1.png b/Resources/Guide/guide_page_1.png
index 12663cc9..e224e310 100644
Binary files a/Resources/Guide/guide_page_1.png and b/Resources/Guide/guide_page_1.png differ
diff --git a/Resources/Guide/guide_page_1@2x.png b/Resources/Guide/guide_page_1@2x.png
index edc29212..f558180b 100644
Binary files a/Resources/Guide/guide_page_1@2x.png and b/Resources/Guide/guide_page_1@2x.png differ
diff --git a/Resources/Guide/guide_page_2.png b/Resources/Guide/guide_page_2.png
index 46851df7..4e9ae202 100644
Binary files a/Resources/Guide/guide_page_2.png and b/Resources/Guide/guide_page_2.png differ
diff --git a/Resources/Guide/guide_page_2@2x.png b/Resources/Guide/guide_page_2@2x.png
index 36116748..fb8ab0dd 100644
Binary files a/Resources/Guide/guide_page_2@2x.png and b/Resources/Guide/guide_page_2@2x.png differ
diff --git a/Resources/Guide/guide_page_3.png b/Resources/Guide/guide_page_3.png
index c6142000..aba1bcfa 100644
Binary files a/Resources/Guide/guide_page_3.png and b/Resources/Guide/guide_page_3.png differ
diff --git a/Resources/Guide/guide_page_3@2x.png b/Resources/Guide/guide_page_3@2x.png
index b1a9af04..2bb02f33 100644
Binary files a/Resources/Guide/guide_page_3@2x.png and b/Resources/Guide/guide_page_3@2x.png differ
diff --git a/Resources/Guide/guide_page_4.png b/Resources/Guide/guide_page_4.png
index 77a4f729..97dcb5be 100644
Binary files a/Resources/Guide/guide_page_4.png and b/Resources/Guide/guide_page_4.png differ
diff --git a/Resources/Guide/guide_page_4@2x.png b/Resources/Guide/guide_page_4@2x.png
index 965bafab..39a38467 100644
Binary files a/Resources/Guide/guide_page_4@2x.png and b/Resources/Guide/guide_page_4@2x.png differ
diff --git a/Resources/Guide/guide_page_5.png b/Resources/Guide/guide_page_5.png
index 5c8160aa..026346f3 100644
Binary files a/Resources/Guide/guide_page_5.png and b/Resources/Guide/guide_page_5.png differ
diff --git a/Resources/Guide/guide_page_5@2x.png b/Resources/Guide/guide_page_5@2x.png
index 47062152..21785d65 100644
Binary files a/Resources/Guide/guide_page_5@2x.png and b/Resources/Guide/guide_page_5@2x.png differ
diff --git a/Resources/Guide/guide_page_6.png b/Resources/Guide/guide_page_6.png
index cf4c610d..4aeb50d2 100644
Binary files a/Resources/Guide/guide_page_6.png and b/Resources/Guide/guide_page_6.png differ
diff --git a/Resources/Guide/guide_page_6@2x.png b/Resources/Guide/guide_page_6@2x.png
index 548e2d2d..678594ff 100644
Binary files a/Resources/Guide/guide_page_6@2x.png and b/Resources/Guide/guide_page_6@2x.png differ
diff --git a/Resources/Tooltips/tip_basic_black_top.png b/Resources/Tooltips/tip_basic_black_top.png
index 6fb2842c..701a3911 100644
Binary files a/Resources/Tooltips/tip_basic_black_top.png and b/Resources/Tooltips/tip_basic_black_top.png differ
diff --git a/Resources/Tooltips/tip_basic_black_top_right.png b/Resources/Tooltips/tip_basic_black_top_right.png
index f60737e7..bdbc655b 100644
Binary files a/Resources/Tooltips/tip_basic_black_top_right.png and b/Resources/Tooltips/tip_basic_black_top_right.png differ