diff --git a/Sources/IndicatorInfo.swift b/Sources/IndicatorInfo.swift index 146eb9a5..18637b15 100644 --- a/Sources/IndicatorInfo.swift +++ b/Sources/IndicatorInfo.swift @@ -24,17 +24,15 @@ import Foundation -public struct IndicatorInfo { +@objcMembers public class IndicatorInfo: NSObject { public var title: String? public var image: UIImage? public var highlightedImage: UIImage? - public var accessibilityLabel: String? public var userInfo: Any? public init(title: String?) { self.title = title - self.accessibilityLabel = title } public init(image: UIImage?, highlightedImage: UIImage? = nil, userInfo: Any? = nil) { @@ -45,7 +43,6 @@ public struct IndicatorInfo { public init(title: String?, image: UIImage?, highlightedImage: UIImage? = nil, userInfo: Any? = nil) { self.title = title - self.accessibilityLabel = title self.image = image self.highlightedImage = highlightedImage self.userInfo = userInfo @@ -53,7 +50,6 @@ public struct IndicatorInfo { public init(title: String?, accessibilityLabel:String?, image: UIImage?, highlightedImage: UIImage? = nil, userInfo: Any? = nil) { self.title = title - self.accessibilityLabel = accessibilityLabel self.image = image self.highlightedImage = highlightedImage self.userInfo = userInfo @@ -61,20 +57,21 @@ public struct IndicatorInfo { } -extension IndicatorInfo : ExpressibleByStringLiteral { - - public init(stringLiteral value: String) { - title = value - accessibilityLabel = value - } - - public init(extendedGraphemeClusterLiteral value: String) { - title = value - accessibilityLabel = value - } +//extension IndicatorInfo : ExpressibleByStringLiteral { +// +// public init(stringLiteral value: String) { +// title = value +// accessibilityLabel = value +// } +// +// public init(extendedGraphemeClusterLiteral value: String) { +// title = value +// accessibilityLabel = value +// } +// +// public init(unicodeScalarLiteral value: String) { +// title = value +// accessibilityLabel = value +// } +//} - public init(unicodeScalarLiteral value: String) { - title = value - accessibilityLabel = value - } -} diff --git a/Sources/PagerTabStripViewController.swift b/Sources/PagerTabStripViewController.swift index 9aedb7d6..34c4145a 100644 --- a/Sources/PagerTabStripViewController.swift +++ b/Sources/PagerTabStripViewController.swift @@ -26,7 +26,7 @@ import Foundation // MARK: Protocols -public protocol IndicatorInfoProvider { +@objc public protocol IndicatorInfoProvider { func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo