Merge branch 'master' into feature/accessibility

Martin Barreto · web-flow · commit 04212ea5e75c · 2018-03-28T15:25:18.000-03:00
diff --git a/Sources/ButtonBarPagerTabStripViewController.swift b/Sources/ButtonBarPagerTabStripViewController.swift
@@ -347,6 +347,10 @@ open class ButtonBarPagerTabStripViewController: PagerTabStripViewController, Pa
                 changeCurrentIndex(currentIndex == indexPath.item ? nil : cell, currentIndex == indexPath.item ? cell : nil, false)
             }
         }
+        cell.isAccessibilityElement = true
+        cell.accessibilityLabel = cell.label.text
+        cell.accessibilityTraits |= UIAccessibilityTraitButton
+        cell.accessibilityTraits |= UIAccessibilityTraitHeader
         return cell
     }
 
diff --git a/Sources/PagerTabStripViewController.swift b/Sources/PagerTabStripViewController.swift
@@ -381,7 +381,7 @@ open class PagerTabStripViewController: UIViewController, UIScrollViewDelegate {
         guard !viewControllers.isEmpty else {
             fatalError("viewControllers(for:) should provide at least one child view controller")
         }
-        viewControllers.forEach { if !($0 is IndicatorInfoProvider) { fatalError("Every view controller provided by PagerTabStripDataSource's viewControllers(for:) method must conform to  InfoProvider") }}
+        viewControllers.forEach { if !($0 is IndicatorInfoProvider) { fatalError("Every view controller provided by PagerTabStripDataSource's viewControllers(for:) method must conform to IndicatorInfoProvider") }}
 
     }
 
diff --git a/Sources/SegmentedPagerTabStripViewController.swift b/Sources/SegmentedPagerTabStripViewController.swift
@@ -57,7 +57,8 @@ open class SegmentedPagerTabStripViewController: PagerTabStripViewController, Pa
 
     open override func viewDidLoad() {
         super.viewDidLoad()
-        segmentedControl = segmentedControl ?? UISegmentedControl()
+        let auxSegmentedControl = segmentedControl ?? UISegmentedControl()
+        segmentedControl = auxSegmentedControl
         if segmentedControl.superview == nil {
             navigationItem.titleView = segmentedControl
         }

Original file line number	Diff line number	Diff line change
`@@ -347,6 +347,10 @@ open class ButtonBarPagerTabStripViewController: PagerTabStripViewController, Pa`
`347`	`347`	`changeCurrentIndex(currentIndex == indexPath.item ? nil : cell, currentIndex == indexPath.item ? cell : nil, false)`
`348`	`348`	`}`
`349`	`349`	`}`
	`350`	`+ cell.isAccessibilityElement = true`
	`351`	`+ cell.accessibilityLabel = cell.label.text`
	`352`	`+ cell.accessibilityTraits \|= UIAccessibilityTraitButton`
	`353`	`+ cell.accessibilityTraits \|= UIAccessibilityTraitHeader`
`350`	`354`	`return cell`
`351`	`355`	`}`
`352`	`356`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ open class PagerTabStripViewController: UIViewController, UIScrollViewDelegate {`
`381`	`381`	`guard !viewControllers.isEmpty else {`
`382`	`382`	`fatalError("viewControllers(for:) should provide at least one child view controller")`
`383`	`383`	`}`
`384`		`- viewControllers.forEach { if !($0 is IndicatorInfoProvider) { fatalError("Every view controller provided by PagerTabStripDataSource's viewControllers(for:) method must conform to InfoProvider") }}`
	`384`	`+ viewControllers.forEach { if !($0 is IndicatorInfoProvider) { fatalError("Every view controller provided by PagerTabStripDataSource's viewControllers(for:) method must conform to IndicatorInfoProvider") }}`
`385`	`385`
`386`	`386`	`}`
`387`	`387`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ open class SegmentedPagerTabStripViewController: PagerTabStripViewController, Pa`
`57`	`57`
`58`	`58`	`open override func viewDidLoad() {`
`59`	`59`	`super.viewDidLoad()`
`60`		`- segmentedControl = segmentedControl ?? UISegmentedControl()`
	`60`	`+ let auxSegmentedControl = segmentedControl ?? UISegmentedControl()`
	`61`	`+ segmentedControl = auxSegmentedControl`
`61`	`62`	`if segmentedControl.superview == nil {`
`62`	`63`	`navigationItem.titleView = segmentedControl`
`63`	`64`	`}`