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

avoid duplicate use

Browse Source
This commit is contained in:
panxi 2019-05-02 13:59:50 -04:00
parent 791f2e98c7
commit c99ffc1af7
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
MVMCoreUI/Containers/TabBarController/TopTabbar.m
View File

@ -193,14 +193,7 @@ static NSString * const COLLECTION_CELL_ID = @"cell";
[label layoutIfNeeded]; [label layoutIfNeeded];
label.baselineAdjustment = UIBaselineAdjustmentAlignCenters; label.baselineAdjustment = UIBaselineAdjustmentAlignCenters;
//set up cell acceessibility label [self setCellAccessibility:cell title:label.text isSelected:NO];
cell.isAccessibilityElement = NO;
cell.contentView.isAccessibilityElement = YES;
NSString *accLabel = [label.text stringByAppendingString:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTab"]];
NSString *accString = [accLabel stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]];
cell.contentView.accessibilityLabel = accString;
[cell.contentView setAccessibilityHint:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabHint"]];
if (indexPath.row == self.selectedIndex) { if (indexPath.row == self.selectedIndex) {
label.textColor = [UIColor mfTomatoRed]; label.textColor = [UIColor mfTomatoRed];
@ -410,17 +403,22 @@ static NSString * const COLLECTION_CELL_ID = @"cell";
[self.delegate topTabbar:self didSelectItemAtIndex:indexPath.row]; [self.delegate topTabbar:self didSelectItemAtIndex:indexPath.row];
} }
//setup selected tab accessibility [self setCellAccessibility:cell title:label.text isSelected:YES];
NSString *string = label.text;
NSString *accLabel = [string stringByAppendingString:[MVMCoreUIUtility hardcodedStringWithKey:@"toptabbar_tab_selected"]];
NSString *accString = [accLabel stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]];
cell.contentView.accessibilityLabel = accString;
[cell.contentView setAccessibilityHint:nil];
} }
- (void)reloadData { - (void)reloadData {
[self.collectionView reloadData]; [self.collectionView reloadData];
} }
- (void)setCellAccessibility:(UICollectionViewCell *)cell title:(NSString *)title isSelected:(BOOL)isSelected {
cell.isAccessibilityElement = NO;
cell.contentView.isAccessibilityElement = YES;
NSString *accKey = isSelected ? @"toptabbar_tab_selected" : @"AccTab";
NSString *accLabel = [title stringByAppendingString:[MVMCoreUIUtility hardcodedStringWithKey:accKey]];
NSString *accString = [accLabel stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]];
cell.contentView.accessibilityLabel = accString;
NSString *accHint = isSelected ? nil : [MVMCoreUIUtility hardcodedStringWithKey:@"AccTabHint"];
[cell.contentView setAccessibilityHint:accHint];
}
@end @end