skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Fix sizing issues with avatars on different size devices.

Browse Source 
[FIXED]     Avatar cells badly sized on some size devices.
This commit is contained in:
Maarten Billemont 2014-09-11 20:31:23 -04:00
parent 6e14554f95
commit 72b1d36626
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MasterPassword/ObjC/iOS/MPCombinedViewController.m
View File

@ -38,7 +38,7 @@
[super viewDidLoad]; [super viewDidLoad];
[self setMode:MPCombinedModeUserSelection animated:NO]; _mode = MPCombinedModeUserSelection;
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {

26
MasterPassword/ObjC/iOS/MPUsersViewController.m
View File

@ -74,8 +74,6 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
self.view.backgroundColor = [UIColor clearColor]; self.view.backgroundColor = [UIColor clearColor];
self.avatarCollectionView.allowsMultipleSelection = YES; self.avatarCollectionView.allowsMultipleSelection = YES;
[self.entryField addTarget:self action:@selector( textFieldEditingChanged: ) forControlEvents:UIControlEventEditingChanged]; [self.entryField addTarget:self action:@selector( textFieldEditingChanged: ) forControlEvents:UIControlEventEditingChanged];
[self setActive:YES animated:NO];
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
@ -83,15 +81,7 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
self.userSelectionContainer.alpha = 0; self.userSelectionContainer.alpha = 0;
[self setActive:YES animated:NO];
[self observeStore];
[self registerObservers];
[self reloadUsers];
[self.marqueeTipTimer invalidate];
self.marqueeTipTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector( firedMarqueeTimer: )
userInfo:nil repeats:YES];
[self firedMarqueeTimer:nil];
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {
@ -104,6 +94,20 @@ typedef NS_ENUM( NSUInteger, MPActiveUserState ) {
[self.marqueeTipTimer invalidate]; [self.marqueeTipTimer invalidate];
} }
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
[self observeStore];
[self registerObservers];
[self reloadUsers];
[self.marqueeTipTimer invalidate];
self.marqueeTipTimer = [NSTimer scheduledTimerWithTimeInterval:5 target:self selector:@selector( firedMarqueeTimer: )
userInfo:nil repeats:YES];
[self firedMarqueeTimer:nil];
}
- (void)viewDidLayoutSubviews { - (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews]; [super viewDidLayoutSubviews];