skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fixed popup appearance.

Browse Source 
[FIXED]     Appearance of popup when copying emergency password.
This commit is contained in:
Maarten Billemont 2013-04-20 12:14:44 -04:00
parent eeac1d0dd3
commit efcfbe2584
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MasterPassword/ObjC/iOS/MPUnlockViewController.h
View File

@ -35,7 +35,7 @@
@property (weak, nonatomic) IBOutlet UILabel *emergencyCounter; @property (weak, nonatomic) IBOutlet UILabel *emergencyCounter;
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *emergencyActivity; @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *emergencyActivity;
@property (weak, nonatomic) IBOutlet UIButton *emergencyPassword; @property (weak, nonatomic) IBOutlet UIButton *emergencyPassword;
@property (weak, nonatomic) IBOutlet UIView *contentTipContainer; @property (weak, nonatomic) IBOutlet UIView *emergencyContentTipContainer;
@property (nonatomic, strong) UIColor *avatarShadowColor; @property (nonatomic, strong) UIColor *avatarShadowColor;

6
MasterPassword/ObjC/iOS/MPUnlockViewController.m
View File

@ -141,6 +141,8 @@
[self.emergencyTypeControl addTargetBlock:^(id sender, UIControlEvents event) { [self.emergencyTypeControl addTargetBlock:^(id sender, UIControlEvents event) {
[self updateEmergencyPassword]; [self updateEmergencyPassword];
} forControlEvents:UIControlEventValueChanged]; } forControlEvents:UIControlEventValueChanged];
self.emergencyContentTipContainer.alpha = 0;
self.emergencyContentTipContainer.hidden = NO;
self.marqueeTipTexts = @[ @"Tap and hold to delete or reset user.", self.marqueeTipTexts = @[ @"Tap and hold to delete or reset user.",
@"Shake for emergency generator." ]; @"Shake for emergency generator." ];
@ -883,13 +885,13 @@
[UIPasteboard generalPasteboard].string = [self.emergencyPassword titleForState:UIControlStateNormal]; [UIPasteboard generalPasteboard].string = [self.emergencyPassword titleForState:UIControlStateNormal];
[UIView animateWithDuration:0.3f animations:^{ [UIView animateWithDuration:0.3f animations:^{
self.contentTipContainer.alpha = 1; self.emergencyContentTipContainer.alpha = 1;
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
if (finished) { if (finished) {
dispatch_time_t popTime = dispatch_time( DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC ); dispatch_time_t popTime = dispatch_time( DISPATCH_TIME_NOW, 5 * NSEC_PER_SEC );
dispatch_after( popTime, dispatch_get_main_queue(), ^(void) { dispatch_after( popTime, dispatch_get_main_queue(), ^(void) {
[UIView animateWithDuration:0.2f animations:^{ [UIView animateWithDuration:0.2f animations:^{
self.contentTipContainer.alpha = 0; self.emergencyContentTipContainer.alpha = 0;
}]; }];
} ); } );
} }

2
MasterPassword/ObjC/iOS/MainStoryboard_iPhone.storyboard
View File

@ -1617,9 +1617,9 @@ You could use the word wall for inspiration in finding a memorable master passw
<connections> <connections>
<outlet property="avatarTemplate" destination="Ten-ig-gog" id="0ZZ-z5-d5m"/> <outlet property="avatarTemplate" destination="Ten-ig-gog" id="0ZZ-z5-d5m"/>
<outlet property="avatarsView" destination="Blg-F1-9NA" id="2NL-jU-IMI"/> <outlet property="avatarsView" destination="Blg-F1-9NA" id="2NL-jU-IMI"/>
<outlet property="contentTipContainer" destination="sD9-hR-UAI" id="RiP-k1-7dk"/>
<outlet property="createPasswordTipView" destination="xWL-xQ-KjX" id="Pa1-Bk-pW2"/> <outlet property="createPasswordTipView" destination="xWL-xQ-KjX" id="Pa1-Bk-pW2"/>
<outlet property="emergencyActivity" destination="3Ax-91-gVM" id="UfN-vk-k0Z"/> <outlet property="emergencyActivity" destination="3Ax-91-gVM" id="UfN-vk-k0Z"/>
<outlet property="emergencyContentTipContainer" destination="sD9-hR-UAI" id="RiP-k1-7dk"/>
<outlet property="emergencyCounter" destination="TJC-xD-fjQ" id="jrf-nb-soB"/> <outlet property="emergencyCounter" destination="TJC-xD-fjQ" id="jrf-nb-soB"/>
<outlet property="emergencyCounterStepper" destination="D49-fo-7FA" id="hj2-CL-zxq"/> <outlet property="emergencyCounterStepper" destination="D49-fo-7FA" id="hj2-CL-zxq"/>
<outlet property="emergencyGeneratorContainer" destination="KNa-Xb-RuE" id="6jt-vU-L2Q"/> <outlet property="emergencyGeneratorContainer" destination="KNa-Xb-RuE" id="6jt-vU-L2Q"/>