Skip to content

Commit 7508e98

Browse files
kyleweinerkyleweiner
committed
Use implicit references to self
1 parent 6b278b8 commit 7508e98

File tree

3 files changed

+52
-53
lines changed

3 files changed

+52
-53
lines changed

‎Demo/KWStepperDemo/Controllers/ViewController.swift

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ class ViewController: UIViewController, KWStepperDelegate {
2727
// MARK: Configuration
2828

2929
func configureStepper() {
30-
self.stepper = KWStepper(
31-
decrementButton: self.decrementButton,
32-
incrementButton: self.incrementButton)
30+
stepper = KWStepper(
31+
decrementButton: decrementButton,
32+
incrementButton: incrementButton)
3333

34-
if let stepper = self.stepper {
34+
if let stepper = stepper {
3535
stepper.addTarget(self,
3636
action: Selector("stepperDidChange"),
3737
forControlEvents: .ValueChanged)
@@ -50,30 +50,29 @@ class ViewController: UIViewController, KWStepperDelegate {
5050
}
5151

5252
func configureSwitches() {
53-
if let stepper = self.stepper {
54-
self.wrapsSwitch.on = stepper.wraps
55-
self.autoRepeatSwitch.on = stepper.autoRepeat
53+
if let stepper = stepper {
54+
wrapsSwitch.on = stepper.wraps
55+
autoRepeatSwitch.on = stepper.autoRepeat
5656
}
5757

58-
self.wrapsSwitch.addTarget(self,
58+
wrapsSwitch.addTarget(self,
5959
action: Selector("switchDidChange:"),
6060
forControlEvents: .ValueChanged)
6161

62-
self.autoRepeatSwitch.addTarget(self,
62+
autoRepeatSwitch.addTarget(self,
6363
action: Selector("switchDidChange:"),
6464
forControlEvents: .ValueChanged)
6565
}
6666

6767
// MARK: KWStepper Events
6868

6969
func stepperDidChange() {
70-
self.countLabel.text = NSString(format: "%.f", self.stepper!.value)
70+
countLabel.text = NSString(format: "%.f", stepper!.value)
7171
}
7272

7373
func stepperDidClampValue() {
74-
let stepper = self.stepper!
75-
let minValue = NSString(format: "%.f", stepper.minimumValue)
76-
let maxValue = NSString(format: "%.f", stepper.maximumValue)
74+
let minValue = NSString(format: "%.f", stepper!.minimumValue)
75+
let maxValue = NSString(format: "%.f", stepper!.maximumValue)
7776

7877
UIAlertView(
7978
title: "Stepper Limit Reached",
@@ -106,13 +105,13 @@ class ViewController: UIViewController, KWStepperDelegate {
106105
// MARK: UISwitch Events
107106

108107
func switchDidChange(sender: UISwitch) {
109-
if let stepper = self.stepper {
110-
if (sender === self.wrapsSwitch) {
111-
stepper.wraps = self.wrapsSwitch.on
108+
if let stepper = stepper {
109+
if (sender === wrapsSwitch) {
110+
stepper.wraps = wrapsSwitch.on
112111
}
113112

114-
if (sender === self.autoRepeatSwitch) {
115-
stepper.autoRepeat = self.autoRepeatSwitch.on
113+
if (sender === autoRepeatSwitch) {
114+
stepper.autoRepeat = autoRepeatSwitch.on
116115
}
117116
}
118117
}

‎Demo/KWStepperDemo/Views/CountLabel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import UIKit
1111
class CountLabel: UILabel {
1212

1313
override func awakeFromNib() {
14-
let descriptor = self.font.fontDescriptor().fontDescriptorByAddingAttributes([
14+
let descriptor = font.fontDescriptor().fontDescriptorByAddingAttributes([
1515
UIFontDescriptorFeatureSettingsAttribute: [
1616
[
1717
UIFontFeatureTypeIdentifierKey: kNumberSpacingType,
@@ -23,7 +23,7 @@ class CountLabel: UILabel {
2323
]
2424
]
2525
])
26-
self.font = UIFont(descriptor: descriptor, size: 0.0)
26+
font = UIFont(descriptor: descriptor, size: 0.0)
2727
}
2828

2929
}

‎KWStepper/KWStepper.swift

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class KWStepper: UIControl {
3535
var autoRepeat: Bool = true {
3636
didSet {
3737
if autoRepeatInterval <= 0 {
38-
self.autoRepeat = false
38+
autoRepeat = false
3939
}
4040
}
4141
}
@@ -46,8 +46,8 @@ class KWStepper: UIControl {
4646
var autoRepeatInterval: NSTimeInterval = 0.10 {
4747
didSet {
4848
if autoRepeatInterval <= 0 {
49-
self.autoRepeatInterval = 0.10;
50-
self.autoRepeat = false
49+
autoRepeatInterval = 0.10
50+
autoRepeat = false
5151
}
5252
}
5353
}
@@ -63,22 +63,22 @@ class KWStepper: UIControl {
6363
var value: Double = 0 {
6464
didSet {
6565
if value > oldValue {
66-
if let delegate = self.delegate {
66+
if let delegate = delegate {
6767
delegate.KWStepperDidIncrement?()
6868
}
6969
} else {
70-
if let delegate = self.delegate {
70+
if let delegate = delegate {
7171
delegate.KWStepperDidDecrement?()
7272
}
7373
}
7474

75-
if value < self.minimumValue {
76-
self.value = self.minimumValue
77-
} else if value > self.maximumValue {
78-
self.value = self.maximumValue
75+
if value < minimumValue {
76+
value = minimumValue
77+
} else if value > maximumValue {
78+
value = maximumValue
7979
}
80-
81-
self.sendActionsForControlEvents(.ValueChanged)
80+
81+
sendActionsForControlEvents(.ValueChanged)
8282
}
8383
}
8484

@@ -87,7 +87,7 @@ class KWStepper: UIControl {
8787
*/
8888
var minimumValue: Double = 0 {
8989
willSet {
90-
if newValue >= self.maximumValue {
90+
if newValue >= maximumValue {
9191
let reason = "KWStepper: minimumValue must be less than maximumValue."
9292
NSException(name: NSInvalidArgumentException, reason: reason, userInfo: nil).raise()
9393
}
@@ -99,7 +99,7 @@ class KWStepper: UIControl {
9999
*/
100100
var maximumValue: Double = 100 {
101101
willSet {
102-
if newValue <= self.minimumValue {
102+
if newValue <= minimumValue {
103103
let reason = "KWStepper: maximumValue must be greater than minimumValue."
104104
NSException(name: NSInvalidArgumentException, reason: reason, userInfo: nil).raise()
105105
}
@@ -157,36 +157,36 @@ class KWStepper: UIControl {
157157
// MARK: KWStepper
158158

159159
func decrementValue() {
160-
let decrementedValue: Double = self.value - self.decrementStepValue
160+
let decrementedValue: Double = value - decrementStepValue
161161

162-
if self.wraps && decrementedValue < self.minimumValue {
163-
self.value = self.maximumValue
162+
if wraps && decrementedValue < minimumValue {
163+
value = maximumValue
164164
return
165165
}
166166

167-
if decrementedValue >= self.minimumValue {
168-
self.value = decrementedValue
167+
if decrementedValue >= minimumValue {
168+
value = decrementedValue
169169
} else {
170170
endLongPress()
171-
if let delegate = self.delegate {
171+
if let delegate = delegate {
172172
delegate.KWStepperMinValueClamped?()
173173
}
174174
}
175175
}
176176

177177
func incrementValue() {
178-
let incrementedValue = self.value + self.incrementStepValue;
178+
let incrementedValue = value + incrementStepValue
179179

180-
if self.wraps && incrementedValue > self.maximumValue {
181-
self.value = self.minimumValue
180+
if wraps && incrementedValue > maximumValue {
181+
value = minimumValue
182182
return
183183
}
184184

185-
if (incrementedValue <= self.maximumValue) {
186-
self.value = incrementedValue;
185+
if (incrementedValue <= maximumValue) {
186+
value = incrementedValue
187187
} else {
188188
endLongPress()
189-
if let delegate = self.delegate {
189+
if let delegate = delegate {
190190
delegate.KWStepperMaxValueClamped?()
191191
}
192192
}
@@ -195,15 +195,15 @@ class KWStepper: UIControl {
195195
// MARK: User Interaction
196196

197197
func didLongPress(sender: UIGestureRecognizer) {
198-
if !self.autoRepeat {
198+
if !autoRepeat {
199199
return
200200
}
201201

202-
if self.longPressTimer == nil && sender.state == .Began {
203-
let selector = sender.view == self.incrementButton ? Selector("incrementValue") : Selector("decrementValue")
202+
if longPressTimer == nil && sender.state == .Began {
203+
let selector = sender.view == incrementButton ? Selector("incrementValue") : Selector("decrementValue")
204204

205-
self.longPressTimer = NSTimer.scheduledTimerWithTimeInterval(
206-
self.autoRepeatInterval,
205+
longPressTimer = NSTimer.scheduledTimerWithTimeInterval(
206+
autoRepeatInterval,
207207
target: self,
208208
selector: selector,
209209
userInfo: nil,
@@ -217,9 +217,9 @@ class KWStepper: UIControl {
217217
}
218218

219219
private func endLongPress() {
220-
if self.longPressTimer != nil {
221-
self.longPressTimer?.invalidate()
222-
self.longPressTimer = nil
220+
if longPressTimer != nil {
221+
longPressTimer?.invalidate()
222+
longPressTimer = nil
223223
}
224224
}
225225

0 commit comments

Comments
 (0)