Merge branch 'develop' into feature/accessibilityHandler

This commit is contained in:
Keerthy 2023-11-01 11:32:50 +05:30
commit 7b4dd51a74
2 changed files with 6 additions and 2 deletions

View File

@ -213,7 +213,9 @@ open class BarsIndicatorView: CarouselIndicator {
let accessibleIndex = MVMCoreUIUtility.getOrdinalString(forIndex: NSNumber(value: index + 1)) let accessibleIndex = MVMCoreUIUtility.getOrdinalString(forIndex: NSNumber(value: index + 1))
else { return } else { return }
view.accessibilityLabel = String(format: accessibleValueFormat, accessibleIndex, numberOfPages) let accessibilityValue = String(format: accessibleValueFormat, accessibleIndex, numberOfPages)
view.accessibilityLabel = accessibilityValue
view.accessibilityIdentifier = accessibilityValue
} }
public override func assessTouchOf(_ touchPoint_X: CGFloat) { public override func assessTouchOf(_ touchPoint_X: CGFloat) {

View File

@ -372,7 +372,9 @@ open class Carousel: View {
self.carouselAccessibilityElement = carouselAccessibilityElement self.carouselAccessibilityElement = carouselAccessibilityElement
} }
if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)) { if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)), let pagingView = self.pagingView {
_accessibilityElements = [currentCell, carouselAccessibilityElement, pagingView]
} else if let currentCell = collectionView.cellForItem(at: IndexPath(row: currentIndex, section: 0)) {
_accessibilityElements = [currentCell, carouselAccessibilityElement] _accessibilityElements = [currentCell, carouselAccessibilityElement]
} else { } else {
_accessibilityElements = [carouselAccessibilityElement] _accessibilityElements = [carouselAccessibilityElement]