diff --git a/Sources/Classes/SwipeMenuView.swift b/Sources/Classes/SwipeMenuView.swift index bfa4b19..0b02784 100644 --- a/Sources/Classes/SwipeMenuView.swift +++ b/Sources/Classes/SwipeMenuView.swift @@ -26,6 +26,9 @@ public struct SwipeMenuViewOptions { /// ItemView font. Defaults to `14 pt as bold SystemFont`. public var font: UIFont = UIFont.boldSystemFont(ofSize: 14) + + /// ItemView selected font. Defaults to `14 pt as bold SystemFont`. + public var selectedFont: UIFont = UIFont.boldSystemFont(ofSize: 14) /// ItemView clipsToBounds. Defaults to `true`. public var clipsToBounds: Bool = true diff --git a/Sources/Classes/TabItemView.swift b/Sources/Classes/TabItemView.swift index 4b7d1ff..e7bb9de 100644 --- a/Sources/Classes/TabItemView.swift +++ b/Sources/Classes/TabItemView.swift @@ -6,13 +6,18 @@ final class TabItemView: UIView { public var textColor: UIColor = UIColor(red: 140/255, green: 140/255, blue: 140/255, alpha: 1.0) public var selectedTextColor: UIColor = .white + public var selectedFont: UIFont = UIFont.boldSystemFont(ofSize: 14) + public var font: UIFont = UIFont.boldSystemFont(ofSize: 14) + public var isSelected: Bool = false { didSet { if isSelected { titleLabel.textColor = selectedTextColor + titleLabel.font = selectedFont } else { titleLabel.textColor = textColor + titleLabel.font = font } } } @@ -34,7 +39,7 @@ final class TabItemView: UIView { private func setupLabel() { titleLabel = UILabel(frame: bounds) titleLabel.textAlignment = .center - titleLabel.font = UIFont.boldSystemFont(ofSize: 14) + titleLabel.font = font titleLabel.textColor = UIColor(red: 140/255, green: 140/255, blue: 140/255, alpha: 1.0) titleLabel.backgroundColor = UIColor.clear addSubview(titleLabel) diff --git a/Sources/Classes/TabView.swift b/Sources/Classes/TabView.swift index 8b20a6e..8e298b6 100644 --- a/Sources/Classes/TabView.swift +++ b/Sources/Classes/TabView.swift @@ -219,6 +219,7 @@ open class TabView: UIScrollView { tabItemView.titleLabel.font = options.itemView.font tabItemView.textColor = options.itemView.textColor tabItemView.selectedTextColor = options.itemView.selectedTextColor + tabItemView.selectedFont = options.itemView.selectedFont } tabItemView.isSelected = index == currentIndex @@ -422,9 +423,16 @@ extension TabView { } else { adjustCellWidth = (frame.width - options.margin * 2) / CGFloat(dataSource.numberOfItems(in: self)) - options.additionView.padding.horizontal } - - additionView.frame.origin.x = adjustCellWidth * CGFloat(index) - options.additionView.padding.left - additionView.frame.size.width = adjustCellWidth + + if options.addition == .underline { + let itemWidth = adjustCellWidth + options.additionView.padding.horizontal + let startX = (itemWidth * CGFloat(index)) + additionView.frame.origin.x = startX + options.additionView.padding.left + additionView.frame.size.width = adjustCellWidth + } else { + additionView.frame.origin.x = adjustCellWidth * CGFloat(index) - options.additionView.padding.left + additionView.frame.size.width = adjustCellWidth + } } fileprivate func animateAdditionView(index: Int, animated: Bool, completion: ((Bool) -> Swift.Void)? = nil) {