-
Notifications
You must be signed in to change notification settings - Fork 31
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
Implement rex_animating for UIActivityIndicatorView #134
Merged
RuiAAPeres
merged 1 commit into
RACCommunity:master
from
e-kazakov:feature/UIActivityIndicatorView
Jul 6, 2016
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| // | ||
| // UIActivityIndicatorView.swift | ||
| // Rex | ||
| // | ||
| // Created by Evgeny Kazakov on 02/07/16. | ||
| // Copyright © 2016 Neil Pankey. All rights reserved. | ||
| // | ||
|
|
||
| import ReactiveCocoa | ||
| import UIKit | ||
|
|
||
| extension UIActivityIndicatorView { | ||
|
|
||
| /// Returns whether the receiver is animating. | ||
| /// `true` if the receiver is animating, otherwise `false`. | ||
| /// | ||
| /// Setting the value of this property to `true` starts animation of the progress indicator, | ||
| /// and setting it to `false` stops animation. | ||
| public var animating: Bool { | ||
| get { | ||
| return isAnimating() | ||
| } | ||
| set { | ||
| if newValue { | ||
| startAnimating() | ||
| } else { | ||
| stopAnimating() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Wraps an indicator's `animating` state in a bindable property. | ||
| public var rex_animating: MutableProperty<Bool> { | ||
| return associatedProperty(self, key: &animatingKey, initial: { $0.animating }, setter: { $0.animating = $1 }) | ||
| } | ||
|
|
||
| } | ||
|
|
||
| private var animatingKey: UInt8 = 0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // | ||
| // UIActivityIndicatorViewTests.swift | ||
| // Rex | ||
| // | ||
| // Created by Evgeny Kazakov on 02/07/16. | ||
| // Copyright © 2016 Neil Pankey. All rights reserved. | ||
| // | ||
|
|
||
| import XCTest | ||
| import ReactiveCocoa | ||
| import Result | ||
|
|
||
| class UIActivityIndicatorTests: XCTestCase { | ||
|
|
||
| weak var _activityIndicatorView: UIActivityIndicatorView? | ||
|
|
||
| override func tearDown() { | ||
| XCTAssert(_activityIndicatorView == nil, "Retain cycle detected in UIActivityIndicatorView properties") | ||
| super.tearDown() | ||
| } | ||
|
|
||
| func testRexAnimatingProperty() { | ||
| let indicatorView = UIActivityIndicatorView(frame: CGRectZero) | ||
| _activityIndicatorView = indicatorView | ||
|
|
||
| let (pipeSignal, observer) = Signal<Bool, NoError>.pipe() | ||
| indicatorView.rex_animating <~ SignalProducer(signal: pipeSignal) | ||
|
|
||
| observer.sendNext(true) | ||
| XCTAssertTrue(indicatorView.animating) | ||
| observer.sendNext(false) | ||
| XCTAssertFalse(indicatorView.animating) | ||
| } | ||
|
|
||
| func testAnimatingProperty() { | ||
| let indicatorView = UIActivityIndicatorView(frame: CGRectZero) | ||
|
|
||
| indicatorView.animating = true | ||
| XCTAssertTrue(indicatorView.isAnimating()) | ||
|
|
||
| indicatorView.animating = false | ||
| XCTAssertFalse(indicatorView.isAnimating()) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry for the late, but this seems confusing to me. I think the logic should be implemented in
rex_animatingdirectly.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#139.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for feedback. I just prefer having both bindable and normal properties, but was not sure if Rex needs normal one.