Skip to content

Fix Send button design in Comments #25092

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
kean wants to merge 1 commit into
base: trunk
Choose a base branch
from
+13 −18
Open

Fix Send button design in Comments #25092

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
26.6
-----
* [**] Reader: Add "Freshly Pressed" to Discover [#24828]
* [*] Reader: Fix Send button design in Comments [#25092]
* [**] Intelligence: Expand AI-based features to more locales [#25034]
* [*] Fix previewing posts on WordPress.com atomic sites [#25045]


26.5
-----
* [*] Add "Status" field to the "Post Settings" screen to make it easier to move posts from one state to another [#24939]
Expand Down
29 changes: 11 additions & 18 deletions WordPress/Classes/ViewRelated/Comments/Controllers/Create/CommentCreateViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ import UIKit
import WordPressUI

final class CommentCreateViewController: UIViewController {
private let buttonSend = UIButton(configuration: {
var configuration = UIButton.Configuration.borderedProminent()
configuration.title = Strings.send
configuration.cornerStyle = .capsule
configuration.baseBackgroundColor = UIColor.label
configuration.baseForegroundColor = UIColor.systemBackground
return configuration
}())

private let contentView = UIStackView(axis: .vertical, [])
private let editorVC = CommentEditorViewController()
private let viewModel: CommentCreateViewModel
Expand All @@ -32,7 +23,6 @@ final class CommentCreateViewController: UIViewController {

setupView()
setupNavigationBar()
setupAccessibility()

didChangeText(editorVC.initialContent ?? "")
}
Expand Down Expand Up @@ -62,10 +52,6 @@ final class CommentCreateViewController: UIViewController {
editorVC.didMove(toParent: self)
}

private func setupAccessibility() {
navigationItem.rightBarButtonItem?.accessibilityIdentifier = "button_send_comment"
}

// MARK: - Actions

@objc private func buttonSendTapped() {
Expand All @@ -86,7 +72,7 @@ final class CommentCreateViewController: UIViewController {
}

private func setLoading(_ isLoading: Bool) {
navigationItem.rightBarButtonItem = isLoading ? .activityIndicator : UIBarButtonItem(customView: buttonSend)
navigationItem.rightBarButtonItem = isLoading ? .activityIndicator : makeSendButton()
navigationItem.leftBarButtonItem?.isEnabled = !isLoading
editorVC.isEnabled = !isLoading
}
Expand Down Expand Up @@ -128,14 +114,21 @@ final class CommentCreateViewController: UIViewController {

navigationItem.leftBarButtonItem = UIBarButtonItem(title: SharedStrings.Button.cancel, style: .plain, target: self, action: #selector(buttonCancelTapped))

navigationItem.rightBarButtonItem = UIBarButtonItem(customView: buttonSend)
buttonSend.addTarget(self, action: #selector(buttonSendTapped), for: .primaryActionTriggered)
navigationItem.rightBarButtonItem = makeSendButton()
navigationItem.rightBarButtonItem?.isEnabled = false
}

private func makeSendButton() -> UIBarButtonItem {
let button = UIBarButtonItem(title: Strings.send, style: .done, target: self, action: #selector(buttonSendTapped))
button.accessibilityIdentifier = "button_send_comment"
button.tintColor = UIAppColor.tint
return button
}

private func didChangeText(_ text: String) {
let text = text.trimmingCharacters(in: .whitespacesAndNewlines)
let isEnabled = !text.isEmpty
buttonSend.isEnabled = isEnabled
navigationItem.rightBarButtonItem?.isEnabled = isEnabled
isModalInPresentation = isEnabled
}
}
Expand Down