@@ -11,72 +11,79 @@ import UIKit
1111@IBDesignable public class GMStepper: UIControl {
1212
1313 /// Current value of the stepper. Defaults to 0.
14− @IBInspectable public var value: Double = 0 {
14+ @objc @IBInspectable public var value: Double = 0 {
1515 didSet {
1616 value = min(maximumValue, max(minimumValue, value))
1717
1818 let isInteger = floor(value) == value
19−
20− if showIntegerIfDoubleIsInteger && isInteger {
19+
20+ //
21+ // If we have items, we will display them as steps
22+ //
23+
24+ if isInteger && stepValue == 1.0 && items.count > 0 {
25+ label.text = items[Int(value)]
26+ }
27+ else if showIntegerIfDoubleIsInteger && isInteger {
2128 label.text = String(stringInterpolationSegment: Int(value))
2229 } else {
2330 label.text = String(stringInterpolationSegment: value)
2431 }
2532
2633 if oldValue != value {
27− sendActionsForControlEvents(.ValueChanged)
34+ sendActions(for: .valueChanged)
2835 }
2936 }
3037 }
3138
3239 /// Minimum value. Must be less than maximumValue. Defaults to 0.
33− @IBInspectable public var minimumValue: Double = 0 {
40+ @objc @IBInspectable public var minimumValue: Double = 0 {
3441 didSet {
3542 value = min(maximumValue, max(minimumValue, value))
3643 }
3744 }
3845
3946 /// Maximum value. Must be more than minimumValue. Defaults to 100.
40− @IBInspectable public var maximumValue: Double = 100 {
47+ @objc @IBInspectable public var maximumValue: Double = 100 {
4148 didSet {
4249 value = min(maximumValue, max(minimumValue, value))
4350 }
4451 }
4552
4653 /// Step/Increment value as in UIStepper. Defaults to 1.
47− @IBInspectable public var stepValue: Double = 1
54+ @objc @IBInspectable public var stepValue: Double = 1
4855
4956 /// The same as UIStepper's autorepeat. If true, holding on the buttons or keeping the pan gesture alters the value repeatedly. Defaults to true.
50− @IBInspectable public var autorepeat: Bool = true
57+ @objc @IBInspectable public var autorepeat: Bool = true
5158
5259 /// If the value is integer, it is shown without floating point.
53− @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
60+ @objc @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
5461
55− /// Text on the left button. Be sure that it fits in the button. Defaults to "-".
56− @IBInspectable public var leftButtonText: String = "-" {
62+ /// Text on the left button. Be sure that it fits in the button. Defaults to "−".
63+ @objc @IBInspectable public var leftButtonText: String = "−" {
5764 didSet {
58− leftButton.setTitle(leftButtonText, forState: .Normal)
65+ leftButton.setTitle(leftButtonText, for: .normal)
5966 }
6067 }
6168
6269 /// Text on the right button. Be sure that it fits in the button. Defaults to "+".
63− @IBInspectable public var rightButtonText: String = "+" {
70+ @objc @IBInspectable public var rightButtonText: String = "+" {
6471 didSet {
65− rightButton.setTitle(rightButtonText, forState: .Normal)
72+ rightButton.setTitle(rightButtonText, for: .normal)
6673 }
6774 }
6875
6976 /// Text color of the buttons. Defaults to white.
70− @IBInspectable public var buttonsTextColor: UIColor = UIColor.whiteColor() {
77+ @objc @IBInspectable public var buttonsTextColor: UIColor = UIColor.white {
7178 didSet {
7279 for button in [leftButton, rightButton] {
73− button.setTitleColor(buttonsTextColor, forState: .Normal)
80+ button.setTitleColor(buttonsTextColor, for: .normal)
7481 }
7582 }
7683 }
7784
7885 /// Background color of the buttons. Defaults to dark blue.
79− @IBInspectable public var buttonsBackgroundColor: UIColor = UIColor(red:0.21, green:0.5, blue:0.74, alpha:1) {
86+ @objc @IBInspectable public var buttonsBackgroundColor: UIColor = UIColor(red:0.21, green:0.5, blue:0.74, alpha:1) {
8087 didSet {
8188 for button in [leftButton, rightButton] {
8289 button.backgroundColor = buttonsBackgroundColor
@@ -86,7 +93,7 @@ import UIKit
8693 }
8794
8895 /// Font of the buttons. Defaults to AvenirNext-Bold, 20.0 points in size.
89− public var buttonsFont = UIFont(name: "AvenirNext-Bold", size: 20.0)! {
96+ @objc public var buttonsFont = UIFont(name: "AvenirNext-Bold", size: 20.0)! {
9097 didSet {
9198 for button in [leftButton, rightButton] {
9299 button.titleLabel?.font = buttonsFont
@@ -95,36 +102,59 @@ import UIKit
95102 }
96103
97104 /// Text color of the middle label. Defaults to white.
98− @IBInspectable public var labelTextColor: UIColor = UIColor.whiteColor() {
105+ @objc @IBInspectable public var labelTextColor: UIColor = UIColor.white {
99106 didSet {
100107 label.textColor = labelTextColor
101108 }
102109 }
103110
104111 /// Text color of the middle label. Defaults to lighter blue.
105− @IBInspectable public var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1) {
112+ @objc @IBInspectable public var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1) {
106113 didSet {
107114 label.backgroundColor = labelBackgroundColor
108115 }
109116 }
110117
111118 /// Font of the middle label. Defaults to AvenirNext-Bold, 25.0 points in size.
112− public var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)! {
119+ @objc public var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)! {
113120 didSet {
114121 label.font = labelFont
115122 }
116123 }
124+ /// Corner radius of the middle label. Defaults to 0.
125+ @objc @IBInspectable public var labelCornerRadius: CGFloat = 0 {
126+ didSet {
127+ label.layer.cornerRadius = labelCornerRadius
128+
129+ }
130+ }
117131
118132 /// Corner radius of the stepper's layer. Defaults to 4.0.
119− @IBInspectable public var cornerRadius: CGFloat = 4.0 {
133+ @objc @IBInspectable public var cornerRadius: CGFloat = 4.0 {
120134 didSet {
121135 layer.cornerRadius = cornerRadius
122136 clipsToBounds = true
123137 }
124138 }
139+
140+ /// Border width of the stepper and middle label's layer. Defaults to 0.0.
141+ @objc @IBInspectable public var borderWidth: CGFloat = 0.0 {
142+ didSet {
143+ layer.borderWidth = borderWidth
144+ label.layer.borderWidth = borderWidth
145+ }
146+ }
147+
148+ /// Color of the border of the stepper and middle label's layer. Defaults to clear color.
149+ @objc @IBInspectable public var borderColor: UIColor = UIColor.clear {
150+ didSet {
151+ layer.borderColor = borderColor.cgColor
152+ label.layer.borderColor = borderColor.cgColor
153+ }
154+ }
125155
126156 /// Percentage of the middle label's width. Must be between 0 and 1. Defaults to 0.5. Be sure that it is wide enough to show the value.
127− @IBInspectable public var labelWidthWeight: CGFloat = 0.5 {
157+ @objc @IBInspectable public var labelWidthWeight: CGFloat = 0.5 {
128158 didSet {
129159 labelWidthWeight = min(1, max(0, labelWidthWeight))
130160 setNeedsLayout()
@@ -132,7 +162,7 @@ import UIKit
132162 }
133163
134164 /// Color of the flashing animation on the buttons in case the value hit the limit.
135− @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
165+ @objc @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
136166
137167 /**
138168 Width of the sliding animation. When buttons clicked, the middle label does a slide animation towards to the clicked button. Defaults to 5.
@@ -140,38 +170,40 @@ import UIKit
140170 let labelSlideLength: CGFloat = 5
141171
142172 /// Duration of the sliding animation
143− let labelSlideDuration = NSTimeInterval(0.1)
173+ let labelSlideDuration = TimeInterval(0.1)
144174
145175 /// Duration of the animation when the value hits the limit.
146− let limitHitAnimationDuration = NSTimeInterval(0.1)
176+ let limitHitAnimationDuration = TimeInterval(0.1)
147177
148178 lazy var leftButton: UIButton = {
149179 let button = UIButton()
150− button.setTitle(self.leftButtonText, forState: .Normal)
151− button.setTitleColor(self.buttonsTextColor, forState: .Normal)
180+ button.setTitle(self.leftButtonText, for: .normal)
181+ button.setTitleColor(self.buttonsTextColor, for: .normal)
152182 button.backgroundColor = self.buttonsBackgroundColor
153183 button.titleLabel?.font = self.buttonsFont
154− button.addTarget(self, action: "leftButtonTouchDown:", forControlEvents: .TouchDown)
155− button.addTarget(self, action: "buttonTouchUp:", forControlEvents: UIControlEvents.TouchUpInside)
156− button.addTarget(self, action: "buttonTouchUp:", forControlEvents: UIControlEvents.TouchUpOutside)
184+ button.addTarget(self, action: #selector(GMStepper.leftButtonTouchDown), for: .touchDown)
185+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchUpInside)
186+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchUpOutside)
187+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchCancel)
157188 return button
158189 }()
159190
160191 lazy var rightButton: UIButton = {
161192 let button = UIButton()
162− button.setTitle(self.rightButtonText, forState: .Normal)
163− button.setTitleColor(self.buttonsTextColor, forState: .Normal)
193+ button.setTitle(self.rightButtonText, for: .normal)
194+ button.setTitleColor(self.buttonsTextColor, for: .normal)
164195 button.backgroundColor = self.buttonsBackgroundColor
165196 button.titleLabel?.font = self.buttonsFont
166− button.addTarget(self, action: "rightButtonTouchDown:", forControlEvents: .TouchDown)
167− button.addTarget(self, action: "buttonTouchUp:", forControlEvents: UIControlEvents.TouchUpInside)
168− button.addTarget(self, action: "buttonTouchUp:", forControlEvents: UIControlEvents.TouchUpOutside)
197+ button.addTarget(self, action: #selector(GMStepper.rightButtonTouchDown), for: .touchDown)
198+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchUpInside)
199+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchUpOutside)
200+ button.addTarget(self, action: #selector(GMStepper.buttonTouchUp), for: .touchCancel)
169201 return button
170202 }()
171203
172204 lazy var label: UILabel = {
173205 let label = UILabel()
174− label.textAlignment = .Center
206+ label.textAlignment = .center
175207 if self.showIntegerIfDoubleIsInteger && floor(self.value) == self.value {
176208 label.text = String(stringInterpolationSegment: Int(self.value))
177209 } else {
@@ -180,8 +212,10 @@ import UIKit
180212 label.textColor = self.labelTextColor
181213 label.backgroundColor = self.labelBackgroundColor
182214 label.font = self.labelFont
183− label.userInteractionEnabled = true
184− let panRecognizer = UIPanGestureRecognizer(target: self, action: "handlePan:")
215+ label.layer.cornerRadius = self.labelCornerRadius
216+ label.layer.masksToBounds = true
217+ label.isUserInteractionEnabled = true
218+ let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(GMStepper.handlePan))
185219 panRecognizer.maximumNumberOfTouches = 1
186220 label.addGestureRecognizer(panRecognizer)
187221 return label
@@ -209,9 +243,33 @@ import UIKit
209243 }
210244 }
211245 }
246+
247+
248+ @objc public var items : [String] = [] {
249+ didSet {
250+ let isInteger = floor(value) == value
251+
252+ //
253+ // If we have items, we will display them as steps
254+ //
255+
256+ if isInteger && stepValue == 1.0 && items.count > 0 {
257+
258+ var value = Int(self.value)
259+
260+ if value >= items.count {
261+ value = items.count - 1
262+ self.value = Double(value)
263+ }
264+ else {
265+ label.text = items[value]
266+ }
267+ }
268+ }
269+ }
212270
213271 /// Timer used for autorepeat option
214− var timer: NSTimer?
272+ var timer: Timer?
215273
216274 /** When UIStepper reaches its top speed, it alters the value with a time interval of ~0.05 sec.
217275 The user pressing and holding on the stepper repeatedly:
@@ -219,7 +277,7 @@ import UIKit
219277 - For the next 1.5 sec, it changes the value every 0.1 sec.
220278 - Then, every 0.05 sec.
221279 */
222− let timerInterval = NSTimeInterval(0.05)
280+ let timerInterval = TimeInterval(0.05)
223281
224282 /// Check the handleTimerFire: function. While it is counting the number of fires, it decreases the mod value so that the value is altered more frequently.
225283 var timerFireCount = 0
@@ -233,25 +291,12 @@ import UIKit
233291 }
234292 }
235293
236− /// Useful for logging the timer interval. You can call this in the timer handler to test the autorepeat option.
237− lazy var printTimerGaps: () -> () = {
238− var prevTime: CFAbsoluteTime?
239−
240− return { _ in
241− var now = CFAbsoluteTimeGetCurrent()
242− if let prevTime = prevTime {
243− println(now - prevTime)
244− }
245− prevTime = now
246− }
247− }()
248−
249− required public init(coder aDecoder: NSCoder) {
294+ @objc required public init?(coder aDecoder: NSCoder) {
250295 super.init(coder: aDecoder)
251296 setup()
252297 }
253298
254− public override init(frame: CGRect) {
299+ @objc public override init(frame: CGRect) {
255300 super.init(frame: frame)
256301 setup()
257302 }
@@ -264,6 +309,9 @@ import UIKit
264309 backgroundColor = buttonsBackgroundColor
265310 layer.cornerRadius = cornerRadius
266311 clipsToBounds = true
312+ labelOriginalCenter = label.center
313+
314+ NotificationCenter.default.addObserver(self, selector: #selector(GMStepper.reset), name: NSNotification.Name.UIApplicationWillResignActive, object: nil)
267315 }
268316
269317 public override func layoutSubviews() {
@@ -286,21 +334,39 @@ import UIKit
286334 value -= stepValue
287335 }
288336 }
337+
338+ deinit {
339+ resetTimer()
340+ NotificationCenter.default.removeObserver(self)
341+ }
342+
343+ /// Useful closure for logging the timer interval. You can call this in the timer handler to test the autorepeat option. Not used in the current implementation.
344+// lazy var printTimerGaps: () -> () = {
345+// var prevTime: CFAbsoluteTime?
346+//
347+// return { _ in
348+// var now = CFAbsoluteTimeGetCurrent()
349+// if let prevTime = prevTime {
350+// print(now - prevTime)
351+// }
352+// prevTime = now
353+// }
354+// }()
289355}
290356
291357// MARK: Pan Gesture
292358extension GMStepper {
293− func handlePan(gesture: UIPanGestureRecognizer) {
294− leftButton.enabled = false
295− rightButton.enabled = false
296−
359+ @objc func handlePan(gesture: UIPanGestureRecognizer) {
297360 switch gesture.state {
298− case .Changed:
299− var translation = gesture.translationInView(label)
300− gesture.setTranslation(CGPointZero, inView: label)
361+ case .began:
362+ leftButton.isEnabled = false
363+ rightButton.isEnabled = false
364+ case .changed:
365+ let translation = gesture.translation(in: label)
366+ gesture.setTranslation(CGPoint.zero, in: label)
301367
302− var slidingRight = gesture.velocityInView(label).x > 0
303− var slidingLeft = gesture.velocityInView(label).x < 0
368+ let slidingRight = gesture.velocity(in: label).x > 0
369+ let slidingLeft = gesture.velocity(in: label).x < 0
304370
305371 // Move the label with pan
306372 if slidingRight {
@@ -333,22 +399,23 @@ extension GMStepper {
333399 self.rightButton.backgroundColor = self.buttonsBackgroundColor
334400 self.leftButton.backgroundColor = self.buttonsBackgroundColor
335401 }
336−
337− case .Ended:
402+ case .ended, .cancelled, .failed:
338403 reset()
339404 default:
340405 break
341406 }
342407 }
343408
344− func reset() {
409+ @objc func reset() {
345410 panState = .Stable
346411 stepperState = .Stable
347412 resetTimer()
348− leftButton.enabled = true
349− rightButton.enabled = true
350413
351− UIView.animateWithDuration(self.labelSlideDuration, animations: {
414+ leftButton.isEnabled = true
415+ rightButton.isEnabled = true
416+ label.isUserInteractionEnabled = true
417+
418+ UIView.animate(withDuration: self.labelSlideDuration, animations: {
352419 self.label.center = self.labelOriginalCenter
353420 self.rightButton.backgroundColor = self.buttonsBackgroundColor
354421 self.leftButton.backgroundColor = self.buttonsBackgroundColor
@@ -358,9 +425,9 @@ extension GMStepper {
358425
359426// MARK: Button Events
360427extension GMStepper {
361− func leftButtonTouchDown(button: UIButton) {
362− rightButton.enabled = false
363− label.userInteractionEnabled = false
428+ @objc func leftButtonTouchDown(button: UIButton) {
429+ rightButton.isEnabled = false
430+ label.isUserInteractionEnabled = false
364431 resetTimer()
365432
366433 if value == minimumValue {
@@ -372,9 +439,9 @@ extension GMStepper {
372439
373440 }
374441
375− func rightButtonTouchDown(button: UIButton) {
376− leftButton.enabled = false
377− label.userInteractionEnabled = false
442+ @objc func rightButtonTouchDown(button: UIButton) {
443+ leftButton.isEnabled = false
444+ label.isUserInteractionEnabled = false
378445 resetTimer()
379446
380447 if value == maximumValue {
@@ -385,9 +452,8 @@ extension GMStepper {
385452 }
386453 }
387454
388− func buttonTouchUp(button: UIButton) {
455+ @objc func buttonTouchUp(button: UIButton) {
389456 reset()
390− label.userInteractionEnabled = true
391457 }
392458}
393459
@@ -395,20 +461,20 @@ extension GMStepper {
395461extension GMStepper {
396462
397463 func animateSlideLeft() {
398− UIView.animateWithDuration(labelSlideDuration) {
464+ UIView.animate(withDuration: labelSlideDuration) {
399465 self.label.center.x -= self.labelSlideLength
400466 }
401467 }
402468
403469 func animateSlideRight() {
404− UIView.animateWithDuration(labelSlideDuration) {
470+ UIView.animate(withDuration: labelSlideDuration) {
405471 self.label.center.x += self.labelSlideLength
406472 }
407473 }
408474
409475 func animateToOriginalPosition() {
410476 if self.label.center != self.labelOriginalCenter {
411− UIView.animateWithDuration(labelSlideDuration) {
477+ UIView.animate(withDuration: labelSlideDuration) {
412478 self.label.center = self.labelOriginalCenter
413479 }
414480 }
@@ -416,14 +482,14 @@ extension GMStepper {
416482
417483 func animateLimitHitIfNeeded() {
418484 if value == minimumValue {
419− animateLimitHitForButton(leftButton)
485+ animateLimitHitForButton(button: leftButton)
420486 } else if value == maximumValue {
421− animateLimitHitForButton(rightButton)
487+ animateLimitHitForButton(button: rightButton)
422488 }
423489 }
424490
425491 func animateLimitHitForButton(button: UIButton){
426− UIView.animateWithDuration(limitHitAnimationDuration) {
492+ UIView.animate(withDuration: limitHitAnimationDuration) {
427493 button.backgroundColor = self.limitHitAnimationColor
428494 }
429495 }
@@ -431,7 +497,7 @@ extension GMStepper {
431497
432498// MARK: Timer
433499extension GMStepper {
434− func handleTimerFire(timer: NSTimer) {
500+ @objc func handleTimerFire(timer: Timer) {
435501 timerFireCount += 1
436502
437503 if timerFireCount % timerFireCountModulo == 0 {
@@ -440,7 +506,7 @@ extension GMStepper {
440506 }
441507
442508 func scheduleTimer() {
443− timer = NSTimer.scheduledTimerWithTimeInterval(timerInterval, target: self, selector: "handleTimerFire:", userInfo: nil, repeats: true)
509+ timer = Timer.scheduledTimer(timeInterval: timerInterval, target: self, selector: #selector(GMStepper.handleTimerFire), userInfo: nil, repeats: true)
444510 }
445511
446512 func resetTimer() {
@@ -452,4 +518,4 @@ extension GMStepper {
452518 }
453519
454520
455−}
521+}