Merge branch 'master' of github.com:Lyndir/MasterPassword
This commit is contained in:
commit
7e96496614
Binary file not shown.
@ -15,13 +15,13 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>FMWK</string>
|
<string>FMWK</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>2.1.6</string>
|
<string>2.1.7</string>
|
||||||
<key>CFBundleSupportedPlatforms</key>
|
<key>CFBundleSupportedPlatforms</key>
|
||||||
<array>
|
<array>
|
||||||
<string>iPhoneOS</string>
|
<string>iPhoneOS</string>
|
||||||
</array>
|
</array>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>21</string>
|
<string>26</string>
|
||||||
<key>DTPlatformName</key>
|
<key>DTPlatformName</key>
|
||||||
<string>iphoneos</string>
|
<string>iphoneos</string>
|
||||||
<key>MinimumOSVersion</key>
|
<key>MinimumOSVersion</key>
|
||||||
|
BIN
External/Crashlytics.framework/run
vendored
BIN
External/Crashlytics.framework/run
vendored
Binary file not shown.
2
External/LoveLyndir
vendored
2
External/LoveLyndir
vendored
@ -1 +1 @@
|
|||||||
Subproject commit adab69df05840d94a3f2f883251869d6cb352b0e
|
Subproject commit 97eafd9b59f84bd9e3fc3cb4313df8b3c034e766
|
2
External/Pearl
vendored
2
External/Pearl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 081c2dec20b3638694a5ad20cd2fddccdb298447
|
Subproject commit 9e41cebeba085fce2bbae2592d52bbfd740f9ffb
|
@ -205,6 +205,8 @@
|
|||||||
MPElementEntity *element = [self.representedObject entityInContext:context];
|
MPElementEntity *element = [self.representedObject entityInContext:context];
|
||||||
[context deleteObject:element];
|
[context deleteObject:element];
|
||||||
[context saveToStore];
|
[context saveToStore];
|
||||||
|
|
||||||
|
[((MPPasswordWindowController *)self.collectionView.window.windowController) updateElements];
|
||||||
}];
|
}];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -18,4 +18,6 @@
|
|||||||
@property(nonatomic, weak) IBOutlet NSTextField *userLabel;
|
@property(nonatomic, weak) IBOutlet NSTextField *userLabel;
|
||||||
@property(nonatomic, weak) IBOutlet NSCollectionView *siteCollectionView;
|
@property(nonatomic, weak) IBOutlet NSCollectionView *siteCollectionView;
|
||||||
|
|
||||||
|
- (void)updateElements;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
@ -178,14 +178,17 @@
|
|||||||
}
|
}
|
||||||
if (contextInfo == MPAlertCreateSite) {
|
if (contextInfo == MPAlertCreateSite) {
|
||||||
switch (returnCode) {
|
switch (returnCode) {
|
||||||
case NSAlertDefaultReturn: {
|
case NSAlertFirstButtonReturn: {
|
||||||
|
// "Create" button.
|
||||||
[[MPMacAppDelegate get] addElementNamed:[self.siteField stringValue] completion:^(MPElementEntity *element) {
|
[[MPMacAppDelegate get] addElementNamed:[self.siteField stringValue] completion:^(MPElementEntity *element) {
|
||||||
if (element) {
|
if (element)
|
||||||
[self updateElements];
|
[self updateElements];
|
||||||
}
|
|
||||||
}];
|
}];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case NSAlertThirdButtonReturn:
|
||||||
|
// "Cancel" button.
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -345,23 +348,35 @@
|
|||||||
|
|
||||||
NSError *error = nil;
|
NSError *error = nil;
|
||||||
NSArray *siteResults = [context executeFetchRequest:fetchRequest error:&error];
|
NSArray *siteResults = [context executeFetchRequest:fetchRequest error:&error];
|
||||||
if (!siteResults)
|
if (!siteResults) {
|
||||||
err(@"While fetching elements for completion: %@", error);
|
err(@"While fetching elements for completion: %@", error);
|
||||||
else if ([siteResults count]) {
|
return;
|
||||||
NSMutableArray *newElements = [NSMutableArray arrayWithCapacity:[siteResults count]];
|
|
||||||
for (MPElementEntity *element in siteResults)
|
|
||||||
[newElements addObject:[[MPElementModel alloc] initWithEntity:element]];
|
|
||||||
self.elements = newElements;
|
|
||||||
if (!self.selectedElement && [newElements count])
|
|
||||||
self.elementSelectionIndexes = [NSIndexSet indexSetWithIndex:0];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NSMutableArray *newElements = [NSMutableArray arrayWithCapacity:[siteResults count]];
|
||||||
|
for (MPElementEntity *element in siteResults)
|
||||||
|
[newElements addObject:[[MPElementModel alloc] initWithEntity:element]];
|
||||||
|
self.elements = newElements;
|
||||||
|
if (!self.selectedElement)
|
||||||
|
self.elementSelectionIndexes = [newElements count]? [NSIndexSet indexSetWithIndex:0]: nil;
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
- (NSUInteger)selectedIndex {
|
||||||
|
|
||||||
|
if (!self.elementSelectionIndexes)
|
||||||
|
return NSNotFound;
|
||||||
|
NSUInteger selectedIndex = self.elementSelectionIndexes.firstIndex;
|
||||||
|
if (selectedIndex >= self.elements.count)
|
||||||
|
return NSNotFound;
|
||||||
|
|
||||||
|
return selectedIndex;
|
||||||
|
}
|
||||||
|
|
||||||
- (NSBox *)selectedView {
|
- (NSBox *)selectedView {
|
||||||
|
|
||||||
NSUInteger selectedIndex = self.elementSelectionIndexes.firstIndex;
|
NSUInteger selectedIndex = [self selectedIndex];
|
||||||
if (selectedIndex == NSNotFound || selectedIndex >= self.elements.count)
|
if (selectedIndex == NSNotFound)
|
||||||
return nil;
|
return nil;
|
||||||
|
|
||||||
return (NSBox *)[self.siteCollectionView itemAtIndex:selectedIndex].view;
|
return (NSBox *)[self.siteCollectionView itemAtIndex:selectedIndex].view;
|
||||||
@ -369,10 +384,11 @@
|
|||||||
|
|
||||||
- (MPElementModel *)selectedElement {
|
- (MPElementModel *)selectedElement {
|
||||||
|
|
||||||
if (!self.elementSelectionIndexes.count)
|
NSUInteger selectedIndex = [self selectedIndex];
|
||||||
|
if (selectedIndex == NSNotFound)
|
||||||
return nil;
|
return nil;
|
||||||
|
|
||||||
return (MPElementModel *)self.elements[self.elementSelectionIndexes.firstIndex];
|
return (MPElementModel *)self.elements[selectedIndex];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setSelectedElement:(MPElementModel *)element {
|
- (void)setSelectedElement:(MPElementModel *)element {
|
||||||
|
@ -1894,7 +1894,7 @@
|
|||||||
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
|
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
|
CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
|
||||||
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
|
CODE_SIGN_IDENTITY = "Mac Developer";
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
@ -1960,12 +1960,9 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Mac Developer";
|
|
||||||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer: Maarten Billemont (DWGU95U4ZD)";
|
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
||||||
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
||||||
PROVISIONING_PROFILE = "9AEC6040-D157-4526-8CA9-FF0254B3A4A5";
|
|
||||||
SKIP_INSTALL = NO;
|
SKIP_INSTALL = NO;
|
||||||
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
||||||
};
|
};
|
||||||
@ -1977,12 +1974,9 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Mac Developer";
|
|
||||||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
|
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
||||||
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
||||||
PROVISIONING_PROFILE = "2A46D0C9-E5F0-4C52-BCC6-96434A0D1C1B";
|
|
||||||
SKIP_INSTALL = NO;
|
SKIP_INSTALL = NO;
|
||||||
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
||||||
};
|
};
|
||||||
@ -2009,7 +2003,7 @@
|
|||||||
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
|
CLANG_WARN__ARC_BRIDGE_CAST_NONARC = YES;
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
|
CLANG_WARN__EXIT_TIME_DESTRUCTORS = YES;
|
||||||
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
|
CODE_SIGN_IDENTITY = "Mac Developer";
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
@ -2075,12 +2069,9 @@
|
|||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CLANG_ENABLE_OBJC_ARC = YES;
|
CLANG_ENABLE_OBJC_ARC = YES;
|
||||||
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
CODE_SIGN_ENTITLEMENTS = MasterPassword.entitlements;
|
||||||
CODE_SIGN_IDENTITY = "Mac Developer";
|
|
||||||
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "3rd Party Mac Developer Application: Maarten Billemont (HL3Q45LX9N)";
|
|
||||||
COMBINE_HIDPI_IMAGES = YES;
|
COMBINE_HIDPI_IMAGES = YES;
|
||||||
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
GCC_PREFIX_HEADER = "MasterPassword-Prefix.pch";
|
||||||
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
INFOPLIST_FILE = "MasterPassword-Info.plist";
|
||||||
PROVISIONING_PROFILE = "170D83FD-18FE-4A05-B13C-8D16876480C6";
|
|
||||||
SKIP_INSTALL = NO;
|
SKIP_INSTALL = NO;
|
||||||
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
WRAPPER_NAME = "Master Password.${WRAPPER_EXTENSION}";
|
||||||
};
|
};
|
||||||
|
@ -4,11 +4,11 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>com.apple.developer.ubiquity-container-identifiers</key>
|
<key>com.apple.developer.ubiquity-container-identifiers</key>
|
||||||
<array>
|
<array>
|
||||||
<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword.Mac</string>
|
<string>HL3Q45LX9N.com.lyndir.lhunath.MasterPassword.Mac</string>
|
||||||
<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword.shared</string>
|
<string>HL3Q45LX9N.com.lyndir.lhunath.MasterPassword.shared</string>
|
||||||
</array>
|
</array>
|
||||||
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
|
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
|
||||||
<string>$(TeamIdentifierPrefix)com.lyndir.lhunath.MasterPassword.shared</string>
|
<string>HL3Q45LX9N.com.lyndir.lhunath.MasterPassword.shared</string>
|
||||||
<key>com.apple.security.app-sandbox</key>
|
<key>com.apple.security.app-sandbox</key>
|
||||||
<true/>
|
<true/>
|
||||||
</dict>
|
</dict>
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
|
|
||||||
@interface MPGuideViewController : UIViewController<UIScrollViewDelegate>
|
@interface MPGuideViewController : UIViewController<UIScrollViewDelegate>
|
||||||
|
|
||||||
|
@property(weak, nonatomic) IBOutlet UISearchBar *searchBar;
|
||||||
@property(weak, nonatomic) IBOutlet UIView *siteNameTip;
|
@property(weak, nonatomic) IBOutlet UIView *siteNameTip;
|
||||||
@property(weak, nonatomic) IBOutlet UIView *contentTip;
|
@property(weak, nonatomic) IBOutlet UIView *contentTip;
|
||||||
@property(weak, nonatomic) IBOutlet UILabel *contentTipText;
|
@property(weak, nonatomic) IBOutlet UILabel *contentTipText;
|
||||||
|
@ -64,6 +64,7 @@
|
|||||||
// Via setup
|
// Via setup
|
||||||
self.smallPlayButton.hidden = YES;
|
self.smallPlayButton.hidden = YES;
|
||||||
|
|
||||||
|
self.searchBar.text = nil;
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 0;
|
self.content.alpha = 0;
|
||||||
self.content.frame = CGRectSetHeight( self.content.frame, 180 );
|
self.content.frame = CGRectSetHeight( self.content.frame, 180 );
|
||||||
@ -81,6 +82,7 @@
|
|||||||
// Via segue
|
// Via segue
|
||||||
self.largePlayButton.hidden = YES;
|
self.largePlayButton.hidden = YES;
|
||||||
|
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 1;
|
self.siteNameTip.alpha = 1;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.content.frame = CGRectSetHeight( self.content.frame, 231 );
|
self.content.frame = CGRectSetHeight( self.content.frame, 231 );
|
||||||
@ -147,6 +149,7 @@
|
|||||||
|
|
||||||
if (self.currentTick < 5) {
|
if (self.currentTick < 5) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = nil;
|
||||||
self.siteNameTip.alpha = 1;
|
self.siteNameTip.alpha = 1;
|
||||||
self.content.alpha = 0;
|
self.content.alpha = 0;
|
||||||
self.content.frame = CGRectSetHeight( self.content.frame, 180 );
|
self.content.frame = CGRectSetHeight( self.content.frame, 180 );
|
||||||
@ -159,6 +162,7 @@
|
|||||||
}
|
}
|
||||||
else if (self.currentTick < 10) {
|
else if (self.currentTick < 10) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.contentTip.alpha = 1;
|
self.contentTip.alpha = 1;
|
||||||
@ -171,6 +175,7 @@
|
|||||||
}
|
}
|
||||||
else if (self.currentTick < 15) {
|
else if (self.currentTick < 15) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.contentTip.alpha = 1;
|
self.contentTip.alpha = 1;
|
||||||
@ -185,6 +190,7 @@
|
|||||||
}
|
}
|
||||||
else if (self.currentTick < 20) {
|
else if (self.currentTick < 20) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.content.frame = CGRectSetHeight( self.content.frame, 231 );
|
self.content.frame = CGRectSetHeight( self.content.frame, 231 );
|
||||||
@ -199,6 +205,7 @@
|
|||||||
}
|
}
|
||||||
else if (self.currentTick < 25) {
|
else if (self.currentTick < 25) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.contentTip.alpha = 0;
|
self.contentTip.alpha = 0;
|
||||||
@ -212,6 +219,7 @@
|
|||||||
}
|
}
|
||||||
else if (self.currentTick < 30) {
|
else if (self.currentTick < 30) {
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 0;
|
self.siteNameTip.alpha = 0;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.contentTip.alpha = 0;
|
self.contentTip.alpha = 0;
|
||||||
@ -230,6 +238,7 @@
|
|||||||
self.currentTick = 0;
|
self.currentTick = 0;
|
||||||
[UIView animateWithDuration:0.5 animations:^{
|
[UIView animateWithDuration:0.5 animations:^{
|
||||||
[self.smallPlayButton setImage:[UIImage imageNamed:@"icon_play"] forState:UIControlStateNormal];
|
[self.smallPlayButton setImage:[UIImage imageNamed:@"icon_play"] forState:UIControlStateNormal];
|
||||||
|
self.searchBar.text = @"gmail.com";
|
||||||
self.siteNameTip.alpha = 1;
|
self.siteNameTip.alpha = 1;
|
||||||
self.content.alpha = 1;
|
self.content.alpha = 1;
|
||||||
self.contentTip.alpha = 1;
|
self.contentTip.alpha = 1;
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
#import "LLGitTip.h"
|
||||||
|
|
||||||
@interface MPUnlockViewController : UIViewController<UITextFieldDelegate, UIScrollViewDelegate, UIWebViewDelegate>
|
@interface MPUnlockViewController : UIViewController<UITextFieldDelegate, UIScrollViewDelegate, UIWebViewDelegate>
|
||||||
|
|
||||||
@ -26,6 +27,8 @@
|
|||||||
@property(strong, nonatomic) IBOutlet UILongPressGestureRecognizer *targetedUserActionGesture;
|
@property(strong, nonatomic) IBOutlet UILongPressGestureRecognizer *targetedUserActionGesture;
|
||||||
@property(weak, nonatomic) IBOutlet UIView *uiContainer;
|
@property(weak, nonatomic) IBOutlet UIView *uiContainer;
|
||||||
@property(weak, nonatomic) IBOutlet UIView *shareContainer;
|
@property(weak, nonatomic) IBOutlet UIView *shareContainer;
|
||||||
|
@property(weak, nonatomic) IBOutlet UIView *tipsTipContainer;
|
||||||
|
@property(weak, nonatomic) IBOutlet LLGitTip *gitTipButton;
|
||||||
@property(weak, nonatomic) IBOutlet UIWebView *newsView;
|
@property(weak, nonatomic) IBOutlet UIWebView *newsView;
|
||||||
@property(weak, nonatomic) IBOutlet UIView *emergencyGeneratorContainer;
|
@property(weak, nonatomic) IBOutlet UIView *emergencyGeneratorContainer;
|
||||||
@property(weak, nonatomic) IBOutlet UITextField *emergencyName;
|
@property(weak, nonatomic) IBOutlet UITextField *emergencyName;
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#import "MPiOSAppDelegate.h"
|
#import "MPiOSAppDelegate.h"
|
||||||
#import "MPAppDelegate_Key.h"
|
#import "MPAppDelegate_Key.h"
|
||||||
#import "MPAppDelegate_Store.h"
|
#import "MPAppDelegate_Store.h"
|
||||||
|
#import "LLGitTip.h"
|
||||||
|
|
||||||
@interface MPUnlockViewController()
|
@interface MPUnlockViewController()
|
||||||
|
|
||||||
@ -127,6 +128,7 @@
|
|||||||
|
|
||||||
- (void)viewDidLoad {
|
- (void)viewDidLoad {
|
||||||
|
|
||||||
|
self.gitTipButton.iTunesID = [MPConfig get].iTunesID;
|
||||||
self.avatarToUserOID = [NSMutableDictionary dictionaryWithCapacity:3];
|
self.avatarToUserOID = [NSMutableDictionary dictionaryWithCapacity:3];
|
||||||
|
|
||||||
[self.avatarsView addGestureRecognizer:self.targetedUserActionGesture];
|
[self.avatarsView addGestureRecognizer:self.targetedUserActionGesture];
|
||||||
@ -230,6 +232,7 @@
|
|||||||
self.uiContainer.alpha = 0;
|
self.uiContainer.alpha = 0;
|
||||||
self.shareContainer.alpha = 0;
|
self.shareContainer.alpha = 0;
|
||||||
self.spinner.alpha = 0;
|
self.spinner.alpha = 0;
|
||||||
|
self.tipsTipContainer.alpha = 0;
|
||||||
|
|
||||||
[super viewWillAppear:animated];
|
[super viewWillAppear:animated];
|
||||||
}
|
}
|
||||||
@ -249,6 +252,8 @@
|
|||||||
if (finished)
|
if (finished)
|
||||||
[UIView animateWithDuration:1 animations:^{
|
[UIView animateWithDuration:1 animations:^{
|
||||||
self.shareContainer.alpha = 1;
|
self.shareContainer.alpha = 1;
|
||||||
|
if ([MPConfig get].firstVersionRun)
|
||||||
|
self.tipsTipContainer.alpha = 1;
|
||||||
}];
|
}];
|
||||||
}];
|
}];
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13B3116" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="KZF-fe-y9n">
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<deployment defaultVersion="1536" identifier="iOS"/>
|
<deployment defaultVersion="1536" identifier="iOS"/>
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/>
|
||||||
@ -470,15 +470,15 @@ Your passwords will be AES-encrypted with your master password.</string>
|
|||||||
<objects>
|
<objects>
|
||||||
<viewController id="Tx0-mM-kHk" customClass="MPLogsViewController" sceneMemberID="viewController">
|
<viewController id="Tx0-mM-kHk" customClass="MPLogsViewController" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="3oc-v8-YGP">
|
<view key="view" contentMode="scaleToFill" id="3oc-v8-YGP">
|
||||||
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||||
<autoresizingMask key="autoresizingMask"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="mtJ-9r-6yT">
|
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="mtJ-9r-6yT">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
|
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
</imageView>
|
</imageView>
|
||||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="ojc-Tn-DM1">
|
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" id="ojc-Tn-DM1">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
|
<rect key="frame" x="0.0" y="0.0" width="320" height="524"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
<string key="text">119-20:51:52 MPiOSAppDelegate.m:36 | INFO : Initializing TestFlight
|
<string key="text">119-20:51:52 MPiOSAppDelegate.m:36 | INFO : Initializing TestFlight
|
||||||
@ -508,7 +508,7 @@ Your passwords will be AES-encrypted with your master password.</string>
|
|||||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||||
</textView>
|
</textView>
|
||||||
<toolbar contentMode="scaleToFill" barStyle="black" translucent="NO" id="QPO-l8-Opz">
|
<toolbar contentMode="scaleToFill" barStyle="black" translucent="NO" id="QPO-l8-Opz">
|
||||||
<rect key="frame" x="0.0" y="460" width="320" height="44"/>
|
<rect key="frame" x="0.0" y="524" width="320" height="44"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
||||||
<items>
|
<items>
|
||||||
<barButtonItem systemItem="compose" id="Yvq-If-VqG">
|
<barButtonItem systemItem="compose" id="Yvq-If-VqG">
|
||||||
@ -524,7 +524,7 @@ Your passwords will be AES-encrypted with your master password.</string>
|
|||||||
<barButtonItem systemItem="flexibleSpace" id="GcH-O1-v3J"/>
|
<barButtonItem systemItem="flexibleSpace" id="GcH-O1-v3J"/>
|
||||||
<barButtonItem style="plain" id="yi1-I8-uzn">
|
<barButtonItem style="plain" id="yi1-I8-uzn">
|
||||||
<segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="lzO-Kl-IPf">
|
<segmentedControl key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="lzO-Kl-IPf">
|
||||||
<rect key="frame" x="191" y="7" width="123" height="30"/>
|
<rect key="frame" x="181" y="7" width="123" height="30"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
<segments>
|
<segments>
|
||||||
<segment title="Normal"/>
|
<segment title="Normal"/>
|
||||||
@ -1575,182 +1575,34 @@ You can use the words in the background for inspiration in finding a memorable m
|
|||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
</view>
|
</view>
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="uow-B8-taR" customClass="LLGitTip">
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="uow-B8-taR" userLabel="Tips" customClass="LLGitTip">
|
||||||
<rect key="frame" x="115.5" y="519" width="89" height="18"/>
|
<rect key="frame" x="115" y="519" width="89" height="18"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
<state key="normal" image="gittip.png">
|
<state key="normal" image="gittip.png">
|
||||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
</state>
|
</state>
|
||||||
</button>
|
</button>
|
||||||
</subviews>
|
<view userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" id="c8h-Zm-5dO" userLabel="View - Tips Tip">
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<rect key="frame" x="45" y="473" width="230" height="60"/>
|
||||||
</view>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
<view hidden="YES" alpha="0.30000000000000016" contentMode="scaleToFill" id="KNa-Xb-RuE" userLabel="View - Emergency Generator">
|
|
||||||
<rect key="frame" x="-100" y="0.0" width="520" height="568"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
|
||||||
<subviews>
|
|
||||||
<view contentMode="scaleToFill" id="vdf-Kn-Sle">
|
|
||||||
<rect key="frame" x="100" y="20" width="320" height="434"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="ui_panel_display.png" id="jLf-TI-anP">
|
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" id="Kan-Wf-gPL">
|
||||||
<rect key="frame" x="11" y="0.0" width="298" height="434"/>
|
<rect key="frame" x="0.0" y="0.0" width="230" height="60"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<rect key="contentStretch" x="0.050000000000000003" y="0.10000000000000001" width="0.89999999999999991" height="0.79999999999999982"/>
|
<rect key="contentStretch" x="0.15000000000000002" y="0.0" width="0.69999999999999973" height="1"/>
|
||||||
</imageView>
|
</imageView>
|
||||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Emergency Generator" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="shF-6G-WyQ">
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Why is Master Password free?" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="86C-RP-AcD">
|
||||||
<rect key="frame" x="30" y="20" width="260" height="21"/>
|
<rect key="frame" x="19" y="9" width="191" height="21"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||||
<fontDescription key="fontDescription" name="GillSans-Bold" family="Gill Sans" pointSize="17"/>
|
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
|
||||||
<size key="shadowOffset" width="0.0" height="1"/>
|
|
||||||
</label>
|
|
||||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Generate your password without logging in. Great for if you're borrowing a friend's device or are having trouble logging in." lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="cgB-L6-VbR">
|
|
||||||
<rect key="frame" x="30" y="49" width="260" height="52"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" name="GillSans-LightItalic" family="Gill Sans" pointSize="14"/>
|
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
|
||||||
<size key="shadowOffset" width="0.0" height="1"/>
|
|
||||||
</label>
|
|
||||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Name" minimumFontSize="17" id="esC-1q-bE7">
|
|
||||||
<rect key="frame" x="41" y="109" width="240" height="30"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
<textInputTraits key="textInputTraits" autocapitalizationType="words" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
|
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||||
<connections>
|
|
||||||
<outlet property="delegate" destination="Nbn-Rv-sP1" id="yRn-2W-KeI"/>
|
|
||||||
</connections>
|
|
||||||
</textField>
|
|
||||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Master Password" minimumFontSize="17" id="Yvd-Hm-fuw">
|
|
||||||
<rect key="frame" x="41" y="147" width="240" height="30"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES" secureTextEntry="YES"/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="delegate" destination="Nbn-Rv-sP1" id="tqK-8C-p2c"/>
|
|
||||||
</connections>
|
|
||||||
</textField>
|
|
||||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Site Name" minimumFontSize="17" id="YeH-3J-oY4">
|
|
||||||
<rect key="frame" x="41" y="185" width="240" height="30"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="URL" keyboardAppearance="alert" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
|
|
||||||
<connections>
|
|
||||||
<outlet property="delegate" destination="Nbn-Rv-sP1" id="w1h-rQ-fIF"/>
|
|
||||||
</connections>
|
|
||||||
</textField>
|
|
||||||
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="1" id="LfH-XT-9Vt">
|
|
||||||
<rect key="frame" x="41" y="223" width="240" height="29"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
|
||||||
<segments>
|
|
||||||
<segment title="Max"/>
|
|
||||||
<segment title="Long"/>
|
|
||||||
<segment title="Med"/>
|
|
||||||
<segment title="Basic"/>
|
|
||||||
<segment title="Short"/>
|
|
||||||
<segment title="PIN"/>
|
|
||||||
</segments>
|
|
||||||
<color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
</segmentedControl>
|
|
||||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Counter" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="pa9-d6-vQt">
|
|
||||||
<rect key="frame" x="41" y="262" width="285" height="23"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
|
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
<nil key="highlightedColor"/>
|
<nil key="highlightedColor"/>
|
||||||
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
|
||||||
<size key="shadowOffset" width="0.0" height="1"/>
|
|
||||||
</label>
|
</label>
|
||||||
<stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" id="D49-fo-7FA">
|
|
||||||
<rect key="frame" x="187" y="260" width="94" height="29"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
|
||||||
</stepper>
|
|
||||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="TJC-xD-fjQ">
|
|
||||||
<rect key="frame" x="79" y="263" width="100" height="21"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</label>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="TmC-YR-JKg">
|
|
||||||
<rect key="frame" x="265" y="0.0" width="44" height="44"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
|
||||||
<accessibility key="accessibilityConfiguration" hint="" label="Close"/>
|
|
||||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
|
||||||
<state key="normal" image="icon_cancel.png">
|
|
||||||
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<state key="highlighted">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<connections>
|
|
||||||
<action selector="emergencyClose:" destination="Nbn-Rv-sP1" eventType="touchUpInside" id="U2r-pg-UGB"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Rxb-jY-TFS">
|
|
||||||
<rect key="frame" x="15" y="1" width="44" height="44"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
|
||||||
<accessibility key="accessibilityConfiguration" hint="" label="Close"/>
|
|
||||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
|
||||||
<state key="normal" image="icon_gears.png">
|
|
||||||
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<state key="highlighted">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<connections>
|
|
||||||
<segue destination="Vrp-Gl-7qn" kind="push" identifier="MP_Settings" id="hxY-aA-ngI"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="3Ax-91-gVM">
|
|
||||||
<rect key="frame" x="141" y="388" width="37" height="37"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
|
||||||
</activityIndicatorView>
|
|
||||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="r9J-C9-Bt1">
|
|
||||||
<rect key="frame" x="20" y="380" width="280" height="54"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" name="AmericanTypewriter-Bold" family="American Typewriter" pointSize="30"/>
|
|
||||||
<size key="titleShadowOffset" width="0.0" height="1"/>
|
|
||||||
<state key="normal" title="Kucy9-RimuTich">
|
|
||||||
<color key="titleColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
|
|
||||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<state key="highlighted">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
|
||||||
</state>
|
|
||||||
<connections>
|
|
||||||
<action selector="emergencyCopy:" destination="Nbn-Rv-sP1" eventType="touchUpInside" id="p7g-5T-dqz"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
<view hidden="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" id="sD9-hR-UAI" userLabel="View - Content Tip">
|
|
||||||
<rect key="frame" x="55" y="354" width="210" height="60"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
|
||||||
<subviews>
|
|
||||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" id="Lua-xm-WX6">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="210" height="60"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
|
||||||
</imageView>
|
|
||||||
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Copied!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="fXa-HL-2OW">
|
|
||||||
<rect key="frame" x="19" y="9" width="171" height="21"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
|
||||||
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
|
||||||
<nil key="highlightedColor"/>
|
|
||||||
</label>
|
|
||||||
</subviews>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
|
||||||
</view>
|
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
</view>
|
</view>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
</view>
|
</view>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
@ -1772,6 +1624,7 @@ You can use the words in the background for inspiration in finding a memorable m
|
|||||||
<outlet property="emergencyPassword" destination="r9J-C9-Bt1" id="yt0-hH-0yT"/>
|
<outlet property="emergencyPassword" destination="r9J-C9-Bt1" id="yt0-hH-0yT"/>
|
||||||
<outlet property="emergencySite" destination="YeH-3J-oY4" id="h0w-om-4vd"/>
|
<outlet property="emergencySite" destination="YeH-3J-oY4" id="h0w-om-4vd"/>
|
||||||
<outlet property="emergencyTypeControl" destination="LfH-XT-9Vt" id="pku-x3-i9h"/>
|
<outlet property="emergencyTypeControl" destination="LfH-XT-9Vt" id="pku-x3-i9h"/>
|
||||||
|
<outlet property="gitTipButton" destination="uow-B8-taR" id="Bt9-a3-SZo"/>
|
||||||
<outlet property="nameLabel" destination="0NM-NI-7UR" id="GBg-Ry-sqj"/>
|
<outlet property="nameLabel" destination="0NM-NI-7UR" id="GBg-Ry-sqj"/>
|
||||||
<outlet property="oldNameLabel" destination="8s0-nT-Aoq" id="plu-1H-MVc"/>
|
<outlet property="oldNameLabel" destination="8s0-nT-Aoq" id="plu-1H-MVc"/>
|
||||||
<outlet property="passwordField" destination="rTR-7Q-X8o" id="Vsn-uO-4lO"/>
|
<outlet property="passwordField" destination="rTR-7Q-X8o" id="Vsn-uO-4lO"/>
|
||||||
@ -1783,12 +1636,180 @@ You can use the words in the background for inspiration in finding a memorable m
|
|||||||
<outlet property="spinner" destination="27q-lX-0vy" id="CGK-G9-PRI"/>
|
<outlet property="spinner" destination="27q-lX-0vy" id="CGK-G9-PRI"/>
|
||||||
<outlet property="targetedUserActionGesture" destination="9WS-yS-aqQ" id="y74-cg-eat"/>
|
<outlet property="targetedUserActionGesture" destination="9WS-yS-aqQ" id="y74-cg-eat"/>
|
||||||
<outlet property="tip" destination="DBJ-Qi-ZcF" id="VXD-Zc-UYi"/>
|
<outlet property="tip" destination="DBJ-Qi-ZcF" id="VXD-Zc-UYi"/>
|
||||||
|
<outlet property="tipsTipContainer" destination="c8h-Zm-5dO" id="nzn-dZ-hnI"/>
|
||||||
<outlet property="uiContainer" destination="PHH-XC-9QQ" id="ogr-ak-h1V"/>
|
<outlet property="uiContainer" destination="PHH-XC-9QQ" id="ogr-ak-h1V"/>
|
||||||
<outlet property="wordWall" destination="JTj-nh-BWs" id="Mdy-OW-ouS"/>
|
<outlet property="wordWall" destination="JTj-nh-BWs" id="Mdy-OW-ouS"/>
|
||||||
<segue destination="PQa-Xl-A3x" kind="push" identifier="MP_Unlock" id="wiY-Sg-Ba4"/>
|
<segue destination="PQa-Xl-A3x" kind="push" identifier="MP_Unlock" id="wiY-Sg-Ba4"/>
|
||||||
</connections>
|
</connections>
|
||||||
</viewController>
|
</viewController>
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="OGA-5j-IcQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
<placeholder placeholderIdentifier="IBFirstResponder" id="OGA-5j-IcQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||||
|
<view hidden="YES" alpha="0.30000000000000016" contentMode="scaleToFill" id="KNa-Xb-RuE" userLabel="View - Emergency Generator">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="520" height="568"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
<subviews>
|
||||||
|
<view contentMode="scaleToFill" id="vdf-Kn-Sle">
|
||||||
|
<rect key="frame" x="100" y="20" width="320" height="434"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
<subviews>
|
||||||
|
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="ui_panel_display.png" id="jLf-TI-anP">
|
||||||
|
<rect key="frame" x="11" y="0.0" width="298" height="434"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
<rect key="contentStretch" x="0.050000000000000003" y="0.10000000000000001" width="0.89999999999999991" height="0.79999999999999982"/>
|
||||||
|
</imageView>
|
||||||
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Emergency Generator" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="shF-6G-WyQ">
|
||||||
|
<rect key="frame" x="30" y="20" width="260" height="21"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="GillSans-Bold" family="Gill Sans" pointSize="17"/>
|
||||||
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||||
|
<size key="shadowOffset" width="0.0" height="1"/>
|
||||||
|
</label>
|
||||||
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Generate your password without logging in. Great for if you're borrowing a friend's device or are having trouble logging in." lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="cgB-L6-VbR">
|
||||||
|
<rect key="frame" x="30" y="49" width="260" height="52"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="GillSans-LightItalic" family="Gill Sans" pointSize="14"/>
|
||||||
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||||
|
<size key="shadowOffset" width="0.0" height="1"/>
|
||||||
|
</label>
|
||||||
|
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Name" minimumFontSize="17" id="esC-1q-bE7">
|
||||||
|
<rect key="frame" x="41" y="109" width="240" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocapitalizationType="words" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
|
||||||
|
<connections>
|
||||||
|
<outlet property="delegate" destination="Nbn-Rv-sP1" id="yRn-2W-KeI"/>
|
||||||
|
</connections>
|
||||||
|
</textField>
|
||||||
|
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Your Master Password" minimumFontSize="17" id="Yvd-Hm-fuw">
|
||||||
|
<rect key="frame" x="41" y="147" width="240" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardAppearance="alert" returnKeyType="next" enablesReturnKeyAutomatically="YES" secureTextEntry="YES"/>
|
||||||
|
<connections>
|
||||||
|
<outlet property="delegate" destination="Nbn-Rv-sP1" id="tqK-8C-p2c"/>
|
||||||
|
</connections>
|
||||||
|
</textField>
|
||||||
|
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Site Name" minimumFontSize="17" id="YeH-3J-oY4">
|
||||||
|
<rect key="frame" x="41" y="185" width="240" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="URL" keyboardAppearance="alert" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
|
||||||
|
<connections>
|
||||||
|
<outlet property="delegate" destination="Nbn-Rv-sP1" id="w1h-rQ-fIF"/>
|
||||||
|
</connections>
|
||||||
|
</textField>
|
||||||
|
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="1" id="LfH-XT-9Vt">
|
||||||
|
<rect key="frame" x="41" y="223" width="240" height="29"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<segments>
|
||||||
|
<segment title="Max"/>
|
||||||
|
<segment title="Long"/>
|
||||||
|
<segment title="Med"/>
|
||||||
|
<segment title="Basic"/>
|
||||||
|
<segment title="Short"/>
|
||||||
|
<segment title="PIN"/>
|
||||||
|
</segments>
|
||||||
|
<color key="tintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
|
</segmentedControl>
|
||||||
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Counter" lineBreakMode="tailTruncation" numberOfLines="0" minimumFontSize="10" id="pa9-d6-vQt">
|
||||||
|
<rect key="frame" x="41" y="262" width="285" height="23"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
|
||||||
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
<color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/>
|
||||||
|
<size key="shadowOffset" width="0.0" height="1"/>
|
||||||
|
</label>
|
||||||
|
<stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" id="D49-fo-7FA">
|
||||||
|
<rect key="frame" x="187" y="260" width="94" height="29"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
||||||
|
</stepper>
|
||||||
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="1" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" id="TJC-xD-fjQ">
|
||||||
|
<rect key="frame" x="79" y="263" width="100" height="21"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||||
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</label>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="TmC-YR-JKg">
|
||||||
|
<rect key="frame" x="265" y="0.0" width="44" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
||||||
|
<accessibility key="accessibilityConfiguration" hint="" label="Close"/>
|
||||||
|
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
||||||
|
<state key="normal" image="icon_cancel.png">
|
||||||
|
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
|
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<state key="highlighted">
|
||||||
|
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<connections>
|
||||||
|
<action selector="emergencyClose:" destination="Nbn-Rv-sP1" eventType="touchUpInside" id="U2r-pg-UGB"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Rxb-jY-TFS">
|
||||||
|
<rect key="frame" x="15" y="1" width="44" height="44"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<accessibility key="accessibilityConfiguration" hint="" label="Close"/>
|
||||||
|
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
|
||||||
|
<state key="normal" image="icon_gears.png">
|
||||||
|
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
|
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<state key="highlighted">
|
||||||
|
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<connections>
|
||||||
|
<segue destination="Vrp-Gl-7qn" kind="push" identifier="MP_Settings" id="hxY-aA-ngI"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" hidesWhenStopped="YES" style="whiteLarge" id="3Ax-91-gVM">
|
||||||
|
<rect key="frame" x="141" y="388" width="37" height="37"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
</activityIndicatorView>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="r9J-C9-Bt1">
|
||||||
|
<rect key="frame" x="20" y="380" width="280" height="54"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" name="AmericanTypewriter-Bold" family="American Typewriter" pointSize="30"/>
|
||||||
|
<size key="titleShadowOffset" width="0.0" height="1"/>
|
||||||
|
<state key="normal" title="Kucy9-RimuTich">
|
||||||
|
<color key="titleColor" red="0.47450980390000003" green="0.86666666670000003" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
|
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<state key="highlighted">
|
||||||
|
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
|
</state>
|
||||||
|
<connections>
|
||||||
|
<action selector="emergencyCopy:" destination="Nbn-Rv-sP1" eventType="touchUpInside" id="p7g-5T-dqz"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<view hidden="YES" userInteractionEnabled="NO" alpha="0.0" contentMode="scaleToFill" id="sD9-hR-UAI" userLabel="View - Content Tip">
|
||||||
|
<rect key="frame" x="55" y="354" width="210" height="60"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
|
<subviews>
|
||||||
|
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="tip_basic_black.png" id="Lua-xm-WX6">
|
||||||
|
<rect key="frame" x="0.0" y="0.0" width="210" height="60"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Copied!" textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="fXa-HL-2OW">
|
||||||
|
<rect key="frame" x="19" y="9" width="171" height="21"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
</label>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
|
</view>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
|
</view>
|
||||||
|
</subviews>
|
||||||
|
<color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
|
||||||
|
</view>
|
||||||
<pongPressGestureRecognizer allowableMovement="10" minimumPressDuration="0.5" id="9WS-yS-aqQ">
|
<pongPressGestureRecognizer allowableMovement="10" minimumPressDuration="0.5" id="9WS-yS-aqQ">
|
||||||
<connections>
|
<connections>
|
||||||
<action selector="targetedUserAction:" destination="Nbn-Rv-sP1" id="mgC-0X-heO"/>
|
<action selector="targetedUserAction:" destination="Nbn-Rv-sP1" id="mgC-0X-heO"/>
|
||||||
@ -1831,7 +1852,7 @@ You can use the words in the background for inspiration in finding a memorable m
|
|||||||
<viewController id="Q4b-t4-pwH" customClass="MPSetupViewController" sceneMemberID="viewController">
|
<viewController id="Q4b-t4-pwH" customClass="MPSetupViewController" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="FnB-rI-puV">
|
<view key="view" contentMode="scaleToFill" id="FnB-rI-puV">
|
||||||
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="RjU-5e-mti">
|
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="RjU-5e-mti">
|
||||||
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
||||||
@ -1849,20 +1870,21 @@ You can use the words in the background for inspiration in finding a memorable m
|
|||||||
<nil key="highlightedColor"/>
|
<nil key="highlightedColor"/>
|
||||||
</label>
|
</label>
|
||||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="ToN-ll-G0q">
|
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="ToN-ll-G0q">
|
||||||
<rect key="frame" x="20" y="137" width="280" height="200"/>
|
<rect key="frame" x="20" y="137" width="280" height="288"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
<string key="text">Enabling iCloud will keep all your iPhones, iPads and Macs nicely in-sync. Any site you add on this device will automatically appear on all your others as well.
|
<mutableString key="text">Enabling iCloud will keep all your iPhones, iPads and Macs nicely in-sync. Any site you add on this device will automatically appear on all your others as well.
|
||||||
|
|
||||||
Thanks to the special way Master Password works, your site passwords don't need to be sent to Apple.
|
Note that even without iCloud syncing, you can make your passwords available from any device by simply creating the same user on all your devices. Enabling iCloud is mainly benefitial to keep the list of sites you use in sync on all your devices.
|
||||||
If you set a custom password, it will be encrypted before it is saved to the cloud.</string>
|
|
||||||
|
Only site names and custom passwords are sent to iCloud. Passwords are encrypted with your master password and illegible by Apple or any interceptor.</mutableString>
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||||
</textView>
|
</textView>
|
||||||
<switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="M0m-G9-hH0">
|
<switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="M0m-G9-hH0">
|
||||||
<rect key="frame" x="136" y="345" width="51" height="31"/>
|
<rect key="frame" x="136" y="433" width="51" height="31"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
<color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
<color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
</switch>
|
</switch>
|
||||||
</subviews>
|
</subviews>
|
||||||
@ -2428,7 +2450,7 @@ If you set a custom password, it will be encrypted before it is saved to the clo
|
|||||||
<viewController id="ZgN-2j-05b" customClass="MPSetupViewController" sceneMemberID="viewController">
|
<viewController id="ZgN-2j-05b" customClass="MPSetupViewController" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="QIH-dS-sqD">
|
<view key="view" contentMode="scaleToFill" id="QIH-dS-sqD">
|
||||||
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="FTf-06-1Pg">
|
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="FTf-06-1Pg">
|
||||||
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
||||||
@ -2701,7 +2723,7 @@ You can make passwords for anything, like email addresses, sites or real-world t
|
|||||||
<items/>
|
<items/>
|
||||||
<color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
|
<color key="barTintColor" red="0.12549020350000001" green="0.1411764771" blue="0.14901961389999999" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
</toolbar>
|
</toolbar>
|
||||||
<searchBar contentMode="redraw" searchBarStyle="minimal" placeholder="Site name" showsBookmarkButton="YES" id="IJX-hq-SkG">
|
<searchBar contentMode="redraw" barStyle="black" searchBarStyle="minimal" placeholder="Site name" showsBookmarkButton="YES" id="IJX-hq-SkG">
|
||||||
<rect key="frame" x="0.0" y="44" width="320" height="44"/>
|
<rect key="frame" x="0.0" y="44" width="320" height="44"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||||
<gestureRecognizers/>
|
<gestureRecognizers/>
|
||||||
@ -2883,7 +2905,7 @@ You can make passwords for anything, like email addresses, sites or real-world t
|
|||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
<string key="text"> • Use the short site name (eg. apple.com), don't include the prefix (eg. www).
|
<string key="text"> • Use the short site name (eg. apple.com), don't include the prefix (eg. www).
|
||||||
• Use generated passwords. If you ever lose your user or phone, recreating the user will resurrect them from thin air.</string>
|
• Use generated passwords, avoid custom passwords. If you ever lose your user or phone, recreating the user will resurrect them from thin air.</string>
|
||||||
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||||
@ -2910,6 +2932,7 @@ You can make passwords for anything, like email addresses, sites or real-world t
|
|||||||
<outlet property="contentTipText" destination="nGi-CK-Dng" id="T7O-aC-li6"/>
|
<outlet property="contentTipText" destination="nGi-CK-Dng" id="T7O-aC-li6"/>
|
||||||
<outlet property="largePlayButton" destination="jDS-Vh-ETL" id="LIU-jq-0Oo"/>
|
<outlet property="largePlayButton" destination="jDS-Vh-ETL" id="LIU-jq-0Oo"/>
|
||||||
<outlet property="progress" destination="nf7-oM-7dh" id="dFy-br-0OQ"/>
|
<outlet property="progress" destination="nf7-oM-7dh" id="dFy-br-0OQ"/>
|
||||||
|
<outlet property="searchBar" destination="IJX-hq-SkG" id="KuO-av-R2u"/>
|
||||||
<outlet property="siteNameTip" destination="cUZ-lb-h7x" id="3cq-3F-Cwd"/>
|
<outlet property="siteNameTip" destination="cUZ-lb-h7x" id="3cq-3F-Cwd"/>
|
||||||
<outlet property="smallPlayButton" destination="UHf-cp-97W" id="K6U-Nf-F2p"/>
|
<outlet property="smallPlayButton" destination="UHf-cp-97W" id="K6U-Nf-F2p"/>
|
||||||
<outlet property="toolButton" destination="yxo-kW-iLM" id="yuh-5h-1Nj"/>
|
<outlet property="toolButton" destination="yxo-kW-iLM" id="yuh-5h-1Nj"/>
|
||||||
@ -2937,7 +2960,7 @@ You can make passwords for anything, like email addresses, sites or real-world t
|
|||||||
<viewController id="kSj-yX-DmT" customClass="MPSetupViewController" sceneMemberID="viewController">
|
<viewController id="kSj-yX-DmT" customClass="MPSetupViewController" sceneMemberID="viewController">
|
||||||
<view key="view" contentMode="scaleToFill" id="sT4-Jb-e5D">
|
<view key="view" contentMode="scaleToFill" id="sT4-Jb-e5D">
|
||||||
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
<rect key="frame" x="0.0" y="64" width="320" height="504"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="Eqt-R0-LTj">
|
<imageView userInteractionEnabled="NO" contentMode="center" image="background.png" id="Eqt-R0-LTj">
|
||||||
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
<rect key="frame" x="0.0" y="-64" width="320" height="656"/>
|
||||||
@ -2955,8 +2978,8 @@ You can make passwords for anything, like email addresses, sites or real-world t
|
|||||||
<nil key="highlightedColor"/>
|
<nil key="highlightedColor"/>
|
||||||
</label>
|
</label>
|
||||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="k4g-1Z-Hfw">
|
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="k4g-1Z-Hfw">
|
||||||
<rect key="frame" x="20" y="137" width="280" height="196"/>
|
<rect key="frame" x="20" y="137" width="280" height="284"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||||
<string key="text">The right balance between security and convenience is often very personal.
|
<string key="text">The right balance between security and convenience is often very personal.
|
||||||
|
|
||||||
@ -2968,8 +2991,8 @@ However, it means that anyone who finds your device unlocked can do the same.</s
|
|||||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||||
</textView>
|
</textView>
|
||||||
<switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="xmc-hs-riu">
|
<switch opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" id="xmc-hs-riu">
|
||||||
<rect key="frame" x="136" y="341" width="51" height="31"/>
|
<rect key="frame" x="136" y="429" width="51" height="31"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
<color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
<color key="onTintColor" red="0.37254901959999998" green="0.3921568627" blue="0.42745098040000001" alpha="1" colorSpace="calibratedRGB"/>
|
||||||
</switch>
|
</switch>
|
||||||
</subviews>
|
</subviews>
|
||||||
@ -3038,9 +3061,9 @@ However, it means that anyone who finds your device unlocked can do the same.</s
|
|||||||
<simulatedScreenMetrics key="destination" type="retina4"/>
|
<simulatedScreenMetrics key="destination" type="retina4"/>
|
||||||
</simulatedMetricsContainer>
|
</simulatedMetricsContainer>
|
||||||
<inferredMetricsTieBreakers>
|
<inferredMetricsTieBreakers>
|
||||||
<segue reference="swi-5o-hfK"/>
|
<segue reference="jgo-j3-gbW"/>
|
||||||
<segue reference="hxY-aA-ngI"/>
|
<segue reference="hxY-aA-ngI"/>
|
||||||
<segue reference="5Im-dm-qfS"/>
|
|
||||||
<segue reference="9Bs-cD-ddF"/>
|
<segue reference="9Bs-cD-ddF"/>
|
||||||
|
<segue reference="5Im-dm-qfS"/>
|
||||||
</inferredMetricsTieBreakers>
|
</inferredMetricsTieBreakers>
|
||||||
</document>
|
</document>
|
Loading…
Reference in New Issue
Block a user