Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Adding accessibility identifiers to PFLogInView and PFSignUpView #214

Merged
merged 1 commit into from
Dec 10, 2015
Merged

Adding accessibility identifiers to PFLogInView and PFSignUpView #214

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
14 changes: 14 additions & 0 deletions ParseUI/Classes/LogInViewController/PFLogInView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,20 @@ typedef NS_OPTIONS(NSInteger, PFLogInFields) {
PFLogInFieldsDismissButton)
};

/**
`PFLoginFields`'s accessibility label identifiers

@see PFLogInView
*/
extern NSString *const PFLogInViewUsernameFieldAccessibilityIdentifier;
extern NSString *const PFLogInViewPasswordFieldAccessibilityIdentifier;
extern NSString *const PFLogInViewLogInButtonAccessibilityIdentifier;
extern NSString *const PFLogInViewSignUpButtonAccessibilityIdentifier;
extern NSString *const PFLogInViewPasswordForgottenButtonAccessibilityIdentifier;
extern NSString *const PFLogInViewTwitterButtonAccessibilityIdentifier;
extern NSString *const PFLogInViewFacebookButtonAccessibilityIdentifier;
extern NSString *const PFLogInViewDismissButtonAccessibilityIdentifier;

@class PFTextField;

/**
Expand Down
21 changes: 21 additions & 0 deletions ParseUI/Classes/LogInViewController/PFLogInView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,19 @@
static NSString *const PFLogInViewDefaultFacebookButtonImageName = @"facebook_icon.png";
static NSString *const PFLogInViewDefaultTwitterButtonImageName = @"twitter_icon.png";

///--------------------------------------
#pragma mark - Accessibility Identifiers
///--------------------------------------
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Add line break before line 41 per overall code style.


NSString *const PFLogInViewUsernameFieldAccessibilityIdentifier = @"PFLogInViewUsernameFieldAccessibilityIdentifier";
NSString *const PFLogInViewPasswordFieldAccessibilityIdentifier = @"PFLogInViewPasswordFieldAccessibilityIdentifier";
NSString *const PFLogInViewLogInButtonAccessibilityIdentifier = @"PFLogInViewLogInButtonAccessibilityIdentifier";
NSString *const PFLogInViewSignUpButtonAccessibilityIdentifier = @"PFLogInViewSignUpButtonAccessibilityIdentifier";
NSString *const PFLogInViewPasswordForgottenButtonAccessibilityIdentifier = @"PFLogInViewPasswordForgottenButtonAccessibilityIdentifier";
NSString *const PFLogInViewTwitterButtonAccessibilityIdentifier = @"PFLogInViewTwitterButtonAccessibilityIdentifier";
NSString *const PFLogInViewFacebookButtonAccessibilityIdentifier = @"PFLogInViewFacebookButtonAccessibilityIdentifier";
NSString *const PFLogInViewDismissButtonAccessibilityIdentifier = @"PFLogInViewDismissButtonAccessibilityIdentifier";

@implementation PFLogInView

///--------------------------------------
Expand Down Expand Up @@ -109,6 +122,7 @@ - (void)_updateAllFields {
if (_fields & PFLogInFieldsDismissButton) {
if (!_dismissButton) {
_dismissButton = [[PFDismissButton alloc] initWithFrame:CGRectZero];
_dismissButton.accessibilityIdentifier = PFLogInViewDismissButtonAccessibilityIdentifier;
[self addSubview:_dismissButton];
}
} else {
Expand All @@ -121,6 +135,7 @@ - (void)_updateAllFields {
_usernameField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:(PFTextFieldSeparatorStyleTop |
PFTextFieldSeparatorStyleBottom)];
_usernameField.accessibilityIdentifier = PFLogInViewUsernameFieldAccessibilityIdentifier;
_usernameField.autocorrectionType = UITextAutocorrectionTypeNo;
_usernameField.autocapitalizationType = UITextAutocapitalizationTypeNone;
_usernameField.returnKeyType = UIReturnKeyNext;
Expand All @@ -131,6 +146,7 @@ - (void)_updateAllFields {
if (!_passwordField) {
_passwordField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:PFTextFieldSeparatorStyleBottom];
_passwordField.accessibilityIdentifier = PFLogInViewPasswordFieldAccessibilityIdentifier;
_passwordField.placeholder = PFLocalizedString(@"Password", @"Password");
_passwordField.secureTextEntry = YES;
_passwordField.autocorrectionType = UITextAutocorrectionTypeNo;
Expand All @@ -150,6 +166,7 @@ - (void)_updateAllFields {
if (!_signUpButton) {
_signUpButton = [[PFActionButton alloc] initWithConfiguration:[[self class] _defaultSignUpButtonConfiguration]
buttonStyle:PFActionButtonStyleNormal];
_signUpButton.accessibilityIdentifier = PFLogInViewSignUpButtonAccessibilityIdentifier;
[self addSubview:_signUpButton];
}
} else {
Expand All @@ -160,6 +177,7 @@ - (void)_updateAllFields {
if (_fields & PFLogInFieldsPasswordForgotten) {
if (!_passwordForgottenButton) {
_passwordForgottenButton = [[PFTextButton alloc] initWithFrame:CGRectZero];
_passwordForgottenButton.accessibilityIdentifier = PFLogInViewPasswordForgottenButtonAccessibilityIdentifier;
[_passwordForgottenButton setTitle:PFLocalizedString(@"Forgot Password?", "Forgot Password?")
forState:UIControlStateNormal];
[self addSubview:_passwordForgottenButton];
Expand All @@ -172,6 +190,7 @@ - (void)_updateAllFields {
if (_fields & PFLogInFieldsLogInButton) {
if (!_logInButton) {
_logInButton = [[PFPrimaryButton alloc] initWithBackgroundImageColor:[PFColor loginButtonBackgroundColor]];
_logInButton.accessibilityIdentifier = PFLogInViewLogInButtonAccessibilityIdentifier;
[_logInButton setTitle:PFLocalizedString(@"Log In", @"Log In") forState:UIControlStateNormal];
[self addSubview:_logInButton];
}
Expand All @@ -184,6 +203,7 @@ - (void)_updateAllFields {
if (!_facebookButton) {
_facebookButton = [[PFActionButton alloc] initWithConfiguration:[[self class] _defaultFacebookButtonConfiguration]
buttonStyle:PFActionButtonStyleNormal];
_facebookButton.accessibilityIdentifier = PFLogInViewFacebookButtonAccessibilityIdentifier;
[self addSubview:_facebookButton];
}
} else {
Expand All @@ -195,6 +215,7 @@ - (void)_updateAllFields {
if (!_twitterButton) {
_twitterButton = [[PFActionButton alloc] initWithConfiguration:[[self class] _defaultTwitterButtonConfiguration]
buttonStyle:PFActionButtonStyleNormal];
_twitterButton.accessibilityIdentifier = PFLogInViewTwitterButtonAccessibilityIdentifier;
[self addSubview:_twitterButton];
}
} else {
Expand Down
12 changes: 12 additions & 0 deletions ParseUI/Classes/SignUpViewController/PFSignUpView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,18 @@ typedef NS_OPTIONS(NSInteger, PFSignUpFields) {
PFSignUpFieldsDismissButton)
};

/**
`PFSignUpFields`'s accessibity identifiers

@see PFSignUpView
*/
extern NSString *const PFSignUpViewUsernameFieldAccessibilityIdentifier;
extern NSString *const PFSignUpViewEmailFieldAccessibilityIdentifier;
extern NSString *const PFSignUpViewPasswordFieldAccessibilityIdentifier;
extern NSString *const PFSignUpViewAdditionalFieldAccessibilityIdentifier;
extern NSString *const PFSignUpViewSignUpButtonAccessibilityIdentifier;
extern NSString *const PFSignUpViewDismissButtonAccessibilityIdentifier;

