Skip to content

Fix requireDisplayname handling #705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 13, 2019
Merged

Fix requireDisplayname handling #705

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,17 +283,32 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
_emailField.textContentType = UITextContentTypeUsername;
}
} else if (indexPath.row == 1) {
cell.label.text = FUILocalizedString(kStr_Name);
cell.accessibilityIdentifier = kNameSignUpCellAccessibilityID;
_nameField = cell.textField;
_nameField.placeholder = FUILocalizedString(kStr_FirstAndLastName);
_nameField.secureTextEntry = NO;
_nameField.returnKeyType = UIReturnKeyNext;
_nameField.keyboardType = UIKeyboardTypeDefault;
_nameField.autocapitalizationType = UITextAutocapitalizationTypeWords;
if (@available(iOS 10.0, *)) {
_nameField.textContentType = UITextContentTypeName;
}
if (_requireDisplayName) {
cell.label.text = FUILocalizedString(kStr_Name);
cell.accessibilityIdentifier = kNameSignUpCellAccessibilityID;
_nameField = cell.textField;
_nameField.placeholder = FUILocalizedString(kStr_FirstAndLastName);
_nameField.secureTextEntry = NO;
_nameField.returnKeyType = UIReturnKeyNext;
_nameField.keyboardType = UIKeyboardTypeDefault;
_nameField.autocapitalizationType = UITextAutocapitalizationTypeWords;
if (@available(iOS 10.0, *)) {
_nameField.textContentType = UITextContentTypeName;
}
} else {
cell.label.text = FUILocalizedString(kStr_Password);
cell.accessibilityIdentifier = kPasswordSignUpCellAccessibilityID;
_passwordField = cell.textField;
_passwordField.placeholder = FUILocalizedString(kStr_ChoosePassword);
_passwordField.secureTextEntry = YES;
_passwordField.rightView = [self visibilityToggleButtonForPasswordField];
_passwordField.rightViewMode = UITextFieldViewModeAlways;
_passwordField.returnKeyType = UIReturnKeyNext;
_passwordField.keyboardType = UIKeyboardTypeDefault;
if (@available(iOS 11.0, *)) {
_passwordField.textContentType = UITextContentTypePassword;
}
}
} else if (indexPath.row == 2) {
cell.label.text = FUILocalizedString(kStr_Password);
cell.accessibilityIdentifier = kPasswordSignUpCellAccessibilityID;
Expand All @@ -307,18 +322,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
if (@available(iOS 11.0, *)) {
_passwordField.textContentType = UITextContentTypePassword;
}
} else if (indexPath.row == 2) {
cell.label.text = FUILocalizedString(kStr_Name);
cell.accessibilityIdentifier = kNameSignUpCellAccessibilityID;
_nameField = cell.textField;
_nameField.placeholder = FUILocalizedString(kStr_FirstAndLastName);
_nameField.secureTextEntry = NO;
_nameField.returnKeyType = UIReturnKeyNext;
_nameField.keyboardType = UIKeyboardTypeDefault;
_nameField.autocapitalizationType = UITextAutocapitalizationTypeWords;
if (@available(iOS 10.0, *)) {
_nameField.textContentType = UITextContentTypeName;
}
}
[cell.textField addTarget:self
action:@selector(textFieldDidChange)
Expand Down