felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-04 06:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix second half of SYIOS-38 - bad UX when updating avator & display name in settings

Browse Source 
-> request to the user to save pending profile updates before switching to an other tab
This commit is contained in:
ylecollen
2015-01-05 16:53:41 +01:00
parent ae315e62cc
commit d3ef0de60d
3 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrixConsole/ViewController/SettingsViewController.m
+56 -2
View File
@@ -62,6 +62,10 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
// user info update
BOOL isAvatarUpdated;
BOOL isDisplayNameUpdated;
// do not hide the spinner while switching between viewcontroller
BOOL isAvatarUploading;
BOOL isDisplayNameUploading;
}
@property (strong, nonatomic) IBOutlet UITableView *tableView;
@property (weak, nonatomic) IBOutlet UIView *tableHeader;
@@ -71,6 +75,8 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
@property (strong, nonatomic) IBOutlet UIView *activityIndicatorBackgroundView;
@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
@property (strong, nonatomic) CustomAlert* customAlert;
- (IBAction)onButtonPressed:(id)sender;
@end
@@ -99,6 +105,10 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
isAvatarUpdated = NO;
isDisplayNameUpdated = NO;
isAvatarUploading = NO;
isDisplayNameUploading = NO;
_saveUserInfoButton.enabled = NO;
_activityIndicatorBackgroundView.hidden = YES;
}
@@ -140,10 +150,38 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[[MatrixHandler sharedHandler] removeObserver:self forKeyPath:@"isResumeDone"];
[[NSNotificationCenter defaultCenter] removeObserver:self name:kAPNSHandlerHasBeenUpdated object:nil];
}
- (BOOL)checkPendingSave:(blockSettings_onCheckSave)handler {
// there is a profile update and there is no pending update
if ((isAvatarUpdated || isDisplayNameUpdated) && (!isDisplayNameUploading) && (!isAvatarUploading)) {
dispatch_async(dispatch_get_main_queue(), ^{
__weak typeof(self) weakSelf = self;
self.customAlert = [[CustomAlert alloc] initWithTitle:nil message:@"Save profile update" style:CustomAlertStyleAlert];
self.customAlert.cancelButtonIndex = [self.customAlert addActionWithTitle:@"Cancel" style:CustomAlertActionStyleDefault handler:^(CustomAlert *alert) {
handler();
weakSelf.customAlert = nil;
}];
[self.customAlert addActionWithTitle:@"OK" style:CustomAlertActionStyleDefault handler:^(CustomAlert *alert) {
[weakSelf saveDisplayName];
weakSelf.customAlert = nil;
handler();
}];
[self.customAlert showInViewController:self];
});
return YES;
}
return NO;
}
#pragma mark - Internal methods
- (void)onAPNSHandlerHasBeenUpdated {
@@ -202,6 +240,11 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
}
- (void)configureView {
// ignore any refresh until there is a pending upload
if (isDisplayNameUploading || isAvatarUploading) {
return;
}
MatrixHandler *mxHandler = [MatrixHandler sharedHandler];
// Disable user's interactions
@@ -258,7 +301,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
// Save display name
[self startUserInfoUploadAnimation];
_userDisplayName.enabled = NO;
_saveUserInfoButton.enabled = NO;
isDisplayNameUploading = YES;
MatrixHandler *mxHandler = [MatrixHandler sharedHandler];
[mxHandler.mxSession.myUser setDisplayName:displayname success:^{
@@ -275,10 +318,12 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
[self stopUserInfoUploadAnimation];
}
_userDisplayName.enabled = YES;
isDisplayNameUploading = NO;
} failure:^(NSError *error) {
NSLog(@"Set displayName failed: %@", error);
[self stopUserInfoUploadAnimation];
_userDisplayName.enabled = YES;
isDisplayNameUploading = NO;
//Alert user
NSString *title = [error.userInfo valueForKey:NSLocalizedFailureReasonErrorKey];
@@ -309,6 +354,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
// Save picture
[self startUserInfoUploadAnimation];
_userPicture.enabled = NO;
isAvatarUploading = YES;
if (uploadedPictureURL == nil) {
// Upload picture
@@ -323,6 +369,7 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
NSLog(@"Upload image failed: %@", error);
[self stopUserInfoUploadAnimation];
_userPicture.enabled = YES;
isAvatarUploading = NO;
[self handleErrorDuringPictureSaving:error];
}];
} else {
@@ -341,13 +388,20 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
} else {
_saveUserInfoButton.enabled = NO;
[self stopUserInfoUploadAnimation];
_userPicture.enabled = YES;
}
// update statuses
_userPicture.enabled = YES;
isAvatarUploading = NO;
} failure:^(NSError *error) {
NSLog(@"Set avatar url failed: %@", error);
[self stopUserInfoUploadAnimation];
_userPicture.enabled = YES;
isAvatarUploading = NO;
// update statuses
[self handleErrorDuringPictureSaving:error];
}];
}