From 0decefca09245e5ba9594c481f59360e53d449e1 Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Thu, 24 Nov 2016 16:11:47 +0900 Subject: [PATCH 1/2] Rename refreshing to isRefreshing --- RxCocoa/iOS/UIRefreshControl+Rx.swift | 6 ++++++ Tests/RxCocoaTests/UIRefreshControl+RxTests.swift | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RxCocoa/iOS/UIRefreshControl+Rx.swift b/RxCocoa/iOS/UIRefreshControl+Rx.swift index 1b97e672..9a38cb93 100644 --- a/RxCocoa/iOS/UIRefreshControl+Rx.swift +++ b/RxCocoa/iOS/UIRefreshControl+Rx.swift @@ -16,7 +16,13 @@ import RxSwift extension Reactive where Base: UIRefreshControl { /// Bindable sink for `beginRefreshing()`, `endRefreshing()` methods. + @available(*, deprecated, renamed: "isRefreshing") public var refreshing: UIBindingObserver { + return self.isRefreshing + } + + /// Bindable sink for `beginRefreshing()`, `endRefreshing()` methods. + public var isRefreshing: UIBindingObserver { return UIBindingObserver(UIElement: self.base) { refreshControl, refresh in if refresh { refreshControl.beginRefreshing() diff --git a/Tests/RxCocoaTests/UIRefreshControl+RxTests.swift b/Tests/RxCocoaTests/UIRefreshControl+RxTests.swift index 03f7a500..614e79ad 100644 --- a/Tests/RxCocoaTests/UIRefreshControl+RxTests.swift +++ b/Tests/RxCocoaTests/UIRefreshControl+RxTests.swift @@ -20,14 +20,14 @@ class UIRefreshControlTests : RxTest { extension UIRefreshControlTests { func testRefreshing_True() { let subject = UIRefreshControl() - Observable.just(true).subscribe(subject.rx.refreshing).dispose() + Observable.just(true).subscribe(subject.rx.isRefreshing).dispose() XCTAssertTrue(subject.isRefreshing == true) } func testRefreshing_False() { let subject = UIRefreshControl() - Observable.just(false).subscribe(subject.rx.refreshing).dispose() + Observable.just(false).subscribe(subject.rx.isRefreshing).dispose() XCTAssertTrue(subject.isRefreshing == false) } From 4befd811bc31aff3d84cdd2744cf81a747c04d6d Mon Sep 17 00:00:00 2001 From: Suyeol Jeon Date: Thu, 24 Nov 2016 16:12:06 +0900 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96b44a75..b7faa3b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. ## Master +* Renames `refreshing` to `isRefreshing`. + ## [3.0.1](https://github.com/ReactiveX/RxSwift/releases/tag/3.0.1) (Xcode 8 / Swift 3.0 compatible) #### Anomalies