on 07616aa help sign in
6 files changed+41−68
since splitsnapshots
unifiedsplit
.swift-version+1−1 GMStepper.podspec+2−2 GMStepper/GMStepper.swift+28−37 GMStepperExample/GMStepperExample.xcodeproj/project.pbxproj+6−23 GMStepperExample/GMStepperExample/ViewController.swift+1−1 README.md+3−4
.swift-version+1−1
@@ -1 +1 @@
1−4.0
1+3.0
GMStepper.podspec+2−2
@@ -1,9 +1,9 @@
11Pod::Spec.new do |s|
22 s.name = "GMStepper"
3− s.version = "2.1"
3+ s.version = "2.0.0"
44 s.summary = "A stepper with a sliding label in the middle."
55 s.homepage = "https://github.com/gmertk/GMStepper"
6− s.screenshots = "https://raw.githubusercontent.com/gmertk/GMStepper/master/Screenshots/screenshot_1.gif"
6+ s.screenshots = "https://dl.dropboxusercontent.com/u/4397140/pod-screenshots/screenshot_1.png"
77 s.license = 'MIT'
88 s.author = { "Gunay Mert Karadogan" => "mertkaradogan@gmail.com" }
99 s.source = { :git => "https://github.com/gmertk/GMStepper.git", :tag => s.version.to_s }
GMStepper/GMStepper.swift+28−37
@@ -11,7 +11,7 @@ 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+ @IBInspectable public var value: Double = 0 {
1515 didSet {
1616 value = min(maximumValue, max(minimumValue, value))
1717
@@ -37,44 +37,44 @@ import UIKit
3737 }
3838
3939 /// Minimum value. Must be less than maximumValue. Defaults to 0.
40− @objc @IBInspectable public var minimumValue: Double = 0 {
40+ @IBInspectable public var minimumValue: Double = 0 {
4141 didSet {
4242 value = min(maximumValue, max(minimumValue, value))
4343 }
4444 }
4545
4646 /// Maximum value. Must be more than minimumValue. Defaults to 100.
47− @objc @IBInspectable public var maximumValue: Double = 100 {
47+ @IBInspectable public var maximumValue: Double = 100 {
4848 didSet {
4949 value = min(maximumValue, max(minimumValue, value))
5050 }
5151 }
5252
5353 /// Step/Increment value as in UIStepper. Defaults to 1.
54− @objc @IBInspectable public var stepValue: Double = 1
54+ @IBInspectable public var stepValue: Double = 1
5555
5656 /// 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
57+ @IBInspectable public var autorepeat: Bool = true
5858
5959 /// If the value is integer, it is shown without floating point.
60− @objc @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
60+ @IBInspectable public var showIntegerIfDoubleIsInteger: Bool = true
6161
6262 /// Text on the left button. Be sure that it fits in the button. Defaults to "−".
63− @objc @IBInspectable public var leftButtonText: String = "−" {
63+ @IBInspectable public var leftButtonText: String = "−" {
6464 didSet {
6565 leftButton.setTitle(leftButtonText, for: .normal)
6666 }
6767 }
6868
6969 /// Text on the right button. Be sure that it fits in the button. Defaults to "+".
70− @objc @IBInspectable public var rightButtonText: String = "+" {
70+ @IBInspectable public var rightButtonText: String = "+" {
7171 didSet {
7272 rightButton.setTitle(rightButtonText, for: .normal)
7373 }
7474 }
7575
7676 /// Text color of the buttons. Defaults to white.
77− @objc @IBInspectable public var buttonsTextColor: UIColor = UIColor.white {
77+ @IBInspectable public var buttonsTextColor: UIColor = UIColor.white {
7878 didSet {
7979 for button in [leftButton, rightButton] {
8080 button.setTitleColor(buttonsTextColor, for: .normal)
@@ -83,7 +83,7 @@ import UIKit
8383 }
8484
8585 /// 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) {
86+ @IBInspectable public var buttonsBackgroundColor: UIColor = UIColor(red:0.21, green:0.5, blue:0.74, alpha:1) {
8787 didSet {
8888 for button in [leftButton, rightButton] {
8989 button.backgroundColor = buttonsBackgroundColor
@@ -93,7 +93,7 @@ import UIKit
9393 }
9494
9595 /// 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)! {
96+ public var buttonsFont = UIFont(name: "AvenirNext-Bold", size: 20.0)! {
9797 didSet {
9898 for button in [leftButton, rightButton] {
9999 button.titleLabel?.font = buttonsFont
@@ -102,35 +102,28 @@ import UIKit
102102 }
103103
104104 /// Text color of the middle label. Defaults to white.
105− @objc @IBInspectable public var labelTextColor: UIColor = UIColor.white {
105+ @IBInspectable public var labelTextColor: UIColor = UIColor.white {
106106 didSet {
107107 label.textColor = labelTextColor
108108 }
109109 }
110110
111111 /// 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) {
112+ @IBInspectable public var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1) {
113113 didSet {
114114 label.backgroundColor = labelBackgroundColor
115115 }
116116 }
117117
118118 /// 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)! {
119+ public var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)! {
120120 didSet {
121121 label.font = labelFont
122122 }
123123 }
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− }
131124
132125 /// Corner radius of the stepper's layer. Defaults to 4.0.
133− @objc @IBInspectable public var cornerRadius: CGFloat = 4.0 {
126+ @IBInspectable public var cornerRadius: CGFloat = 4.0 {
134127 didSet {
135128 layer.cornerRadius = cornerRadius
136129 clipsToBounds = true
@@ -138,7 +131,7 @@ import UIKit
138131 }
139132
140133 /// Border width of the stepper and middle label's layer. Defaults to 0.0.
141− @objc @IBInspectable public var borderWidth: CGFloat = 0.0 {
134+ @IBInspectable public var borderWidth: CGFloat = 0.0 {
142135 didSet {
143136 layer.borderWidth = borderWidth
144137 label.layer.borderWidth = borderWidth
@@ -146,7 +139,7 @@ import UIKit
146139 }
147140
148141 /// 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 {
142+ @IBInspectable public var borderColor: UIColor = UIColor.clear {
150143 didSet {
151144 layer.borderColor = borderColor.cgColor
152145 label.layer.borderColor = borderColor.cgColor
@@ -154,7 +147,7 @@ import UIKit
154147 }
155148
156149 /// 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 {
150+ @IBInspectable public var labelWidthWeight: CGFloat = 0.5 {
158151 didSet {
159152 labelWidthWeight = min(1, max(0, labelWidthWeight))
160153 setNeedsLayout()
@@ -162,7 +155,7 @@ import UIKit
162155 }
163156
164157 /// 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)
158+ @IBInspectable public var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alpha:1)
166159
167160 /**
168161 Width of the sliding animation. When buttons clicked, the middle label does a slide animation towards to the clicked button. Defaults to 5.
@@ -212,8 +205,6 @@ import UIKit
212205 label.textColor = self.labelTextColor
213206 label.backgroundColor = self.labelBackgroundColor
214207 label.font = self.labelFont
215− label.layer.cornerRadius = self.labelCornerRadius
216− label.layer.masksToBounds = true
217208 label.isUserInteractionEnabled = true
218209 let panRecognizer = UIPanGestureRecognizer(target: self, action: #selector(GMStepper.handlePan))
219210 panRecognizer.maximumNumberOfTouches = 1
@@ -245,7 +236,7 @@ import UIKit
245236 }
246237
247238
248− @objc public var items : [String] = [] {
239+ public var items : [String] = [] {
249240 didSet {
250241 let isInteger = floor(value) == value
251242
@@ -291,12 +282,12 @@ import UIKit
291282 }
292283 }
293284
294− @objc required public init?(coder aDecoder: NSCoder) {
285+ required public init?(coder aDecoder: NSCoder) {
295286 super.init(coder: aDecoder)
296287 setup()
297288 }
298289
299− @objc public override init(frame: CGRect) {
290+ public override init(frame: CGRect) {
300291 super.init(frame: frame)
301292 setup()
302293 }
@@ -356,7 +347,7 @@ import UIKit
356347
357348// MARK: Pan Gesture
358349extension GMStepper {
359− @objc func handlePan(gesture: UIPanGestureRecognizer) {
350+ func handlePan(gesture: UIPanGestureRecognizer) {
360351 switch gesture.state {
361352 case .began:
362353 leftButton.isEnabled = false
@@ -406,7 +397,7 @@ extension GMStepper {
406397 }
407398 }
408399
409− @objc func reset() {
400+ func reset() {
410401 panState = .Stable
411402 stepperState = .Stable
412403 resetTimer()
@@ -425,7 +416,7 @@ extension GMStepper {
425416
426417// MARK: Button Events
427418extension GMStepper {
428− @objc func leftButtonTouchDown(button: UIButton) {
419+ func leftButtonTouchDown(button: UIButton) {
429420 rightButton.isEnabled = false
430421 label.isUserInteractionEnabled = false
431422 resetTimer()
@@ -439,7 +430,7 @@ extension GMStepper {
439430
440431 }
441432
442− @objc func rightButtonTouchDown(button: UIButton) {
433+ func rightButtonTouchDown(button: UIButton) {
443434 leftButton.isEnabled = false
444435 label.isUserInteractionEnabled = false
445436 resetTimer()
@@ -452,7 +443,7 @@ extension GMStepper {
452443 }
453444 }
454445
455− @objc func buttonTouchUp(button: UIButton) {
446+ func buttonTouchUp(button: UIButton) {
456447 reset()
457448 }
458449}
@@ -497,7 +488,7 @@ extension GMStepper {
497488
498489// MARK: Timer
499490extension GMStepper {
500− @objc func handleTimerFire(timer: Timer) {
491+ func handleTimerFire(timer: Timer) {
501492 timerFireCount += 1
502493
503494 if timerFireCount % timerFireCountModulo == 0 {
GMStepperExample/GMStepperExample.xcodeproj/project.pbxproj+6−23
@@ -163,19 +163,18 @@
163163 attributes = {
164164 LastSwiftMigration = 0700;
165165 LastSwiftUpdateCheck = 0800;
166− LastUpgradeCheck = 0900;
166+ LastUpgradeCheck = 0800;
167167 ORGANIZATIONNAME = "Gunay Mert Karadogan";
168168 TargetAttributes = {
169169 3116C0D71DA4DD360015AC69 = {
170170 CreatedOnToolsVersion = 8.0;
171− LastSwiftMigration = 0900;
172171 ProvisioningStyle = Automatic;
173172 TestTargetID = 319C19311B4843EB005EFEE5;
174173 };
175174 319C19311B4843EB005EFEE5 = {
176175 CreatedOnToolsVersion = 6.4;
177176 DevelopmentTeam = 289M6XEDV4;
178− LastSwiftMigration = 0900;
177+ LastSwiftMigration = 0800;
179178 };
180179 };
181180 };
@@ -282,8 +281,7 @@
282281 PRODUCT_BUNDLE_IDENTIFIER = com.gmertk.GMStepperExampleTests;
283282 PRODUCT_NAME = "$(TARGET_NAME)";
284283 SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
285− SWIFT_SWIFT3_OBJC_INFERENCE = On;
286− SWIFT_VERSION = 4.0;
284+ SWIFT_VERSION = 3.0;
287285 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GMStepperExample.app/GMStepperExample";
288286 };
289287 name = Debug;
@@ -300,8 +298,7 @@
300298 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
301299 PRODUCT_BUNDLE_IDENTIFIER = com.gmertk.GMStepperExampleTests;
302300 PRODUCT_NAME = "$(TARGET_NAME)";
303− SWIFT_SWIFT3_OBJC_INFERENCE = On;
304− SWIFT_VERSION = 4.0;
301+ SWIFT_VERSION = 3.0;
305302 TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GMStepperExample.app/GMStepperExample";
306303 };
307304 name = Release;
@@ -314,20 +311,14 @@
314311 CLANG_CXX_LIBRARY = "libc++";
315312 CLANG_ENABLE_MODULES = YES;
316313 CLANG_ENABLE_OBJC_ARC = YES;
317− CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
318314 CLANG_WARN_BOOL_CONVERSION = YES;
319− CLANG_WARN_COMMA = YES;
320315 CLANG_WARN_CONSTANT_CONVERSION = YES;
321316 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
322317 CLANG_WARN_EMPTY_BODY = YES;
323318 CLANG_WARN_ENUM_CONVERSION = YES;
324319 CLANG_WARN_INFINITE_RECURSION = YES;
325320 CLANG_WARN_INT_CONVERSION = YES;
326− CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
327− CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
328321 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
329− CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
330− CLANG_WARN_STRICT_PROTOTYPES = YES;
331322 CLANG_WARN_SUSPICIOUS_MOVE = YES;
332323 CLANG_WARN_UNREACHABLE_CODE = YES;
333324 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -367,20 +358,14 @@
367358 CLANG_CXX_LIBRARY = "libc++";
368359 CLANG_ENABLE_MODULES = YES;
369360 CLANG_ENABLE_OBJC_ARC = YES;
370− CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
371361 CLANG_WARN_BOOL_CONVERSION = YES;
372− CLANG_WARN_COMMA = YES;
373362 CLANG_WARN_CONSTANT_CONVERSION = YES;
374363 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
375364 CLANG_WARN_EMPTY_BODY = YES;
376365 CLANG_WARN_ENUM_CONVERSION = YES;
377366 CLANG_WARN_INFINITE_RECURSION = YES;
378367 CLANG_WARN_INT_CONVERSION = YES;
379− CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
380− CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
381368 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
382− CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
383− CLANG_WARN_STRICT_PROTOTYPES = YES;
384369 CLANG_WARN_SUSPICIOUS_MOVE = YES;
385370 CLANG_WARN_UNREACHABLE_CODE = YES;
386371 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -414,8 +399,7 @@
414399 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
415400 PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
416401 PRODUCT_NAME = "$(TARGET_NAME)";
417− SWIFT_SWIFT3_OBJC_INFERENCE = Default;
418− SWIFT_VERSION = 4.0;
402+ SWIFT_VERSION = 3.0;
419403 };
420404 name = Debug;
421405 };
@@ -428,8 +412,7 @@
428412 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
429413 PRODUCT_BUNDLE_IDENTIFIER = "com.gunaymert.$(PRODUCT_NAME:rfc1034identifier)";
430414 PRODUCT_NAME = "$(TARGET_NAME)";
431− SWIFT_SWIFT3_OBJC_INFERENCE = Default;
432− SWIFT_VERSION = 4.0;
415+ SWIFT_VERSION = 3.0;
433416 };
434417 name = Release;
435418 };
GMStepperExample/GMStepperExample/ViewController.swift+1−1
@@ -16,7 +16,7 @@ class ViewController: UIViewController {
1616 stepper.addTarget(self, action: #selector(ViewController.stepperValueChanged), for: .valueChanged)
1717 }
1818
19− @objc func stepperValueChanged(stepper: GMStepper) {
19+ func stepperValueChanged(stepper: GMStepper) {
2020 print(stepper.value, terminator: "")
2121 }
2222}
README.md+3−4
@@ -5,6 +5,8 @@
55
66A stepper with a sliding label in the middle. Pan the label or tap the buttons. Check out the tutorial, [How to Build a Custom Stepper - Part 1](http://gmertk.github.io/custom-stepper-part-1/).
77
8+**I'm looking for a maintainer who is willing to keep this library updated. Feel free to contact me.**
9+
810
911## Screenshot
1012
@@ -69,9 +71,6 @@ var labelBackgroundColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, alph
6971/// Font of the middle label. Defaults to AvenirNext-Bold, 25.0 points in size.
7072var labelFont = UIFont(name: "AvenirNext-Bold", size: 25.0)
7173
72−/// Corner radius of the middle label's layer. Defaults to 0.0.
73−var labelCornerRadius: CGFloat = 0.0
74−
7574/// Corner radius of the stepper's layer. Defaults to 4.0.
7675var cornerRadius: CGFloat = 4.0
7776
@@ -91,7 +90,7 @@ var limitHitAnimationColor: UIColor = UIColor(red:0.26, green:0.6, blue:0.87, al
9190
9291## Authors
9392
94−* [Brent Whitman](https://github.com/bwhtmn) - Maintainer
93+* [Brent W.](https://github.com/bwhtmn) - Maintainer
9594* [Günay Mert Karadoğan](https://github.com/gmertk) - Creator
9695
9796## License