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.

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

Jump to bottom

[TIMOB-26973] iOS: Add accessibilityIdentifier #10864

Merged
merged 7 commits into from
May 16, 2019
Merged

[TIMOB-26973] iOS: Add accessibilityIdentifier #10864

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e8594d
feat(ios): compose accessibility identifier
drauggres Apr 22, 2019
8cf60f4
fix(ios): accessibility properties for navButtons
drauggres Apr 22, 2019
fa3b75e
Merge branch 'master' into TIMOB-26973
vijaysingh-axway May 9, 2019
18cb85a
fix(ios): warnings on navButtons
drauggres May 13, 2019
312d6e3
fix(iOS): Updated accessibilityIdentifier logic
vijaysingh-axway May 15, 2019
365ed8f
Merge branch 'master' into TIMOB-26973
vijaysingh-axway May 15, 2019
3230af2
Merge branch 'master' into TIMOB-26973
keerthi1032 May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions iphone/Classes/TiUINavBarButton.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ - (id)initWithProxy:(TiUIButtonProxy *)proxy_
proxy = proxy_; // Don't retain

self.accessibilityLabel = [proxy_ valueForUndefinedKey:@"accessibilityLabel"];
self.accessibilityValue = [proxy_ valueForUndefinedKey:@"accessibilityValue"];
self.accessibilityHint = [proxy_ valueForUndefinedKey:@"accessibilityHint"];
self.accessibilityIdentifier = [TiUtils composeAccessibilityIdentifier:self];
drauggres marked this conversation as resolved.
Show resolved Hide resolved

self.width = [TiUtils floatValue:[proxy_ valueForKey:@"width"] def:0.0];
//A width of 0 is treated as Auto by the iPhone OS, so this is safe.
Expand Down
3 changes: 3 additions & 0 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ - (void)setAccessibilityLabel_:(id)accessibilityLabel
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityLabel:[TiUtils stringValue:accessibilityLabel]];
[accessibilityElement setAccessibilityIdentifier:[TiUtils composeAccessibilityIdentifier:accessibilityElement]];
}
}

Expand All @@ -346,6 +347,7 @@ - (void)setAccessibilityValue_:(id)accessibilityValue
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityValue:[TiUtils stringValue:accessibilityValue]];
[accessibilityElement setAccessibilityIdentifier:[TiUtils composeAccessibilityIdentifier:accessibilityElement]];
}
}

Expand All @@ -355,6 +357,7 @@ - (void)setAccessibilityHint_:(id)accessibilityHint
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityHint:[TiUtils stringValue:accessibilityHint]];
[accessibilityElement setAccessibilityIdentifier:[TiUtils composeAccessibilityIdentifier:accessibilityElement]];
}
}

Expand Down
2 changes: 2 additions & 0 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,8 @@ typedef enum {

+ (void)applyConstraintToView:(TiUIView *)view forProxy:(TiViewProxy *)proxy withBounds:(CGRect)bounds;

+ (NSString *)composeAccessibilityIdentifier:(TiUIView *)view;
drauggres marked this conversation as resolved.
Show resolved Hide resolved

+ (CGRect)viewPositionRect:(UIView *)view;

+ (BOOL)barTranslucencyForColor:(TiColor *)color;
Expand Down
45 changes: 45 additions & 0 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiUtils.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,6 +1420,51 @@ + (void)applyConstraintToView:(TiUIView *)view forProxy:(TiViewProxy *)proxy wit
ApplyConstraintToViewWithBounds([proxy layoutProperties], view, bounds);
}

+ (NSString *)composeAccessibilityIdentifier:(TiUIView *)view
drauggres marked this conversation as resolved.
Show resolved Hide resolved
{
NSString *accessibilityLabel = view.accessibilityLabel;
drauggres marked this conversation as resolved.
Show resolved Hide resolved
NSString *accessibilityValue = view.accessibilityValue;
NSString *accessibilityHint = view.accessibilityHint;
NSString *pattern = @"^.*[!\"#$%&'()*+,\\-./:;<=>?@\\[\\]^_`{|}~]\\s*$";
NSString *dot = @".";
NSString *space = @" ";
NSError *error = nil;
NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:pattern options:0 error:&error];
NSMutableArray *array = [NSMutableArray array];
NSUInteger numberOfMatches;

if (accessibilityLabel != nil && accessibilityLabel.length) {
[array addObject:accessibilityLabel];
numberOfMatches = [regex numberOfMatchesInString:accessibilityLabel options:0 range:NSMakeRange(0, [accessibilityLabel length])];
if (numberOfMatches == 0) {
[array addObject:dot];
}
}

if (accessibilityValue != nil && accessibilityValue.length) {
if ([array count] > 0) {
[array addObject:space];
}
[array addObject:accessibilityValue];
numberOfMatches = [regex numberOfMatchesInString:accessibilityValue options:0 range:NSMakeRange(0, [accessibilityValue length])];
if (numberOfMatches == 0) {
[array addObject:dot];
}
}

if (accessibilityHint != nil && accessibilityHint.length) {
if ([array count] > 0) {
[array addObject:space];
}
[array addObject:accessibilityHint];
numberOfMatches = [regex numberOfMatchesInString:accessibilityHint options:0 range:NSMakeRange(0, [accessibilityHint length])];
if (numberOfMatches == 0) {
[array addObject:dot];
}
}
return [array componentsJoinedByString:@""];
}

+ (CGRect)viewPositionRect:(UIView *)view
{
#if USEFRAME
Expand Down