@@ -10,6 +10,13 @@ import UIKit
1010
1111public let SteppedProgressBarAutomaticDimension : CGFloat = - 1
1212
13+ public enum StepDrawingMode : Int {
14+ case fill
15+ case drawIndex
16+ // TODO:
17+ case image
18+ }
19+
1320@IBDesignable
1421open class SteppedProgressBar : UIView {
1522
@@ -39,6 +46,14 @@ open class SteppedProgressBar: UIView {
3946 }
4047 }
4148
49+ // Addressing issue #3
50+ // https://github.com/jkmathew/JKSteppedProgressBar/issues/3
51+ @IBInspectable open var titleOffset : CGFloat = 0 {
52+ didSet {
53+ self . setNeedsDisplay ( )
54+ }
55+ }
56+
4257 @IBInspectable open var circleSpacing : CGFloat = SteppedProgressBarAutomaticDimension {
4358 didSet {
4459 self . setNeedsDisplay ( )
@@ -57,6 +72,12 @@ open class SteppedProgressBar: UIView {
5772 }
5873 }
5974
75+ open var stepDrawingMode : StepDrawingMode = . drawIndex {
76+ didSet {
77+ self . setNeedsDisplay ( )
78+ }
79+ }
80+
6081 private var actualSpacing : CGFloat {
6182 return ( circleSpacing == SteppedProgressBarAutomaticDimension) ? ( frame. width - 6.0 - ( CGFloat ( titles. count) * circleRadius) ) / CGFloat( titles. count - 1 ) : circleSpacing
6283 }
@@ -77,24 +98,32 @@ open class SteppedProgressBar: UIView {
7798 let context = UIGraphicsGetCurrentContext ( )
7899
79100 if currentTab == 0 {
80- _ = drawTabs ( from: 0 , to: count, color: inactiveColor, textColor: inactiveTextColor)
101+ drawTabs ( from: 0 , to: count, color: inactiveColor, textColor: inactiveTextColor)
81102 }
82103 else if currentTab == count {
83- _ = drawTabs ( from: 0 , to: count, color: activeColor, textColor: activeColor)
104+ drawTabs ( from: 0 , to: count, color: activeColor, textColor: activeColor)
84105 }
85106 else {
86- let first = drawTabs ( from: 0 , to: currentTab , color: activeColor, textColor: activeColor) . end
87- let second = drawTabs ( from: currentTab, to: count, color: inactiveColor, textColor: inactiveTextColor) . start
107+ // Addressing issue #3
108+ // https://github.com/jkmathew/JKSteppedProgressBar/issues/3
109+ // Drawing in the order 1.inactive, 2.Line between active and inactive, 3.Active to avoid overlaping issue
110+ let end = drawTabs ( from: currentTab, to: count, color: inactiveColor, textColor: inactiveTextColor) . start
88111 let path = UIBezierPath ( )
89112 path. lineWidth = lineWidth
90113
91- path. move ( to: first)
92- path. addLine ( to: second)
114+ var start = end
115+ start. x -= actualSpacing
116+ path. move ( to: start)
117+ path. addLine ( to: end)
93118 context? . setStrokeColor ( inactiveColor. cgColor)
94119 path. stroke ( )
120+
121+ drawTabs ( from: 0 , to: currentTab , color: activeColor, textColor: activeColor)
122+
95123 }
96124 }
97125
126+ @discardableResult
98127 func drawTabs( from begin: Int , to end: Int , color: UIColor , textColor: UIColor ) -> ( start: CGPoint , end: CGPoint ) {
99128 let startX = bounds. midX - ( CGFloat ( titles. count - 1 ) * ( actualSpacing + circleRadius) / 2.0 )
100129 let x = startX + ( actualSpacing + circleRadius) * CGFloat( begin)
@@ -115,7 +144,11 @@ open class SteppedProgressBar: UIView {
115144 }
116145 let context = UIGraphicsGetCurrentContext ( )
117146 context? . setStrokeColor ( color. cgColor)
147+ context? . setFillColor ( color. cgColor)
118148 path. stroke ( )
149+ if stepDrawingMode == . fill {
150+ path. fill ( )
151+ }
119152 return ( start: start, end: point)
120153 }
121154
@@ -124,30 +157,33 @@ open class SteppedProgressBar: UIView {
124157 path. move ( to: point)
125158 let buttonRect = circleRect ( point, radius: circleRadius)
126159 let circlePath = UIBezierPath ( ovalIn: buttonRect)
127- path. append ( circlePath)
128160
161+ var attributes = [ NSForegroundColorAttributeName : textColor, NSParagraphStyleAttributeName: paragraphStyle]
162+
129163 //draw index
130164 let index = i
131- let buttonTitle = " \( index + 1 ) "
132- let font = UIFont . boldSystemFont ( ofSize: 14.0 )
133-
134- var attributes = [ NSForegroundColorAttributeName : textColor, NSParagraphStyleAttributeName: paragraphStyle, NSFontAttributeName: font]
135- let attributedButtonTitle = NSAttributedString ( string: buttonTitle, attributes: attributes)
136- drawString ( attributedButtonTitle, center: point)
165+ if stepDrawingMode == . drawIndex {
166+ let buttonTitle = " \( index + 1 ) "
167+ let font = UIFont . boldSystemFont ( ofSize: 14.0 )
168+ attributes [ NSFontAttributeName] = font
169+ let attributedButtonTitle = NSAttributedString ( string: buttonTitle, attributes: attributes)
170+ draw ( string: attributedButtonTitle, center: point)
171+ }
172+ path. append ( circlePath)
137173
138174 var titleCenter = point
139- titleCenter. y += circleRadius * 0.75
175+ titleCenter. y += circleRadius * 0.75 + titleOffset
140176 let title = titles [ index]
141177 attributes [ NSFontAttributeName] = UIFont . boldSystemFont ( ofSize: 12.0 )
142178 let attributedTitle = NSAttributedString ( string: title, attributes: attributes)
143- drawString ( attributedTitle, center: titleCenter)
179+ draw ( string : attributedTitle, center: titleCenter)
144180
145181 point. x += circleRadius / 2.0
146182 path. move ( to: point)
147183
148184 }
149185
150- func drawString ( _ string: NSAttributedString , center: CGPoint ) {
186+ func draw ( string: NSAttributedString , center: CGPoint ) {
151187 var rect = string. boundingRect ( with: CGSize ( width: 1000 , height: 1000 ) , options: . usesFontLeading, context: nil )
152188 let size = rect. size
153189 let origin = CGPoint ( x: center. x - size. width / 2.0 , y: center. y - size. height / 2.0 )
0 commit comments