Merge branch 'develop' into ux_rework

This commit is contained in:
Giom Foret
2017-04-14 13:43:40 +02:00
2 changed files with 6 additions and 8 deletions
+4 -8
View File
@@ -241,12 +241,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
[self stopActivityIndicator];
// Refresh the corresponding table view cells with animation
[self.tableView reloadRowsAtIndexPaths:@[
[NSIndexPath indexPathForRow:userSettingsProfilePictureIndex inSection:SETTINGS_SECTION_USER_SETTINGS_INDEX],
[NSIndexPath indexPathForRow:userSettingsDisplayNameIndex inSection:SETTINGS_SECTION_USER_SETTINGS_INDEX]
]
withRowAnimation:UITableViewRowAnimationFade];
[self refreshSettings];
}];
@@ -1181,7 +1176,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
cell.accessoryType = UITableViewCellAccessoryNone;
cell.accessoryView = nil;
}
cell.textLabel.accessibilityIdentifier = nil;
cell.textLabel.font = [UIFont systemFontOfSize:17];
cell.textLabel.textColor = kRiotTextColorBlack;
@@ -1250,6 +1245,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
}
profileCell.mxkLabel.text = NSLocalizedStringFromTable(@"settings_profile_picture", @"Vector", nil);
profileCell.accessibilityIdentifier=@"SettingsVCProfilPictureStaticText";
profileCell.mxkLabel.textColor = kRiotTextColorBlack;
// if the user defines a new avatar
@@ -1574,7 +1570,7 @@ typedef void (^blockSettingsViewController_onReadyToDestroy)();
configCell.textLabel.text =[NSString stringWithFormat:configFormat, account.mxCredentials.userId, account.mxCredentials.homeServer, account.identityServerURL];
configCell.textLabel.numberOfLines = 0;
configCell.textLabel.accessibilityIdentifier=@"SettingsVCConfigStaticText";
configCell.selectionStyle = UITableViewCellSelectionStyleNone;
cell = configCell;