Skip to content

Make it possible for Obj-C view controller to implement IndicatorInfoProvider protocol #850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make it possible for Obj-C view controller to implement IndicatorInfoProvider protocol #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 18 additions & 21 deletions Sources/IndicatorInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -45,36 +43,35 @@ 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
}

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
}

}

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
}
}
2 changes: 1 addition & 1 deletion Sources/PagerTabStripViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import Foundation

// MARK: Protocols

public protocol IndicatorInfoProvider {
@objc public protocol IndicatorInfoProvider {

func indicatorInfo(for pagerTabStripController: PagerTabStripViewController) -> IndicatorInfo

Expand Down