From 00827cff486b0e69c9ccd48584d8039a4159516d Mon Sep 17 00:00:00 2001 From: hase Date: Thu, 13 Jun 2019 17:04:37 +0900 Subject: [PATCH] Fix requireDisplayname handling --- .../FUIPasswordSignUpViewController.m | 49 ++++++++++--------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m index 3d58e653d08..7ab114ad6b8 100755 --- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m +++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m @@ -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; @@ -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)