@class PFTextField;

/**
Expand Down
17 changes: 17 additions & 0 deletions ParseUI/Classes/SignUpViewController/PFSignUpView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@

static NSString *const PFSignUpViewDefaultLogoImageName = @"parse_logo.png";

///--------------------------------------
#pragma mark - Accessibility Identifiers
///--------------------------------------

NSString *const PFSignUpViewUsernameFieldAccessibilityIdentifier = @"PFSignUpViewUsernameFieldAccessibilityIdentifier";
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: Add line break before line 38.

NSString *const PFSignUpViewEmailFieldAccessibilityIdentifier = @"PFSignUpViewEmailFieldAccessibilityIdentifier";
NSString *const PFSignUpViewPasswordFieldAccessibilityIdentifier = @"PFSignUpViewPasswordFieldAccessibilityIdentifier";
NSString *const PFSignUpViewAdditionalFieldAccessibilityIdentifier = @"PFSignUpViewAdditionalFieldAccessibilityIdentifier";
NSString *const PFSignUpViewSignUpButtonAccessibilityIdentifier = @"PFSignUpViewSignUpButtonAccessibilityIdentifier";
NSString *const PFSignUpViewDismissButtonAccessibilityIdentifier = @"PFSignUpViewDismissButtonAccessibilityIdentifier";

@implementation PFSignUpView

#pragma mark -
Expand All @@ -52,12 +63,14 @@ - (instancetype)initWithFields:(PFSignUpFields)otherFields {

if (_fields & PFSignUpFieldsDismissButton) {
_dismissButton = [[PFDismissButton alloc] initWithFrame:CGRectZero];
_dismissButton.accessibilityIdentifier = PFSignUpViewDismissButtonAccessibilityIdentifier;
[self addSubview:_dismissButton];
}

_usernameField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:(PFTextFieldSeparatorStyleTop |
PFTextFieldSeparatorStyleBottom)];
_usernameField.accessibilityIdentifier = PFSignUpViewUsernameFieldAccessibilityIdentifier;
_usernameField.autocorrectionType = UITextAutocorrectionTypeNo;
_usernameField.autocapitalizationType = UITextAutocapitalizationTypeNone;
_usernameField.returnKeyType = UIReturnKeyNext;
Expand All @@ -66,6 +79,7 @@ - (instancetype)initWithFields:(PFSignUpFields)otherFields {

_passwordField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:PFTextFieldSeparatorStyleBottom];
_passwordField.accessibilityIdentifier = PFSignUpViewPasswordFieldAccessibilityIdentifier;
_passwordField.placeholder = PFLocalizedString(@"Password", @"Password");
_passwordField.secureTextEntry = YES;
_passwordField.autocorrectionType = UITextAutocorrectionTypeNo;
Expand All @@ -80,6 +94,7 @@ - (instancetype)initWithFields:(PFSignUpFields)otherFields {
if (_fields & PFSignUpFieldsEmail) {
_emailField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:PFTextFieldSeparatorStyleBottom];
_emailField.accessibilityIdentifier = PFSignUpViewEmailFieldAccessibilityIdentifier;
_emailField.autocorrectionType = UITextAutocorrectionTypeNo;
_emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
_emailField.keyboardType = UIKeyboardTypeEmailAddress;
Expand All @@ -95,6 +110,7 @@ - (instancetype)initWithFields:(PFSignUpFields)otherFields {
if (_fields & PFSignUpFieldsAdditional) {
_additionalField = [[PFTextField alloc] initWithFrame:CGRectZero
separatorStyle:PFTextFieldSeparatorStyleBottom];
_additionalField.accessibilityIdentifier = PFSignUpViewAdditionalFieldAccessibilityIdentifier;
_additionalField.autocorrectionType = UITextAutocorrectionTypeNo;
_additionalField.autocapitalizationType = UITextAutocapitalizationTypeNone;
_additionalField.placeholder = PFLocalizedString(@"Additional", @"Additional");
Expand All @@ -104,6 +120,7 @@ - (instancetype)initWithFields:(PFSignUpFields)otherFields {

if (_fields & PFSignUpFieldsSignUpButton) {
_signUpButton = [[PFPrimaryButton alloc] initWithBackgroundImageColor:[PFColor signupButtonBackgroundColor]];
_signUpButton.accessibilityIdentifier = PFSignUpViewSignUpButtonAccessibilityIdentifier;
[_signUpButton setTitle:PFLocalizedString(@"Sign Up", @"Sign Up") forState:UIControlStateNormal];
[self addSubview:_signUpButton];
}
Expand Down