diff --git a/.gitignore b/.gitignore index ec58845f..b262b705 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ DerivedData *.perspectivev3 !default.perspectivev3 xcuserdata +XLPagerTabStrip.xcworkspace/xcshareddata/ ## Other *.xccheckout @@ -51,4 +52,4 @@ playground.xcworkspace Carthage/Build -.swift-version \ No newline at end of file +.swift-version diff --git a/Sources/ButtonBarPagerTabStripViewController.swift b/Sources/ButtonBarPagerTabStripViewController.swift index 86addf1f..118c7509 100644 --- a/Sources/ButtonBarPagerTabStripViewController.swift +++ b/Sources/ButtonBarPagerTabStripViewController.swift @@ -56,6 +56,7 @@ public struct ButtonBarPagerTabStripSettings { public var buttonBarItemFont = UIFont.systemFont(ofSize: 18) public var buttonBarItemLeftRightMargin: CGFloat = 8 public var buttonBarItemTitleColor: UIColor? + public var buttonBarItemUnselectedColor: UIColor? @available(*, deprecated: 7.0.0) public var buttonBarItemsShouldFillAvailiableWidth: Bool { set { buttonBarItemsShouldFillAvailableWidth = newValue @@ -329,6 +330,7 @@ open class ButtonBarPagerTabStripViewController: PagerTabStripViewController, Pa cell.label.textColor = settings.style.buttonBarItemTitleColor ?? cell.label.textColor cell.contentView.backgroundColor = settings.style.buttonBarItemBackgroundColor ?? cell.contentView.backgroundColor cell.backgroundColor = settings.style.buttonBarItemBackgroundColor ?? cell.backgroundColor + cell.unselectedBottomView.backgroundColor = settings.style.buttonBarItemUnselectedColor ?? cell.backgroundColor if let image = indicatorInfo.image { cell.imageView.image = image } diff --git a/Sources/ButtonBarViewCell.swift b/Sources/ButtonBarViewCell.swift index 933434be..045c9a64 100644 --- a/Sources/ButtonBarViewCell.swift +++ b/Sources/ButtonBarViewCell.swift @@ -28,7 +28,7 @@ open class ButtonBarViewCell: UICollectionViewCell { @IBOutlet open var imageView: UIImageView! @IBOutlet open var label: UILabel! - + @IBOutlet weak var unselectedBottomView: UIView! public required init?(coder aDecoder: NSCoder) { super.init(coder: aDecoder) diff --git a/Sources/ButtonCell.xib b/Sources/ButtonCell.xib index 7025bc70..538b03fb 100644 --- a/Sources/ButtonCell.xib +++ b/Sources/ButtonCell.xib @@ -1,50 +1,61 @@ - + - + - + - + - + + + + + - + + + + + + + + - +