@@ -11,79 +11,56 @@ import UIKit
1111@IBDesignable public class GMStepper: UIControl {
1212
1313 /// Current value of the stepper. Defaults to 0.
14− @objc @IBInspectable public var value: Double = 0 {
14+ public var value = 0 {
1515 didSet {
1616 value = min(maximumValue, max(minimumValue, value))
17−
18− let isInteger = floor(value) == value
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 {
28− label.text = String(stringInterpolationSegment: Int(value))
29− } else {
30− label.text = String(stringInterpolationSegment: value)
31− }
17+ label.text = String(value)
3218
3319 if oldValue != value {
34− sendActions(for: .valueChanged)
20+ sendActionsForControlEvents(.ValueChanged)
3521 }
3622 }
3723 }
3824
3925 /// Minimum value. Must be less than maximumValue. Defaults to 0.
40− @objc @IBInspectable public var minimumValue: Double = 0 {
26+ @IBInspectable public var minimumValue: Int = 0 {
4127 didSet {
42− value = min(maximumValue, max(minimumValue, value))
28+ value = 0
4329 }
4430 }
4531
46− /// Maximum value. Must be more than minimumValue. Defaults to 100.
47− @objc @IBInspectable public var maximumValue: Double = 100 {
32+ /// Maximum value. Must be more than minimumValue. Defaults to 10.
33+ @IBInspectable public var maximumValue: Int = 10 {
4834 didSet {
49− value = min(maximumValue, max(minimumValue, value))
35+ value = 0
5036 }
5137 }
5238
53− /// Step/Increment value as in UIStepper. Defaults to 1.
54− @objc @IBInspectable public var stepValue: Double = 1
55−
56− /// The same as UIStepper's autorepeat. If true, holding on the buttons or keeping the pan gesture alters the value repeatedly. Defaults to true.
57− @objc @IBInspectable public var autorepeat: Bool = true
58−
59− /// If the value is integer, it is shown without floating point.
60− @objc @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
61−
62− /// Text on the left button. Be sure that it fits in the button. Defaults to "−".
63− @objc @IBInspectable public var leftButtonText: String = "−" {
39+ /// Text on the left button. Be sure that it fits in the button. Defaults to "-".
40+ @IBInspectable public var leftButtonText: String = "-" {
6441 didSet {
65− leftButton.setTitle(leftButtonText, for: .normal)
42+ leftButton.setTitle(leftButtonText, forState: .Normal)
6643 }
6744 }
6845
6946 /// Text on the right button. Be sure that it fits in the button. Defaults to "+".
70− @objc @IBInspectable public var rightButtonText: String = "+" {
47+ @IBInspectable public var rightButtonText: String = "+" {
7148 didSet {
72− rightButton.setTitle(rightButtonText, for: .normal)
49+ rightButton.setTitle(rightButtonText, forState: .Normal)
7350 }
7451 }
7552
7653 /// Text color of the buttons. Defaults to white.
77− @objc @IBInspectable public var buttonsTextColor: UIColor = UIColor.white {
54+ @IBInspectable public var buttonsTextColor: UIColor = UIColor.whiteColor() {
7855 didSet {
7956 for button in [leftButton, rightButton] {
80− button.setTitleColor(buttonsTextColor, for: .normal)
57+ button.setTitleColor(buttonsTextColor, forState: .Normal)
8158 }
8259 }
8360 }
8461
8562 /// Background color of the buttons. Defaults to dark blue.
86− @objc @IBInspectable public var buttonsBackgroundColor: UIColor = UIColor(red:0.21, green:0.5, blue:0.74, alpha:1) {
63+ @IBInspectable public var buttonsBackgroundColor: UIColor = UIColor(red:0.21, green:0.5, blue:0.74, alpha:1) {
8764 didSet {
8865 for button in [leftButton, rightButton] {
8966 button.backgroundColor = buttonsBackgroundColor
@@ -93,7 +70,7 @@ import UIKit
9370 }
9471
9572 /// Font of the buttons. Defaults to AvenirNext-Bold, 20.0 points in size.
96− @objc public var buttonsFont = UIFont(name: "AvenirNext-Bold", size: 20.0)! {
73+ public var buttonsFont = UIFont(name: "AvenirNext-Bold", size: 20.0)! {
9774 didSet {
9875 for button in [leftButton, rightButton] {
9976 button.titleLabel?.font = buttonsFont
@@ -102,216 +79,108 @@ import UIKit
10279 }
10380
10481 /// Text color of the middle label. Defaults to white.
105− @objc @IBInspectable public var labelTextColor: UIColor = UIColor.white {
82+ @IBInspectable public var labelTextColor: UIColor = UIColor.whiteColor() {
10683 didSet {
10784 label.textColor = labelTextColor
10885 }
10986 }
11087
11188 /// Text color of the middle label. Defaults to lighter blue.
112− @objc @IBInspectable public var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1) {
89+ @IBInspectable public var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1) {
11390 didSet {
11491 label.backgroundColor = labelBackgroundColor
11592 }
11693 }
11794
11895 /// Font of the middle label. Defaults to AvenirNext-Bold, 25.0 points in size.
119− @objc public var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)! {
96+ public var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)! {
12097 didSet {
12198 label.font = labelFont
12299 }
123100 }
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− }
131101
132102 /// Corner radius of the stepper's layer. Defaults to 4.0.
133− @objc @IBInspectable public var cornerRadius: CGFloat = 4.0 {
103+ @IBInspectable public var cornerRadius: CGFloat = 4.0 {
134104 didSet {
135105 layer.cornerRadius = cornerRadius
136106 clipsToBounds = true
137107 }
138108 }
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− }
155109
156110 /// 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.
157− @objc @IBInspectable public var labelWidthWeight: CGFloat = 0.5 {
111+ @IBInspectable public var labelWidthWeight: CGFloat = 0.5 {
158112 didSet {
159113 labelWidthWeight = min(1, max(0, labelWidthWeight))
160114 setNeedsLayout()
161115 }
162116 }
163117
164− /// Color of the flashing animation on the buttons in case the value hit the limit.
165− @objc @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
166−
167118 /**
168119 Width of the sliding animation. When buttons clicked, the middle label does a slide animation towards to the clicked button. Defaults to 5.
169120 */
170− let labelSlideLength: CGFloat = 5
121+ private let labelSlideLength: CGFloat = 5
171122
172123 /// Duration of the sliding animation
173− let labelSlideDuration = TimeInterval(0.1)
174−
175− /// Duration of the animation when the value hits the limit.
176− let limitHitAnimationDuration = TimeInterval(0.1)
177−
178− lazy var leftButton: UIButton = {
179− let button = UIButton()
180− button.setTitle(self.leftButtonText, for: .normal)
181− button.setTitleColor(self.buttonsTextColor, for: .normal)
182− button.backgroundColor = self.buttonsBackgroundColor
183− button.titleLabel?.font = self.buttonsFont
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)
188− return button
189− }()
190−
191− lazy var rightButton: UIButton = {
192− let button = UIButton()
193− button.setTitle(self.rightButtonText, for: .normal)
194− button.setTitleColor(self.buttonsTextColor, for: .normal)
195− button.backgroundColor = self.buttonsBackgroundColor
196− button.titleLabel?.font = self.buttonsFont
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)
201− return button
202− }()
203−
204− lazy var label: UILabel = {
205− let label = UILabel()
206− label.textAlignment = .center
207− if self.showIntegerIfDoubleIsInteger && floor(self.value) == self.value {
208− label.text = String(stringInterpolationSegment: Int(self.value))
209− } else {
210− label.text = String(stringInterpolationSegment: self.value)
211− }
212− label.textColor = self.labelTextColor
213− label.backgroundColor = self.labelBackgroundColor
214− label.font = self.labelFont
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))
219− panRecognizer.maximumNumberOfTouches = 1
220− label.addGestureRecognizer(panRecognizer)
221− return label
222− }()
124+ private let labelSlideDuration: NSTimeInterval = 0.1
223125
224− var labelOriginalCenter: CGPoint!
225− var labelMaximumCenterX: CGFloat!
226− var labelMinimumCenterX: CGFloat!
126+ /// Duration of the flashing animation when the value hits the limit.
127+ private let limitHitAnimationDuration: NSTimeInterval = 0.1
227128
228− enum LabelPanState {
229− case Stable, HitRightEdge, HitLeftEdge
230− }
231− var panState = LabelPanState.Stable
129+ /// Color of the flashing animation on the buttons in case the value hit the limit.
130+ @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
232131
233− enum StepperState {
234− case Stable, ShouldIncrease, ShouldDecrease
235− }
236− var stepperState = StepperState.Stable {
237− didSet {
238− if stepperState != .Stable {
239− updateValue()
240− if autorepeat {
241− scheduleTimer()
242− }
243− }
244− }
245− }
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− }
132+ private let leftButton = UIButton()
133+ private let rightButton = UIButton()
134+ private let label = UILabel()
270135
271− /// Timer used for autorepeat option
272− var timer: Timer?
136+ private var labelOriginalCenter: CGPoint!
137+ private var labelMaximumCenterX: CGFloat!
138+ private var labelMinimumCenterX: CGFloat!
273139
274− /** When UIStepper reaches its top speed, it alters the value with a time interval of ~0.05 sec.
275− The user pressing and holding on the stepper repeatedly:
276− - First 2.5 sec, the stepper changes the value every 0.5 sec.
277− - For the next 1.5 sec, it changes the value every 0.1 sec.
278− - Then, every 0.05 sec.
279− */
280− let timerInterval = TimeInterval(0.05)
281−
282− /// 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.
283− var timerFireCount = 0
284− var timerFireCountModulo: Int {
285− if timerFireCount > 80 {
286− return 1 // 0.05 sec * 1 = 0.05 sec
287− } else if timerFireCount > 50 {
288− return 2 // 0.05 sec * 2 = 0.1 sec
289− } else {
290− return 10 // 0.05 sec * 10 = 0.5 sec
291− }
140+ private enum LabelPanState {
141+ case Stale, HitRightEdge, HitLeftEdge
292142 }
143+ private var panState = LabelPanState.Stale
293144
294− @objc required public init?(coder aDecoder: NSCoder) {
145+ required public init(coder aDecoder: NSCoder) {
295146 super.init(coder: aDecoder)
296147 setup()
297148 }
298149
299− @objc public override init(frame: CGRect) {
150+ public override init(frame: CGRect) {
300151 super.init(frame: frame)
301152 setup()
302153 }
303154
304− func setup() {
155+ private func setup() {
156+ leftButton.setTitle(leftButtonText, forState: .Normal)
157+ leftButton.setTitleColor(buttonsTextColor, forState: .Normal)
158+ leftButton.backgroundColor = buttonsBackgroundColor
159+ leftButton.titleLabel?.font = buttonsFont
160+ leftButton.addTarget(self, action: "leftButtonTapped:", forControlEvents: .TouchDown)
305161 addSubview(leftButton)
162+
163+ rightButton.setTitle(rightButtonText, forState: .Normal)
164+ rightButton.setTitleColor(buttonsTextColor, forState: .Normal)
165+ rightButton.backgroundColor = buttonsBackgroundColor
166+ rightButton.titleLabel?.font = buttonsFont
167+ rightButton.addTarget(self, action: "rightButtonTapped:", forControlEvents: .TouchDown)
306168 addSubview(rightButton)
169+
170+ label.textAlignment = .Center
171+ label.text = String(value)
172+ label.textColor = labelTextColor
173+ label.backgroundColor = labelBackgroundColor
174+ label.font = labelFont
307175 addSubview(label)
308176
309177 backgroundColor = buttonsBackgroundColor
310178 layer.cornerRadius = cornerRadius
311179 clipsToBounds = true
312− labelOriginalCenter = label.center
313180
314− NotificationCenter.default.addObserver(self, selector: #selector(GMStepper.reset), name: NSNotification.Name.UIApplicationWillResignActive, object: nil)
181+ let panRecognizer = UIPanGestureRecognizer(target: self, action: "handlePan:")
182+ label.userInteractionEnabled = true
183+ label.addGestureRecognizer(panRecognizer)
315184 }
316185
317186 public override func layoutSubviews() {
@@ -327,46 +196,60 @@ import UIKit
327196 labelOriginalCenter = label.center
328197 }
329198
330− func updateValue() {
331− if stepperState == .ShouldIncrease {
332− value += stepValue
333− } else if stepperState == .ShouldDecrease {
334− value -= stepValue
335− }
199+ @objc private func leftButtonTapped(button: UIButton) {
200+ if value == minimumValue {
201+ animateLimitHitForButton(leftButton)
202+ } else {
203+ value -= 1
204+ animateSlideLeft()
205+ }
336206 }
337207
338− deinit {
339− resetTimer()
340− NotificationCenter.default.removeObserver(self)
208+ @objc private func rightButtonTapped(button: UIButton) {
209+ if value == maximumValue {
210+ animateLimitHitForButton(rightButton)
211+ } else {
212+ value += 1
213+ animateSlideRight()
214+ }
341215 }
342216
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−// }()
355−}
217+ private func animateSlideLeft() {
218+ UIView.animateWithDuration(labelSlideDuration, animations: {
219+ self.label.center.x -= self.labelSlideLength
220+ }, completion: { _ in
221+ UIView.animateWithDuration(self.labelSlideDuration, animations: {
222+ self.label.center.x += self.labelSlideLength
223+ })
224+ })
225+ }
226+
227+ private func animateSlideRight() {
228+ UIView.animateWithDuration(labelSlideDuration, animations: {
229+ self.label.center.x += self.labelSlideLength
230+ }, completion: { _ in
231+ UIView.animateWithDuration(self.labelSlideDuration, animations: {
232+ self.label.center.x -= self.labelSlideLength
233+ })
234+ })
235+ }
236+
237+ private func animateLimitHitForButton(button: UIButton){
238+ UIView.animateWithDuration(limitHitAnimationDuration, animations: {
239+ button.backgroundColor = self.limitHitAnimationColor
240+ }, completion: { _ in
241+ button.backgroundColor = self.buttonsBackgroundColor
242+ })
243+ }
356244
357−// MARK: Pan Gesture
358−extension GMStepper {
359− @objc func handlePan(gesture: UIPanGestureRecognizer) {
245+ @objc private func handlePan(gesture: UIPanGestureRecognizer) {
360246 switch gesture.state {
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)
247+ case .Changed:
248+ var translation = gesture.translationInView(label)
249+ gesture.setTranslation(CGPointZero, inView: label)
367250
368− let slidingRight = gesture.velocity(in: label).x > 0
369− let slidingLeft = gesture.velocity(in: label).x < 0
251+ var slidingRight = gesture.velocityInView(label).x > 0
252+ var slidingLeft = gesture.velocityInView(label).x < 0
370253
371254 // Move the label with pan
372255 if slidingRight {
@@ -377,145 +260,46 @@ extension GMStepper {
377260
378261 // When the label hits the edges, increase/decrease value and change button backgrounds
379262 if label.center.x == labelMaximumCenterX {
380− // If not hit the right edge before, increase the value and start the timer. If already hit the edge, do nothing. Timer will handle it.
263+
264+ // Increase only once for each pan gesture
381265 if panState != .HitRightEdge {
382− stepperState = .ShouldIncrease
266+ value += 1
383267 panState = .HitRightEdge
384268 }
385−
386− animateLimitHitIfNeeded()
269+
270+ if value == maximumValue {
271+ rightButton.backgroundColor = self.limitHitAnimationColor
272+ }
387273 } else if label.center.x == labelMinimumCenterX {
274+
388275 if panState != .HitLeftEdge {
389− stepperState = .ShouldDecrease
276+ value -= 1
390277 panState = .HitLeftEdge
391278 }
392279
393− animateLimitHitIfNeeded()
280+ if value == minimumValue {
281+ leftButton.backgroundColor = self.limitHitAnimationColor
282+ }
394283 } else {
395− panState = .Stable
396− stepperState = .Stable
397− resetTimer()
398−
399− self.rightButton.backgroundColor = self.buttonsBackgroundColor
400− self.leftButton.backgroundColor = self.buttonsBackgroundColor
284+ leftButton.backgroundColor = buttonsBackgroundColor
285+ rightButton.backgroundColor = buttonsBackgroundColor
401286 }
402− case .ended, .cancelled, .failed:
287+
288+ case .Ended:
403289 reset()
404290 default:
405291 break
406292 }
407293 }
408294
409− @objc func reset() {
410− panState = .Stable
411− stepperState = .Stable
412− resetTimer()
295+ private func reset() {
296+ panState = .Stale
413297
414− leftButton.isEnabled = true
415− rightButton.isEnabled = true
416− label.isUserInteractionEnabled = true
417−
418− UIView.animate(withDuration: self.labelSlideDuration, animations: {
298+ UIView.animateWithDuration(self.labelSlideDuration, animations: {
419299 self.label.center = self.labelOriginalCenter
420300 self.rightButton.backgroundColor = self.buttonsBackgroundColor
421301 self.leftButton.backgroundColor = self.buttonsBackgroundColor
422302 })
423303 }
424−}
425−
426−// MARK: Button Events
427−extension GMStepper {
428− @objc func leftButtonTouchDown(button: UIButton) {
429− rightButton.isEnabled = false
430− label.isUserInteractionEnabled = false
431− resetTimer()
432−
433− if value == minimumValue {
434− animateLimitHitIfNeeded()
435− } else {
436− stepperState = .ShouldDecrease
437− animateSlideLeft()
438− }
439−
440− }
441−
442− @objc func rightButtonTouchDown(button: UIButton) {
443− leftButton.isEnabled = false
444− label.isUserInteractionEnabled = false
445− resetTimer()
446−
447− if value == maximumValue {
448− animateLimitHitIfNeeded()
449− } else {
450− stepperState = .ShouldIncrease
451− animateSlideRight()
452− }
453− }
454−
455− @objc func buttonTouchUp(button: UIButton) {
456− reset()
457− }
458−}
459−
460−// MARK: Animations
461−extension GMStepper {
462−
463− func animateSlideLeft() {
464− UIView.animate(withDuration: labelSlideDuration) {
465− self.label.center.x -= self.labelSlideLength
466− }
467− }
468−
469− func animateSlideRight() {
470− UIView.animate(withDuration: labelSlideDuration) {
471− self.label.center.x += self.labelSlideLength
472− }
473− }
474−
475− func animateToOriginalPosition() {
476− if self.label.center != self.labelOriginalCenter {
477− UIView.animate(withDuration: labelSlideDuration) {
478− self.label.center = self.labelOriginalCenter
479− }
480− }
481− }
482−
483− func animateLimitHitIfNeeded() {
484− if value == minimumValue {
485− animateLimitHitForButton(button: leftButton)
486− } else if value == maximumValue {
487− animateLimitHitForButton(button: rightButton)
488− }
489− }
490−
491− func animateLimitHitForButton(button: UIButton){
492− UIView.animate(withDuration: limitHitAnimationDuration) {
493− button.backgroundColor = self.limitHitAnimationColor
494− }
495− }
496−}
497−
498−// MARK: Timer
499−extension GMStepper {
500− @objc func handleTimerFire(timer: Timer) {
501− timerFireCount += 1
502−
503− if timerFireCount % timerFireCountModulo == 0 {
504− updateValue()
505− }
506− }
507−
508− func scheduleTimer() {
509− timer = Timer.scheduledTimer(timeInterval: timerInterval, target: self, selector: #selector(GMStepper.handleTimerFire), userInfo: nil, repeats: true)
510− }
511−
512− func resetTimer() {
513− if let timer = timer {
514− timer.invalidate()
515− self.timer = nil
516− timerFireCount = 0
517− }
518− }
519−
520304
521305}