From 90a025caaf91cbecd43fa09f98d86b2402f81a09 Mon Sep 17 00:00:00 2001 From: rachelmcr Date: Fri, 8 Feb 2019 13:58:13 +0000 Subject: [PATCH] Update accessibility identifiers to unique values --- WordPressAuthenticator/Signin/LoginEmailViewController.swift | 4 ++-- .../Signin/LoginPrologueViewController.swift | 2 +- .../Signin/LoginSiteAddressViewController.swift | 2 +- WordPressAuthenticator/Signin/LoginWPComViewController.swift | 2 +- WordPressAuthenticator/Signup/SignupEmailViewController.swift | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/WordPressAuthenticator/Signin/LoginEmailViewController.swift b/WordPressAuthenticator/Signin/LoginEmailViewController.swift index dc14e0de4..a5be0011e 100644 --- a/WordPressAuthenticator/Signin/LoginEmailViewController.swift +++ b/WordPressAuthenticator/Signin/LoginEmailViewController.swift @@ -110,14 +110,14 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder { instructionLabel?.text = WordPressAuthenticator.shared.displayStrings.emailLoginInstructions } emailTextField.placeholder = NSLocalizedString("Email address", comment: "Placeholder for a textfield. The user may enter their email address.") - emailTextField.accessibilityIdentifier = "Email address" + emailTextField.accessibilityIdentifier = "Login Email Address" alternativeLoginLabel?.text = NSLocalizedString("Alternatively:", comment: "String displayed before offering alternative login methods") let submitButtonTitle = NSLocalizedString("Next", comment: "Title of a button. The text should be capitalized.").localizedCapitalized submitButton?.setTitle(submitButtonTitle, for: .normal) submitButton?.setTitle(submitButtonTitle, for: .highlighted) - submitButton?.accessibilityIdentifier = "Next Button" + submitButton?.accessibilityIdentifier = "Login Email Next Button" } diff --git a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift index 5dd9132b9..6b10d880b 100644 --- a/WordPressAuthenticator/Signin/LoginPrologueViewController.swift +++ b/WordPressAuthenticator/Signin/LoginPrologueViewController.swift @@ -63,7 +63,7 @@ class LoginPrologueViewController: LoginViewController { let loginTitle = NSLocalizedString("Log In", comment: "Button title. Tapping takes the user to the login form.") let createTitle = NSLocalizedString("Sign up for WordPress.com", comment: "Button title. Tapping begins the process of creating a WordPress.com account.") - buttonViewController.setupTopButton(title: loginTitle, isPrimary: true, accessibilityIdentifier: "Log In Button") { [weak self] in + buttonViewController.setupTopButton(title: loginTitle, isPrimary: true, accessibilityIdentifier: "Prologue Log In Button") { [weak self] in self?.loginTapped() } buttonViewController.setupBottomButton(title: createTitle, isPrimary: false) { [weak self] in diff --git a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift index 717d0c89c..7c2afa365 100644 --- a/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift +++ b/WordPressAuthenticator/Signin/LoginSiteAddressViewController.swift @@ -74,7 +74,7 @@ class LoginSiteAddressViewController: LoginViewController, NUXKeyboardResponder let submitButtonTitle = NSLocalizedString("Next", comment: "Title of a button. The text should be capitalized.").localizedCapitalized submitButton?.setTitle(submitButtonTitle, for: .normal) submitButton?.setTitle(submitButtonTitle, for: .highlighted) - submitButton?.accessibilityIdentifier = "Next Button" + submitButton?.accessibilityIdentifier = "Site Address Next Button" let siteAddressHelpTitle = NSLocalizedString("Need help finding your site address?", comment: "A button title.") siteAddressHelpButton.setTitle(siteAddressHelpTitle, for: .normal) diff --git a/WordPressAuthenticator/Signin/LoginWPComViewController.swift b/WordPressAuthenticator/Signin/LoginWPComViewController.swift index c0fe823c8..522696675 100644 --- a/WordPressAuthenticator/Signin/LoginWPComViewController.swift +++ b/WordPressAuthenticator/Signin/LoginWPComViewController.swift @@ -131,7 +131,7 @@ class LoginWPComViewController: LoginViewController, NUXKeyboardResponder { let submitButtonTitle = NSLocalizedString("Next", comment: "Title of a button. The text should be capitalized.").localizedCapitalized submitButton?.setTitle(submitButtonTitle, for: .normal) submitButton?.setTitle(submitButtonTitle, for: .highlighted) - submitButton?.accessibilityIdentifier = "Log In Button" + submitButton?.accessibilityIdentifier = "Password Next Button" let forgotPasswordTitle = NSLocalizedString("Lost your password?", comment: "Title of a button. ") forgotPasswordButton?.setTitle(forgotPasswordTitle, for: .normal) diff --git a/WordPressAuthenticator/Signup/SignupEmailViewController.swift b/WordPressAuthenticator/Signup/SignupEmailViewController.swift index 2d7b3a8d8..fe3f6924c 100644 --- a/WordPressAuthenticator/Signup/SignupEmailViewController.swift +++ b/WordPressAuthenticator/Signup/SignupEmailViewController.swift @@ -74,13 +74,13 @@ class SignupEmailViewController: LoginViewController, NUXKeyboardResponder { instructionLabel?.text = NSLocalizedString("To create your new WordPress.com account, please enter your email address.", comment: "Text instructing the user to enter their email address.") emailField.placeholder = NSLocalizedString("Email address", comment: "Placeholder for a textfield. The user may enter their email address.") - emailField.accessibilityIdentifier = "Email address" + emailField.accessibilityIdentifier = "Signup Email Address" emailField.contentInsets = WPStyleGuide.edgeInsetForLoginTextFields() let submitButtonTitle = NSLocalizedString("Next", comment: "Title of a button. The text should be capitalized.").localizedCapitalized submitButton?.setTitle(submitButtonTitle, for: .normal) submitButton?.setTitle(submitButtonTitle, for: .highlighted) - submitButton?.accessibilityIdentifier = "Next Button" + submitButton?.accessibilityIdentifier = "Signup Email Next Button" } /// Configure the view for an editing state. Should only be called from viewWillAppear