mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent expandable alert collapse when accessibilty focused. top alert notification callout fix.

Browse Source
This commit is contained in:
Kyle Matthew Hedden 2020-08-03 13:41:37 -04:00
parent e119e269b8
commit 01b52bc479
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
MVMCoreUI/TopAlert/MVMCoreUITopAlertExpandableView.m
View File

@ -74,6 +74,7 @@
self.translatesAutoresizingMaskIntoConstraints = NO; self.translatesAutoresizingMaskIntoConstraints = NO;
self.clipsToBounds = YES; self.clipsToBounds = YES;
self.expanded = NO; self.expanded = NO;
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(accessibilityFocusChanged:) name:UIAccessibilityElementFocusedNotification object:nil];
} }
return self; return self;
} }
@ -162,6 +163,7 @@
- (void)setupTopAlertWithButton:(MVMCoreUITopAlertMainView *)topAlertWithButton { - (void)setupTopAlertWithButton:(MVMCoreUITopAlertMainView *)topAlertWithButton {
topAlertWithButton.label.alpha = 0; topAlertWithButton.label.alpha = 0;
topAlertWithButton.label.accessibilityLabel = [NSString stringWithFormat:@"%@ - %@", [MVMCoreUIUtility hardcodedStringWithKey:@"top_alert_notification"], topAlertWithButton.label.accessibilityLabel];
topAlertWithButton.button.alpha = 0; topAlertWithButton.button.alpha = 0;
topAlertWithButton.backgroundColor = [UIColor clearColor]; topAlertWithButton.backgroundColor = [UIColor clearColor];
[self insertSubview:topAlertWithButton belowSubview:self.shortView]; [self insertSubview:topAlertWithButton belowSubview:self.shortView];
@ -304,7 +306,6 @@
//accessibility - added to make only top alert label and close button accessible. Posted notification when top alert is displayed //accessibility - added to make only top alert label and close button accessible. Posted notification when top alert is displayed
weakSelf.accessibilityElements = @[weakSelf.buttonView]; weakSelf.accessibilityElements = @[weakSelf.buttonView];
weakSelf.shortView.isAccessibilityElement = NO; weakSelf.shortView.isAccessibilityElement = NO;
weakSelf.buttonView.label.accessibilityLabel = [NSString stringWithFormat:@"%@ - %@", [MVMCoreUIUtility hardcodedStringWithKey:@"top_alert_notification"],weakSelf.buttonView.label.accessibilityLabel];
void(^completion)(void) = ^(void) { void(^completion)(void) = ^(void) {
UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, weakSelf.buttonView.label); UIAccessibilityPostNotification(UIAccessibilityScreenChangedNotification, weakSelf.buttonView.label);
@ -346,7 +347,7 @@
} }
dispatch_time_t dispatchTime = dispatch_time(DISPATCH_TIME_NOW, dismissTime * NSEC_PER_SEC); dispatch_time_t dispatchTime = dispatch_time(DISPATCH_TIME_NOW, dismissTime * NSEC_PER_SEC);
dispatch_after(dispatchTime, dispatch_get_main_queue(), ^(void){ dispatch_after(dispatchTime, dispatch_get_main_queue(), ^(void){
if (weakSelf && weakSelf.expanded && weakSelf.collapseAutomaticallyAfterExpanded) { if (weakSelf && weakSelf.expanded && weakSelf.collapseAutomaticallyAfterExpanded && ![self containsAccessiblityFocus]) {
[weakSelf collapse]; [weakSelf collapse];
} }
}); });
@ -390,4 +391,28 @@
} }
} }
- (BOOL)containsAccessiblityFocus {
if (!UIAccessibilityIsVoiceOverRunning()) {
return NO;
}
id focusedElement = UIAccessibilityFocusedElement(UIAccessibilityNotificationVoiceOverIdentifier);
if (![focusedElement isKindOfClass:[UIView class]]) {
return NO;
}
UIView *focusedView = focusedElement;
while (focusedView != nil) {
if (focusedView == self) {
return YES;
}
focusedView = [focusedView superview];
}
return NO;
}
- (void)accessibilityFocusChanged:(NSNotification *)notification {
if (![self containsAccessiblityFocus]) {
[self collapse];
}
}
@end @end