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

Merge branch 'feature/new_modern_page_control' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/new_modern_page_control

Browse Source
This commit is contained in:
Kevin G Christiano 2020-05-04 08:55:28 -04:00
commit f4fae9255b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift
View File

@ -192,9 +192,7 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
currentIndex = model.currentIndex
isEnabled = model.enabled
if let accessibleValue = MVMCoreUIUtility.hardcodedString(withKey: model.accessibilityHasSlidesInsteadOfPage ? "MVMCoreUIPageControlslides_currentpage_index" : "MVMCoreUIPageControl_currentpage_index") {
accessibilityValue = String(format: accessibleValue, currentIndex + 1, numberOfPages)
}
}
//--------------------------------------------------
@ -213,6 +211,10 @@ open class CarouselIndicator: Control, CarouselPageControlProtocol {
func accessibilityAdjust(toPage index: Int) {
if let accessibleValue = MVMCoreUIUtility.hardcodedString(withKey: (carouselIndicatorModel?.accessibilityHasSlidesInsteadOfPage ?? false) ? "MVMCoreUIPageControlslides_currentpage_index" : "MVMCoreUIPageControl_currentpage_index") {
accessibilityValue = String(format: accessibleValue, currentIndex + 1, numberOfPages)
}
if (index < numberOfPages && index >= 0) || carouselIndicatorModel?.alwaysSendAction ?? false {
carouselIndicatorModel?.animated = false
previousIndex = currentIndex

14
MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/NumericIndicatorView.swift
View File

@ -125,11 +125,11 @@ open class NumericIndicatorView: CarouselIndicator {
layoutIfNeeded()
}
open override func accessibilityIncrement() {
incrementCurrentIndex()
}
open override func accessibilityDecrement() {
decrementCurrentIndex()
}
// open override func accessibilityIncrement() {
// incrementCurrentIndex()
// }
//
// open override func accessibilityDecrement() {
// decrementCurrentIndex()
// }
}