skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fade unlock VC + search bar responder fix.

Browse Source 
[ADDED]     Fade effect to unlock view.
[UPDATED]   Signing profiles.
[FIXED]     A rare bug that caused the search bar to remain first responder without making it take input or dismissable (hopefully fixed, at least).
This commit is contained in:
Maarten Billemont 2012-08-28 00:13:46 +02:00
parent af744235bc
commit 7813ddee38
5 changed files with 538 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MasterPassword-iOS.xcodeproj/project.pbxproj
View File

@ -5087,7 +5087,7 @@
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = 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[sdk=iphoneos*]" = "iPhone Developer: Maarten Billemont (DWGU95U4ZD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99; GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
@ -5128,7 +5128,7 @@
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "FCADE039-9917-4715-9172-ABBAC9806763"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5188,7 +5188,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.0; IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1CC091A5-5890-4382-A72F-1397B66FE136"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1C557CB8-083F-4EFE-A88E-41171ADF7611";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -5340,7 +5340,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 5.0; IPHONEOS_DEPLOYMENT_TARGET = 5.0;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "${TARGET_NAME}"; PRODUCT_NAME = "${TARGET_NAME}";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "7BF77F10-5D46-4762-B27F-55A39E089052"; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1C557CB8-083F-4EFE-A88E-41171ADF7611";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";

3
MasterPassword/iOS/MPMainViewController.m
View File

@ -143,6 +143,9 @@
- (void)viewDidAppear:(BOOL)animated { - (void)viewDidAppear:(BOOL)animated {
inf(@"Main will appear"); inf(@"Main will appear");
// Sometimes, the search bar gets stuck in some sort of first-responder mode that it can't get out of...
[self.searchDisplayController.searchBar resignFirstResponder];
// Needed for when we appear after a modal VC dismisses: // Needed for when we appear after a modal VC dismisses:
// We can't present until the other modal VC has been fully dismissed and presenting in viewDidAppear will fail. // We can't present until the other modal VC has been fully dismissed and presenting in viewDidAppear will fail.

1
MasterPassword/iOS/MPUnlockViewController.h
View File

@ -25,6 +25,7 @@
@property (weak, nonatomic) IBOutlet UIView *wordWall; @property (weak, nonatomic) IBOutlet UIView *wordWall;
@property (strong, nonatomic) IBOutlet UILongPressGestureRecognizer *targetedUserActionGesture; @property (strong, nonatomic) IBOutlet UILongPressGestureRecognizer *targetedUserActionGesture;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loadingUsersIndicator; @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loadingUsersIndicator;
@property (weak, nonatomic) IBOutlet UIView *uiContainer;
@property (nonatomic, strong) UIColor *avatarShadowColor; @property (nonatomic, strong) UIColor *avatarShadowColor;

8
MasterPassword/iOS/MPUnlockViewController.m
View File

@ -45,6 +45,7 @@
@synthesize wordWall; @synthesize wordWall;
@synthesize targetedUserActionGesture; @synthesize targetedUserActionGesture;
@synthesize loadingUsersIndicator; @synthesize loadingUsersIndicator;
@synthesize uiContainer;
@synthesize avatarShadowColor = _avatarShadowColor; @synthesize avatarShadowColor = _avatarShadowColor;
@synthesize wordWallAnimating = _wordWallAnimating; @synthesize wordWallAnimating = _wordWallAnimating;
@synthesize wordList = _wordList; @synthesize wordList = _wordList;
@ -184,6 +185,7 @@
[self setCreatePasswordTipView:nil]; [self setCreatePasswordTipView:nil];
[self setPasswordFieldLabel:nil]; [self setPasswordFieldLabel:nil];
[self setLoadingUsersIndicator:nil]; [self setLoadingUsersIndicator:nil];
[self setUiContainer:nil];
[super viewDidUnload]; [super viewDidUnload];
} }
@ -195,6 +197,8 @@
self.selectedUser = nil; self.selectedUser = nil;
[self updateUsers]; [self updateUsers];
self.uiContainer.alpha = 0;
[super viewWillAppear:animated]; [super viewWillAppear:animated];
} }
@ -205,6 +209,10 @@
else else
[self updateLayoutAnimated:YES allowScroll:YES completion:nil]; [self updateLayoutAnimated:YES allowScroll:YES completion:nil];
[UIView animateWithDuration:0.3 animations:^{
self.uiContainer.alpha = 1;
}];
[super viewDidAppear:animated]; [super viewDidAppear:animated];
} }

1035
MasterPassword/iOS/MainStoryboard_iPhone.storyboard
View File

File diff suppressed because it is too large Load Diff