Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding set extension to UILabelExtensions (by vilapuigvila) #340

Merged
merged 1 commit into from Feb 5, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Expand Up @@ -42,6 +42,9 @@ Add subsequent changes that you make in this section.
9. **UIEdgeInsets**
- `init(inset: CGFloat)` in [[PR]](https://github.com/goktugyil/EZSwiftExtensions/pull/368) by *furuyan*

10. **UILabel**
- `set(text _text: String?, duration: TimeInterval)` in [[PR]](https://github.com/goktugyil/EZSwiftExtensions/pull/340) by *vilapuigvila*

## [Version 1.8]

### Fixed bugs
Expand Down
8 changes: 4 additions & 4 deletions EZSwiftExtensionsTests/UILabelTests.swift
Expand Up @@ -20,18 +20,18 @@ class UILabelTests: XCTestCase {
XCTAssertEqual(label2.font.pointSize, 20)
}

func testText() {
func testSet() {

let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 50))
label.setText("EZSwiftExtensions✅", animated: false, duration: nil)
label.set(text: "EZSwiftExtensions✅", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions✅")

label.text = ""
label.setText("EZSwiftExtensions🚀", animated: true, duration: 5)
label.set(text: "EZSwiftExtensions🚀", duration: 0)
XCTAssertEqual(label.text, "EZSwiftExtensions🚀")

label.text = ""
label.setText("EZSwiftExtensions❤️", animated: true, duration: nil)
label.set(text: "EZSwiftExtensions❤️", duration: 1)
XCTAssertEqual(label.text, "EZSwiftExtensions❤️")
}

Expand Down
17 changes: 6 additions & 11 deletions Sources/UILabelExtensions.swift
Expand Up @@ -56,16 +56,11 @@ extension UILabel {
self.fitHeight()
sizeToFit()
}

/// EZSwiftExtensions
public func setText(_ text: String?, animated: Bool, duration: TimeInterval?) {
if animated {
UIView.transition(with: self, duration: duration ?? 0.3, options: .transitionCrossDissolve, animations: { () -> Void in
self.text = text
}, completion: nil)
} else {
self.text = text
}


/// EZSwiftExtensions (if duration set to 0 animate wont be)
public func set(text _text: String?, duration: TimeInterval) {
UIView.transition(with: self, duration: duration, options: .transitionCrossDissolve, animations: { () -> Void in
self.text = _text
}, completion: nil)
}
}