From 3eca79da1557af5878079bf8efb62e8f660a2d7b Mon Sep 17 00:00:00 2001 From: emrcftci Date: Sun, 10 Nov 2019 16:29:52 +0300 Subject: [PATCH 1/2] refactor(SkyFloatingLabelTextField): Fix SkyFloatingLabelTextField.swift - Use one-liner if statement in `updateTextAligment` function - Delete redundant `self` in `configureDefaultLineHeight` function --- Sources/SkyFloatingLabelTextField.swift | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Sources/SkyFloatingLabelTextField.swift b/Sources/SkyFloatingLabelTextField.swift index 0578e8e..8a5f2fc 100644 --- a/Sources/SkyFloatingLabelTextField.swift +++ b/Sources/SkyFloatingLabelTextField.swift @@ -27,13 +27,9 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty } fileprivate func updateTextAligment() { - if isLTRLanguage { - textAlignment = .left - titleLabel.textAlignment = .left - } else { - textAlignment = .right - titleLabel.textAlignment = .right - } + let alignment: NSTextAlignment = isLTRLanguage ? .left : .right + textAlignment = alignment + titleLabel.textAlignment = alignment } // MARK: Animation timing @@ -375,7 +371,7 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty fileprivate func configureDefaultLineHeight() { let onePixel: CGFloat = 1.0 / UIScreen.main.scale lineHeight = 2.0 * onePixel - selectedLineHeight = 2.0 * self.lineHeight + selectedLineHeight = 2.0 * lineHeight } // MARK: Responder handling From 73d0c27de25c173e095ec051622a8e040234bd5d Mon Sep 17 00:00:00 2001 From: emrcftci Date: Sun, 10 Nov 2019 16:30:59 +0300 Subject: [PATCH 2/2] fix(tests): Fix warnings in SkyFloatingLabelTextFieldTests - Fix warnings related to deprecated syntax in SkyFloatingLabelTextFieldTests --- .../SkyFloatingLabelTextFieldTests.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift index 80ef5bc..826875d 100644 --- a/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift +++ b/SkyFloatingLabelTextField/SkyFloatingLabelTextFieldTests/SkyFloatingLabelTextFieldTests.swift @@ -53,7 +53,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ let customColor = UIColor.red floatingLabelTextField.placeholder = "test" var fullRange = - NSRange(location: 0, length: floatingLabelTextField.placeholder!.characters.count) + NSRange(location: 0, length: floatingLabelTextField.placeholder!.count) // when floatingLabelTextField.placeholderColor = customColor @@ -214,7 +214,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ floatingLabelTextField.isEnabled = true floatingLabelTextField.placeholder = "test" var fullRange = - NSRange(location: 0, length: floatingLabelTextField.placeholder!.characters.count) + NSRange(location: 0, length: floatingLabelTextField.placeholder!.count) // when floatingLabelTextField.disabledColor = self.customColor @@ -271,7 +271,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ floatingLabelTextField.isEnabled = false floatingLabelTextField.placeholder = "test" var fullRange = - NSRange(location: 0, length: floatingLabelTextField.placeholder!.characters.count) + NSRange(location: 0, length: floatingLabelTextField.placeholder!.count) // when floatingLabelTextField.disabledColor = self.customColor @@ -319,7 +319,7 @@ class SkyFloatingLabelTextFieldTests: XCTestCase { // swiftlint:disable:this typ let customFont = UIFont() floatingLabelTextField.placeholder = "test" var fullRange = - NSRange(location: 0, length: floatingLabelTextField.placeholder!.characters.count) + NSRange(location: 0, length: floatingLabelTextField.placeholder!.count) // when floatingLabelTextField.placeholderFont = customFont