@@ -15,26 +15,26 @@ import UIKit
1515 didSet {
1616 value = min(maximumValue, max(minimumValue, value))
1717
18− label.text = formattedValue
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+ }
1932
2033 if oldValue != value {
2134 sendActions(for: .valueChanged)
2235 }
2336 }
2437 }
25−
26− private var formattedValue: String? {
27− let isInteger = Decimal(value).exponent >= 0
28−
29− // If we have items, we will display them as steps
30− if isInteger && stepValue == 1.0 && items.count > 0 {
31− return items[Int(value)]
32− }
33− else {
34− return formatter.string(from: NSNumber(value: value))
35− }
36− }
37−
3838
3939 /// Minimum value. Must be less than maximumValue. Defaults to 0.
4040 @objc @IBInspectable public var minimumValue: Double = 0 {
@@ -51,21 +51,13 @@ import UIKit
5151 }
5252
5353 /// Step/Increment value as in UIStepper. Defaults to 1.
54− @objc @IBInspectable public var stepValue: Double = 1 {
55− didSet {
56− setupNumberFormatter()
57− }
58− }
54+ @objc @IBInspectable public var stepValue: Double = 1
5955
6056 /// The same as UIStepper's autorepeat. If true, holding on the buttons or keeping the pan gesture alters the value repeatedly. Defaults to true.
6157 @objc @IBInspectable public var autorepeat: Bool = true
6258
6359 /// If the value is integer, it is shown without floating point.
64− @objc @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true {
65− didSet {
66− setupNumberFormatter()
67− }
68− }
60+ @objc @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
6961
7062 /// Text on the left button. Be sure that it fits in the button. Defaults to "−".
7163 @objc @IBInspectable public var leftButtonText: String = "−" {
@@ -172,9 +164,6 @@ import UIKit
172164 /// Color of the flashing animation on the buttons in case the value hit the limit.
173165 @objc @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
174166
175− /// Formatter for displaying the current value
176− let formatter = NumberFormatter()
177−
178167 /**
179168 Width of the sliding animation. When buttons clicked, the middle label does a slide animation towards to the clicked button. Defaults to 5.
180169 */
@@ -215,7 +204,11 @@ import UIKit
215204 lazy var label: UILabel = {
216205 let label = UILabel()
217206 label.textAlignment = .center
218− label.text = formattedValue
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+ }
219212 label.textColor = self.labelTextColor
220213 label.backgroundColor = self.labelBackgroundColor
221214 label.font = self.labelFont
@@ -254,7 +247,24 @@ import UIKit
254247
255248 @objc public var items : [String] = [] {
256249 didSet {
257− label.text = formattedValue
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+ }
258268 }
259269 }
260270
@@ -291,7 +301,7 @@ import UIKit
291301 setup()
292302 }
293303
294− fileprivate func setup() {
304+ func setup() {
295305 addSubview(leftButton)
296306 addSubview(rightButton)
297307 addSubview(label)
@@ -301,17 +311,7 @@ import UIKit
301311 clipsToBounds = true
302312 labelOriginalCenter = label.center
303313
304− setupNumberFormatter()
305−
306− NotificationCenter.default.addObserver(self, selector: #selector(GMStepper.reset), name: UIApplication.willResignActiveNotification, object: nil)
307− }
308−
309− func setupNumberFormatter() {
310− let decValue = Decimal(stepValue)
311− let digits = decValue.significantFractionalDecimalDigits
312− formatter.minimumIntegerDigits = 1
313− formatter.minimumFractionDigits = showIntegerIfDoubleIsInteger ? 0 : digits
314− formatter.maximumFractionDigits = digits
314+ NotificationCenter.default.addObserver(self, selector: #selector(GMStepper.reset), name: NSNotification.Name.UIApplicationWillResignActive, object: nil)
315315 }
316316
317317 public override func layoutSubviews() {
@@ -332,9 +332,8 @@ import UIKit
332332 value += stepValue
333333 } else if stepperState == .ShouldDecrease {
334334 value -= stepValue
335− }
335+ }
336336 }
337−
338337
339338 deinit {
340339 resetTimer()
@@ -517,11 +516,6 @@ extension GMStepper {
517516 timerFireCount = 0
518517 }
519518 }
520−}
521519
522520
523−extension Decimal {
524− var significantFractionalDecimalDigits: Int {
525− return max(-exponent, 0)
526− }
527521}