From 884b18a8efe3a7f9cb5bdc2abddb0230c1e4e1d6 Mon Sep 17 00:00:00 2001 From: panxi Date: Tue, 30 Apr 2019 09:40:54 -0400 Subject: [PATCH] order fix --- MVMCoreUI/Containers/TabBarController/TopTabbar.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MVMCoreUI/Containers/TabBarController/TopTabbar.m b/MVMCoreUI/Containers/TabBarController/TopTabbar.m index fe4dd250..18131d53 100644 --- a/MVMCoreUI/Containers/TabBarController/TopTabbar.m +++ b/MVMCoreUI/Containers/TabBarController/TopTabbar.m @@ -197,9 +197,9 @@ static NSString * const COLLECTION_CELL_ID = @"cell"; cell.isAccessibilityElement = NO; cell.contentView.isAccessibilityElement = YES; - NSString *titleString = [label.text stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]]; - NSString *accLabel = [titleString stringByAppendingString:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTab"]]; - cell.contentView.accessibilityLabel = accLabel; + 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) { @@ -411,9 +411,9 @@ static NSString * const COLLECTION_CELL_ID = @"cell"; } //setup selected tab accessibility - NSString *string = [label.text stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]]; NSString *accLabel = [string stringByAppendingString:[MVMCoreUIUtility hardcodedStringWithKey:@"toptabbar_tab_selected"]]; - cell.contentView.accessibilityLabel = accLabel; + NSString *accString = [accLabel stringByAppendingString:[NSString stringWithFormat:[MVMCoreUIUtility hardcodedStringWithKey:@"AccTabIndex"], self.selectedIndex + 1, [self.datasource numberOfTopTabbarItems:self]]]; + cell.contentView.accessibilityLabel = accString; [cell.contentView setAccessibilityHint:nil]; }