Merge pull request #98 from bennokress/master

@discardableResult for becomeFirstResponder() and resignFirstResponder()
Skyscanner · Jan 16, 2017 · 2658821 · 2658821
2 parents ff79f16 + 3a94c47
commit 2658821
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git 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
 ----

diff --git a/...elTextField/SkyFloatingLabelTextFieldExample/Example0/ShowcaseExampleViewController.swift b/...elTextField/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/...LabelTextField/SkyFloatingLabelTextFieldExample/Example1/SettingTextsViewController.swift b/...LabelTextField/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/...TextField/SkyFloatingLabelTextFieldExample/Example2/CustomizingColorsViewController.swift b/...TextField/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/...gLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift b/...gLabelTextField/SkyFloatingLabelTextFieldExample/Example3/SubclassingViewController.swift
@@ -33,6 +33,6 @@ class SubclassingViewController: UIViewController {
     }
 
     @IBAction func resignTextField() {
-        _ = self.textField?.resignFirstResponder()
+        self.textField?.resignFirstResponder()
     }
 }
diff --git a/...LabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift b/...LabelTextField/SkyFloatingLabelTextFieldExample/Example4/CustomLayoutViewController.swift
@@ -25,7 +25,7 @@ class CustomLayoutViewController: UIViewController {
     }
 
     @IBAction func resignTextField() {
-        _ = self.textField?.resignFirstResponder()
+        self.textField?.resignFirstResponder()
     }
 
 }
diff --git a/...elTextField/SkyFloatingLabelTextFieldExample/Example5/DelegateMethodsViewController.swift b/...elTextField/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/...loatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift b/...loatingLabelTextField/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
@@ -315,6 +315,7 @@ 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 {
         let result = super.becomeFirstResponder()
         self.updateControl(true)
@@ -325,6 +326,7 @@ 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 {
         let result =  super.resignFirstResponder()
         self.updateControl(true)