Skip to content

Replace WPAuthenticator UI code in ChangeUsernameViewController.swift #25647

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

Open
crazytonyli wants to merge 5 commits into
base: trunk
Choose a base branch
from
+510 −62
Open

Replace WPAuthenticator UI code in ChangeUsernameViewController.swift #25647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44238b7
Format files touched by the text field replacement
crazytonyli Jun 12, 2026
4d35249
Use a plain UITextField in InlineEditableNameValueCell
crazytonyli Jun 12, 2026
ee5b316
Make ChangeUsernameViewController standalone
crazytonyli Jun 12, 2026
c4ea7af
Derive the username checkmark from the view model selection
crazytonyli Jun 12, 2026
755d905
Correct the search placeholder localization comment
crazytonyli Jun 12, 2026
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
45 changes: 28 additions & 17 deletions WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import UIKit
import WordPressAuthenticator
import WordPressShared
import WordPressUI

@objc protocol InlineEditableNameValueCellDelegate: AnyObject {
@objc optional func inlineEditableNameValueCell(_ cell: InlineEditableNameValueCell,
valueTextFieldDidChange value: String)
@objc optional func inlineEditableNameValueCell(_ cell: InlineEditableNameValueCell,
valueTextFieldEditingDidEnd text: String)
@objc optional func inlineEditableNameValueCell(_ cell: InlineEditableNameValueCell,
valueTextFieldShouldReturn textField: UITextField) -> Bool
@objc optional func inlineEditableNameValueCell(
_ cell: InlineEditableNameValueCell,
valueTextFieldDidChange value: String
)
@objc optional func inlineEditableNameValueCell(
_ cell: InlineEditableNameValueCell,
valueTextFieldEditingDidEnd text: String
)
@objc optional func inlineEditableNameValueCell(
_ cell: InlineEditableNameValueCell,
valueTextFieldShouldReturn textField: UITextField
) -> Bool
}

class InlineEditableNameValueCell: WPTableViewCell, NibReusable {
Expand All @@ -29,7 +34,7 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {

@IBOutlet weak var nameValueWidthRatioConstraint: NSLayoutConstraint!
@IBOutlet weak var nameLabel: UILabel!
@IBOutlet weak var valueTextField: LoginTextField!
@IBOutlet weak var valueTextField: UITextField!
weak var delegate: InlineEditableNameValueCellDelegate?
var valueSanitizer: ValueSanitizerBlock?

Expand All @@ -47,19 +52,25 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {
nameLabel.textColor = Const.Color.nameText
nameLabel.font = WPStyleGuide.tableviewTextFont()
nameLabel.numberOfLines = 0
nameLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(setValueTextFieldAsFirstResponder(_:))))
nameLabel.addGestureRecognizer(
UITapGestureRecognizer(target: self, action: #selector(setValueTextFieldAsFirstResponder(_:)))
)

valueTextField.textColor = Const.Color.valueText
valueTextField.tintColor = .placeholderText
valueTextField.font = WPStyleGuide.tableviewTextFont()
valueTextField.borderStyle = .none
valueTextField.delegate = self
valueTextField.addTarget(self,
action: #selector(textFieldDidChange(textField:)),
for: UIControl.Event.editingChanged)
valueTextField.addTarget(self,
action: #selector(textEditingDidEnd(textField:)),
for: UIControl.Event.editingDidEnd)
valueTextField.addTarget(
self,
action: #selector(textFieldDidChange(textField:)),
for: UIControl.Event.editingChanged
)
valueTextField.addTarget(
self,
action: #selector(textEditingDidEnd(textField:)),
for: UIControl.Event.editingDidEnd
)
if effectiveUserInterfaceLayoutDirection == .leftToRight {
// swiftlint:disable:next inverse_text_alignment
valueTextField.textAlignment = .right
Expand Down Expand Up @@ -91,7 +102,7 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {
}

private func replaceNonBreakingSpaceWithSpace(for textField: UITextField) -> String {
return textField.text?.replacingOccurrences(of: Const.Text.nonBreakingSpace, with: Const.Text.space) ?? ""
textField.text?.replacingOccurrences(of: Const.Text.nonBreakingSpace, with: Const.Text.space) ?? ""
}

@objc func setValueTextFieldAsFirstResponder(_ gesture: UITapGestureRecognizer) {
Expand All @@ -101,7 +112,7 @@ class InlineEditableNameValueCell: WPTableViewCell, NibReusable {

extension InlineEditableNameValueCell: UITextFieldDelegate {
func textFieldShouldReturn(_ textField: UITextField) -> Bool {
return delegate?.inlineEditableNameValueCell?(self, valueTextFieldShouldReturn: textField) ?? true
delegate?.inlineEditableNameValueCell?(self, valueTextFieldShouldReturn: textField) ?? true
}
}

Expand Down
2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Cells/InlineEditableNameValueCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aoI-Bw-gsZ" customClass="LoginTextField" customModule="WordPressAuthenticator">
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aoI-Bw-gsZ">
<rect key="frame" x="74" y="0.0" width="273" height="45.5"/>
<nil key="textColor"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
Expand Down
Loading