Skip to content
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.

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

ULS: Update Help button color #327

Merged
merged 5 commits into from
Jul 14, 2020
Merged

Conversation

ScoutHarris
Copy link
Contributor

@ScoutHarris ScoutHarris commented Jul 10, 2020

Ref: #315

This adds functionality to set the Help nav button text color based on the nav bar being displayed. It also enables the unified nav bar on the Site Credentials view.

For the unified flows, it is now the same blue as the Back button.

Screen Shot 2020-07-10 at 12 23 19 PM

For the original flows, it is still white.

Screen Shot 2020-07-10 at 12 23 30 PM

To note, when tapping Help and the Support view is displayed, the Close button (left bar button) color is incorrect for the unified flow. Stay tuned!

Can be tested with WPiOS PR: wordpress-mobile/WordPress-iOS#14457

@ScoutHarris ScoutHarris self-assigned this Jul 10, 2020
@ScoutHarris ScoutHarris added this to In progress in Unified Login & Signup (iOS) via automation Jul 10, 2020
@ScoutHarris ScoutHarris marked this pull request as ready for review July 10, 2020 18:35
Unified Login & Signup (iOS) automation moved this from In progress to Reviewer approved Jul 14, 2020
Copy link
Contributor

@Gio2018 Gio2018 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as long as the conflict is resolved, :shipit:!

@@ -24,6 +24,9 @@ class SiteCredentialsViewController: LoginViewController {
override func viewDidLoad() {
super.viewDidLoad()

navigationItem.title = WordPressAuthenticator.shared.displayStrings.logInTitle
styleNavigationBar(forUnified: true)

localizePrimaryButton()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it just my browser or GitHub is messing up with the indentation? When I open it in Xcode, everything is in order anyway.

Copy link
Contributor Author

@ScoutHarris ScoutHarris Jul 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that too when Thuy first added this file. It appeared all kinds of wrong on the PR, but in code it's fine. 🤷 .

@ScoutHarris
Copy link
Contributor Author

Thanks @Gio2018 !

@ScoutHarris ScoutHarris merged commit 343d9d5 into develop Jul 14, 2020
Unified Login & Signup (iOS) automation moved this from Reviewer approved to Done Jul 14, 2020
@ScoutHarris ScoutHarris deleted the feature/315-help_button_color branch July 14, 2020 21:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants