Skip to content
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

buttonBarView #375

Closed
wants to merge 4 commits into from
Closed

buttonBarView #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2fe4eb
buttonBarView
codwam May 14, 2017
4ca33ce
IndicatorInfo extra properties
codwam May 14, 2017
0db4d9f
Delete repeat init method
codwam May 14, 2017
ca1a538
IndicatorInfo add full initialize
codwam May 14, 2017
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
2 changes: 2 additions & 0 deletions Sources/BaseButtonBarPagerTabStripViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ open class BaseButtonBarPagerTabStripViewController<ButtonBarCellType : UICollec
newContainerViewFrame.origin.y = buttonBarHeight
newContainerViewFrame.size.height = containerView.frame.size.height - (buttonBarHeight - containerView.frame.origin.y)
containerView.frame = newContainerViewFrame
// weak reference will be release which not in IB
view.addSubview(buttonBar)
return buttonBar
}()
if buttonBarView.superview == nil {
Expand Down
16 changes: 16 additions & 0 deletions Sources/IndicatorInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public struct IndicatorInfo {
public var title: String?
public var image: UIImage?
public var highlightedImage: UIImage?
public var badge: Int?
public var userInfo: Any?

public init(title: String?) {
self.title = title
Expand All @@ -44,6 +46,20 @@ public struct IndicatorInfo {
self.image = image
self.highlightedImage = highlightedImage
}

public init(title: String?, image: UIImage?, badge: Int?) {
self.title = title
self.image = image
self.badge = badge
}

public init(title: String?, image: UIImage?, highlightedImage: UIImage?, badge: Int?, userInfo: Any?) {
self.title = title
self.image = image
self.highlightedImage = highlightedImage
self.badge = badge
self.userInfo = userInfo
}

}

Expand Down