From 7813ddee38e1a1bcb97a1d9d123ca24153688d99 Mon Sep 17 00:00:00 2001 From: Maarten Billemont Date: Tue, 28 Aug 2012 00:13:46 +0200 Subject: [PATCH] Fade unlock VC + search bar responder fix. [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). --- MasterPassword-iOS.xcodeproj/project.pbxproj | 8 +- MasterPassword/iOS/MPMainViewController.m | 3 + MasterPassword/iOS/MPUnlockViewController.h | 1 + MasterPassword/iOS/MPUnlockViewController.m | 8 + .../iOS/MainStoryboard_iPhone.storyboard | 1035 +++++++++-------- 5 files changed, 538 insertions(+), 517 deletions(-) diff --git a/MasterPassword-iOS.xcodeproj/project.pbxproj b/MasterPassword-iOS.xcodeproj/project.pbxproj index 08580d87..2496f1ba 100644 --- a/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -5087,7 +5087,7 @@ CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = 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; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; @@ -5128,7 +5128,7 @@ ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "${TARGET_NAME}"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "FCADE039-9917-4715-9172-ABBAC9806763"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5188,7 +5188,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "${TARGET_NAME}"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1CC091A5-5890-4382-A72F-1397B66FE136"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1C557CB8-083F-4EFE-A88E-41171ADF7611"; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5340,7 +5340,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 5.0; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "${TARGET_NAME}"; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "7BF77F10-5D46-4762-B27F-55A39E089052"; + "PROVISIONING_PROFILE[sdk=iphoneos*]" = "1C557CB8-083F-4EFE-A88E-41171ADF7611"; SDKROOT = iphoneos; SKIP_INSTALL = YES; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/MasterPassword/iOS/MPMainViewController.m b/MasterPassword/iOS/MPMainViewController.m index a4d7acc2..ba13e699 100644 --- a/MasterPassword/iOS/MPMainViewController.m +++ b/MasterPassword/iOS/MPMainViewController.m @@ -143,6 +143,9 @@ - (void)viewDidAppear:(BOOL)animated { 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: // We can't present until the other modal VC has been fully dismissed and presenting in viewDidAppear will fail. diff --git a/MasterPassword/iOS/MPUnlockViewController.h b/MasterPassword/iOS/MPUnlockViewController.h index 789c0382..6828d19b 100644 --- a/MasterPassword/iOS/MPUnlockViewController.h +++ b/MasterPassword/iOS/MPUnlockViewController.h @@ -25,6 +25,7 @@ @property (weak, nonatomic) IBOutlet UIView *wordWall; @property (strong, nonatomic) IBOutlet UILongPressGestureRecognizer *targetedUserActionGesture; @property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loadingUsersIndicator; +@property (weak, nonatomic) IBOutlet UIView *uiContainer; @property (nonatomic, strong) UIColor *avatarShadowColor; diff --git a/MasterPassword/iOS/MPUnlockViewController.m b/MasterPassword/iOS/MPUnlockViewController.m index cf5d758e..51be9719 100644 --- a/MasterPassword/iOS/MPUnlockViewController.m +++ b/MasterPassword/iOS/MPUnlockViewController.m @@ -45,6 +45,7 @@ @synthesize wordWall; @synthesize targetedUserActionGesture; @synthesize loadingUsersIndicator; +@synthesize uiContainer; @synthesize avatarShadowColor = _avatarShadowColor; @synthesize wordWallAnimating = _wordWallAnimating; @synthesize wordList = _wordList; @@ -184,6 +185,7 @@ [self setCreatePasswordTipView:nil]; [self setPasswordFieldLabel:nil]; [self setLoadingUsersIndicator:nil]; + [self setUiContainer:nil]; [super viewDidUnload]; } @@ -195,6 +197,8 @@ self.selectedUser = nil; [self updateUsers]; + self.uiContainer.alpha = 0; + [super viewWillAppear:animated]; } @@ -205,6 +209,10 @@ else [self updateLayoutAnimated:YES allowScroll:YES completion:nil]; + [UIView animateWithDuration:0.3 animations:^{ + self.uiContainer.alpha = 1; + }]; + [super viewDidAppear:animated]; } diff --git a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard index 1efb1272..6af7a605 100644 --- a/MasterPassword/iOS/MainStoryboard_iPhone.storyboard +++ b/MasterPassword/iOS/MainStoryboard_iPhone.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -14,7 +13,7 @@ - + @@ -28,23 +27,23 @@ - @@ -63,21 +62,21 @@ - \ No newline at end of file