From b1ba5cc7644b9d380da0cae1e90519182aa04a2b Mon Sep 17 00:00:00 2001 From: Benno Kress Date: Mon, 16 Jan 2017 13:18:52 +0100 Subject: [PATCH 1/3] added @addDiscardableResult to becomeFirstResponder() and resignFirstResponder() to suppress warnings when using textfield.becomeFirstResponder() without "_ = " --- .../Example0/ShowcaseExampleViewController.swift | 2 +- .../Example1/SettingTextsViewController.swift | 2 +- .../Example2/CustomizingColorsViewController.swift | 2 +- .../Example3/SubclassingViewController.swift | 2 +- .../Example4/CustomLayoutViewController.swift | 2 +- .../Example5/DelegateMethodsViewController.swift | 2 +- .../SkyFloatingLabelTextFieldTests.swift | 6 +++--- Sources/SkyFloatingLabelTextField.swift | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift index 54d1a27..37b9437 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift @@ -28,7 +28,7 @@ class ShowcaseExampleViewController: UIViewController, UITextFieldDelegate { self.setupThemeColors() - _ = self.departureCityField.becomeFirstResponder() + self.departureCityField.becomeFirstResponder() } // MARK: - Creating the form elements diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift index 9aeafaa..dd0cc1b 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift @@ -25,7 +25,7 @@ class SettingTextsViewController: UIViewController { } @IBAction func resignTextField() { - _ = self.textField?.resignFirstResponder() + self.textField?.resignFirstResponder() } @IBAction func selectedTitleChanged(_ segmentedControl:UISegmentedControl) { diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift index 58f780a..94539f5 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift @@ -25,7 +25,7 @@ class CustomizingColorsViewController: UIViewController { } @IBAction func resignTextField() { - _ = self.textField?.resignFirstResponder() + self.textField?.resignFirstResponder() } @IBAction func titleColorChanged(_ segmentedControl:UISegmentedControl) { diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift index b9ae8db..65a6ef5 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift @@ -33,6 +33,6 @@ class SubclassingViewController: UIViewController { } @IBAction func resignTextField() { - _ = self.textField?.resignFirstResponder() + self.textField?.resignFirstResponder() } } diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift index c0885f2..fa34bc4 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift @@ -25,7 +25,7 @@ class CustomLayoutViewController: UIViewController { } @IBAction func resignTextField() { - _ = self.textField?.resignFirstResponder() + self.textField?.resignFirstResponder() } } diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example5/DelegateMethodsViewController.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example5/DelegateMethodsViewController.swift index e1b7e3e..fc6306d 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example5/DelegateMethodsViewController.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldExample/Example5/DelegateMethodsViewController.swift @@ -33,7 +33,7 @@ class DelegateMethodsViewController: UIViewController, UITextFieldDelegate { } @IBAction func resignTextField() { - _ = self.textField?.resignFirstResponder() + self.textField?.resignFirstResponder() } func log(text:String) { diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift index 62480c7..7796737 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift @@ -229,7 +229,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { floatingLabelTextField.errorMessage = "Error" // when - _ = floatingLabelTextField.becomeFirstResponder() + floatingLabelTextField.becomeFirstResponder() // then XCTAssertEqual(floatingLabelTextField.errorMessage, "Error") @@ -433,7 +433,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { let floatingLabelTextFieldSpy = SkyFloatingLabelTextFieldSpy() // when - _ = floatingLabelTextFieldSpy.becomeFirstResponder() + floatingLabelTextFieldSpy.becomeFirstResponder() // then XCTAssertTrue(floatingLabelTextFieldSpy.updateColorsInvoked) @@ -444,7 +444,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { let floatingLabelTextFieldSpy = SkyFloatingLabelTextFieldSpy() // when - _ = floatingLabelTextFieldSpy.resignFirstResponder() + floatingLabelTextFieldSpy.resignFirstResponder() // then XCTAssertTrue(floatingLabelTextFieldSpy.updateColorsInvoked) diff --git a/Sources/SkyFloatingLabelTextField.swift b/Sources/SkyFloatingLabelTextField.swift index 4b089f2..b3ddcd0 100644 --- a/Sources/SkyFloatingLabelTextField.swift +++ b/Sources/SkyFloatingLabelTextField.swift @@ -315,7 +315,7 @@ open class SkyFloatingLabelTextField: UITextField { Attempt the control to become the first responder - returns: True when successfull becoming the first responder */ - override open func becomeFirstResponder() -> Bool { + @discardableResult override open func becomeFirstResponder() -> Bool { let result = super.becomeFirstResponder() self.updateControl(true) return result @@ -325,7 +325,7 @@ open class SkyFloatingLabelTextField: UITextField { Attempt the control to resign being the first responder - returns: True when successfull resigning being the first responder */ - override open func resignFirstResponder() -> Bool { + @discardableResult override open func resignFirstResponder() -> Bool { let result = super.resignFirstResponder() self.updateControl(true) return result From 12b2572b788b8ea01cbb7364a0a5f29849db79a9 Mon Sep 17 00:00:00 2001 From: Benno Kress Date: Mon, 16 Jan 2017 14:57:52 +0100 Subject: [PATCH 2/3] moved @discardableResult to a separate line for readability --- Sources/SkyFloatingLabelTextField.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Sources/SkyFloatingLabelTextField.swift b/Sources/SkyFloatingLabelTextField.swift index b3ddcd0..33c8ed5 100644 --- a/Sources/SkyFloatingLabelTextField.swift +++ b/Sources/SkyFloatingLabelTextField.swift @@ -315,7 +315,8 @@ open class SkyFloatingLabelTextField: UITextField { Attempt the control to become the first responder - returns: True when successfull becoming the first responder */ - @discardableResult override open func becomeFirstResponder() -> Bool { + @discardableResult + override open func becomeFirstResponder() -> Bool { let result = super.becomeFirstResponder() self.updateControl(true) return result @@ -325,7 +326,8 @@ open class SkyFloatingLabelTextField: UITextField { Attempt the control to resign being the first responder - returns: True when successfull resigning being the first responder */ - @discardableResult override open func resignFirstResponder() -> Bool { + @discardableResult + override open func resignFirstResponder() -> Bool { let result = super.resignFirstResponder() self.updateControl(true) return result From 3a94c47507c1079869d8e788d42434b5cb02c2c2 Mon Sep 17 00:00:00 2001 From: Benno Kress Date: Mon, 16 Jan 2017 16:17:14 +0100 Subject: [PATCH 3/3] Added changes to CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78e57a6..dce6d64 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ Master(unreleased) ----------------- - +* Added `@discardableResult` to `becomeFirstResponder` and `resignFirstResponder`. This silences Xcode warnings about unused results of those functions and brings the implementation closer to the iOS API. v2.0 ----