Prefixes boolean properties with is and makes String? properties …

…consistent.

RxCocoa/Common/TextInput.swift

@@ -76,15 +76,15 @@ import Foundation
         /**
          Reactive wrapper for `text` property.
          */
-        public let text: ControlProperty<String>
+        public let text: ControlProperty<String?>
 
         /**
          Initializes new text input.
 
          - parameter base: Base object.
          - parameter text: Textual control property.
          */
-        public init(base: Base, text: ControlProperty<String>) {
+        public init(base: Base, text: ControlProperty<String?>) {
             self.base = base
             self.text = text
         }

RxCocoa/OSX/NSControl+Rx.swift

@@ -81,7 +81,7 @@ extension Reactive where Base: NSControl {
     /**
      Bindable sink for `enabled` property.
     */
-    public var enabled: UIBindingObserver<Base, Bool> {
+    public var isEnabled: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { (owner, value) in
             owner.isEnabled = value
         }

RxCocoa/OSX/NSTextField+Rx.swift

@@ -24,7 +24,7 @@ public class RxTextFieldDelegateProxy
     , NSTextFieldDelegate
     , DelegateProxyType {
 
-    fileprivate let textSubject = PublishSubject<String>()
+    fileprivate let textSubject = PublishSubject<String?>()
 
     /**
      Typed parent object.
@@ -104,15 +104,15 @@ extension Reactive where Base: NSTextField {
     /**
     Reactive wrapper for `text` property.
     */
-    public var text: ControlProperty<String> {
+    public var text: ControlProperty<String?> {
         let delegate = RxTextFieldDelegateProxy.proxyForObject(base)
 
         let source = Observable.deferred { [weak textField = self.base] in
-            delegate.textSubject.startWith(textField?.stringValue ?? "")
+            delegate.textSubject.startWith(textField?.stringValue)
         }.takeUntil(deallocated)
 
-        let observer = UIBindingObserver(UIElement: base) { control, value in
-            control.stringValue = value
+        let observer = UIBindingObserver(UIElement: base) { (control, value: String?) in
+            control.stringValue = value ?? ""
         }
 
         return ControlProperty(values: source, valueSink: observer.asObserver())

RxCocoa/OSX/NSView+Rx.swift

@@ -18,7 +18,7 @@
         /**
          Bindable sink for `hidden` property.
          */
-        public var hidden:  UIBindingObserver<Base, Bool> {
+        public var isHidden:  UIBindingObserver<Base, Bool> {
             return UIBindingObserver(UIElement: self.base) { view, value in
                 view.isHidden = value
             }

RxCocoa/iOS/UIActivityIndicatorView+Rx.swift

@@ -18,7 +18,7 @@ extension Reactive where Base: UIActivityIndicatorView {
     /**
     Bindable sink for `startAnimating()`, `stopAnimating()` methods.
     */
-    public var animating: UIBindingObserver<Base, Bool> {
+    public var isAnimating: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { activityIndicator, active in
             if active {
                 activityIndicator.startAnimating()

RxCocoa/iOS/UIAlertAction+Rx.swift

@@ -22,7 +22,7 @@ extension Reactive where Base: UIAlertAction {
     /**
      Bindable sink for `enabled` property.
      */
-    public var enabled: UIBindingObserver<Base, Bool> {
+    public var isEnabled: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { alertAction, value in
             alertAction.isEnabled = value
         }

RxCocoa/iOS/UIApplication+Rx.swift

@@ -20,7 +20,7 @@ import Foundation
         /**
          Bindable sink for `networkActivityIndicatorVisible`.
          */
-        public var networkActivityIndicatorVisible: UIBindingObserver<Base, Bool> {
+        public var isNetworkActivityIndicatorVisible: UIBindingObserver<Base, Bool> {
             return UIBindingObserver(UIElement: self.base) { application, active in
                 application.isNetworkActivityIndicatorVisible = active
             }

RxCocoa/iOS/UIBarButtonItem+Rx.swift

@@ -20,7 +20,7 @@ extension Reactive where Base: UIBarButtonItem {
     /**
     Bindable sink for `enabled` property.
     */
-    public var enabled: UIBindingObserver<Base, Bool> {
+    public var isEnabled: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { UIElement, value in
             UIElement.isEnabled = value
         }

RxCocoa/iOS/UIControl+Rx.swift

@@ -19,7 +19,7 @@ extension Reactive where Base: UIControl {
     /**
     Bindable sink for `enabled` property.
     */
-    public var enabled: UIBindingObserver<Base, Bool> {
+    public var isEnabled: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { control, value in
             control.isEnabled = value
         }
@@ -28,7 +28,7 @@ extension Reactive where Base: UIControl {
     /**
      Bindable sink for `selected` property.
      */
-    public var selected: UIBindingObserver<Base, Bool> {
+    public var isSelected: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { control, selected in
             control.isSelected = selected
         }

RxCocoa/iOS/UIScrollView+Rx.swift

@@ -54,7 +54,7 @@ extension Reactive where Base: UIScrollView {
     /**
     Bindable sink for `scrollEnabled` property.
     */
-    public var scrollEnabled: UIBindingObserver<Base, Bool> {
+    public var isScrollEnabled: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { scrollView, scrollEnabled in
             scrollView.isScrollEnabled = scrollEnabled
         }

RxCocoa/iOS/UISearchBar+Rx.swift

@@ -43,18 +43,18 @@ extension Reactive where Base: UISearchBar {
     /**
     Reactive wrapper for `text` property.
     */
-    public var text: ControlProperty<String> {
-        let source: Observable<String> = Observable.deferred { [weak searchBar = self.base as UISearchBar] () -> Observable<String> in
-            let text = searchBar?.text ?? ""
+    public var text: ControlProperty<String?> {
+        let source: Observable<String?> = Observable.deferred { [weak searchBar = self.base as UISearchBar] () -> Observable<String?> in
+            let text = searchBar?.text
 
             return (searchBar?.rx.delegate.methodInvoked(#selector(UISearchBarDelegate.searchBar(_:textDidChange:))) ?? Observable.empty())
                     .map { a in
-                        return a[1] as? String ?? ""
+                        return a[1] as? String
                     }
                     .startWith(text)
         }
 
-        let bindingObserver = UIBindingObserver(UIElement: self.base) { (searchBar, text: String) in
+        let bindingObserver = UIBindingObserver(UIElement: self.base) { (searchBar, text: String?) in
             searchBar.text = text
         }
 

RxCocoa/iOS/UIView+Rx.swift

@@ -18,7 +18,7 @@ extension Reactive where Base: UIView {
     /**
      Bindable sink for `hidden` property.
      */
-    public var hidden: UIBindingObserver<Base, Bool> {
+    public var isHidden: UIBindingObserver<Base, Bool> {
         return UIBindingObserver(UIElement: self.base) { view, hidden in
             view.isHidden = hidden
         }

RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesViewController.swift

@@ -49,7 +49,7 @@ class GitHubSearchRepositoriesViewController: ViewController, UITableViewDelegat
                     : Observable.empty()
             }
 
-        let searchResult = self.searchBar.rx.text.asDriver()
+        let searchResult = self.searchBar.rx.text.orEmpty.asDriver()
             .throttle(0.3)
             .distinctUntilChanged()
             .flatMapLatest { query -> Driver<RepositoriesState> in
@@ -94,7 +94,7 @@ class GitHubSearchRepositoriesViewController: ViewController, UITableViewDelegat
         // activity indicator in status bar
         // {
         GitHubSearchRepositoriesAPI.sharedAPI.activityIndicator
-            .drive(UIApplication.shared.rx.networkActivityIndicatorVisible)
+            .drive(UIApplication.shared.rx.isNetworkActivityIndicatorVisible)
             .addDisposableTo(disposeBag)
         // }
     }

RxExample/RxExample/Examples/GitHubSignup/UsingDriver/GitHubSignupViewController2.swift

@@ -64,7 +64,7 @@ class GitHubSignupViewController2 : ViewController {
             .addDisposableTo(disposeBag)
 
         viewModel.signingIn
-            .drive(signingUpOulet.rx.animating)
+            .drive(signingUpOulet.rx.isAnimating)
             .addDisposableTo(disposeBag)
 
         viewModel.signedIn

RxExample/RxExample/Examples/GitHubSignup/UsingVanillaObservables/GitHubSignupViewController1.swift

@@ -64,7 +64,7 @@ class GitHubSignupViewController1 : ViewController {
             .addDisposableTo(disposeBag)
 
         viewModel.signingIn
-            .bindTo(signingUpOulet.rx.animating)
+            .bindTo(signingUpOulet.rx.isAnimating)
             .addDisposableTo(disposeBag)
 
         viewModel.signedIn

RxExample/RxExample/Examples/OSX simple example/IntroductionExampleViewController.swift

@@ -27,7 +27,7 @@ class IntroductionExampleViewController : ViewController {
         showAlert("After you close this, prepare for a loud sound ...")
 
         // c = a + b
-        let sum = Observable.combineLatest(a.rx.text, b.rx.text) { (a: String, b: String) -> (Int, Int) in
+        let sum = Observable.combineLatest(a.rx.text.orEmpty, b.rx.text.orEmpty) { (a: String, b: String) -> (Int, Int) in
             return (Int(a) ?? 0, Int(b) ?? 0)
         }
 
@@ -62,7 +62,7 @@ class IntroductionExampleViewController : ViewController {
             })
             .addDisposableTo(disposeBag)
 
-        sliderValue.rx.text
+        sliderValue.rx.text.orEmpty
             .subscribe(onNext: { value in
                 let doubleValue = value.toDouble() ?? 0.0
                 self.slider.doubleValue = doubleValue

RxExample/RxExample/Examples/SimpleValidation/SimpleValidationViewController.swift

@@ -44,19 +44,19 @@ class SimpleValidationViewController : ViewController {
             .shareReplay(1)
 
         usernameValid
-            .bindTo(passwordOutlet.rx.enabled)
+            .bindTo(passwordOutlet.rx.isEnabled)
             .addDisposableTo(disposeBag)
 
         usernameValid
-            .bindTo(usernameValidOutlet.rx.hidden)
+            .bindTo(usernameValidOutlet.rx.isHidden)
             .addDisposableTo(disposeBag)
 
         passwordValid
-            .bindTo(passwordValidOutlet.rx.hidden)
+            .bindTo(passwordValidOutlet.rx.isHidden)
             .addDisposableTo(disposeBag)
 
         everythingValid
-            .bindTo(doSomethingOutlet.rx.enabled)
+            .bindTo(doSomethingOutlet.rx.isEnabled)
             .addDisposableTo(disposeBag)
 
         doSomethingOutlet.rx.tap

RxExample/RxExample/Examples/WikipediaImageSearch/Views/WikipediaSearchViewController.swift

@@ -43,7 +43,7 @@ class WikipediaSearchViewController: ViewController {
         // This is for clarity only, don't use static dependencies
         let API = DefaultWikipediaAPI.sharedAPI
 
-        let results = searchBar.rx.text
+        let results = searchBar.rx.text.orEmpty
             .asDriver()
             .throttle(0.3)
             .distinctUntilChanged()
@@ -66,7 +66,7 @@ class WikipediaSearchViewController: ViewController {
 
         results
             .map { $0.count != 0 }
-            .drive(self.emptyView.rx.hidden)
+            .drive(self.emptyView.rx.isHidden)
             .addDisposableTo(disposeBag)
     }
 
@@ -100,7 +100,7 @@ class WikipediaSearchViewController: ViewController {
             DefaultImageService.sharedImageService.loadingImage
         ) { $0 || $1 }
             .distinctUntilChanged()
-            .drive(UIApplication.shared.rx.networkActivityIndicatorVisible)
+            .drive(UIApplication.shared.rx.isNetworkActivityIndicatorVisible)
             .addDisposableTo(disposeBag)
     }
 }

Tests/RxCocoaTests/Control+RxTests+Cocoa.swift

@@ -15,7 +15,7 @@ import XCTest
 extension ControlTests {
     func testTextField_TextCompletesOnDealloc() {
         let createView: () -> NSTextField = { NSTextField(frame: CGRect(x: 0, y: 0, width: 1, height: 1)) }
-        ensurePropertyDeallocated(createView, "a") { (view: NSTextField) in view.rx.text }
+        ensurePropertyDeallocated(createView, "a") { (view: NSTextField) in view.rx.text.orEmpty }
     }
 }
 
@@ -29,15 +29,15 @@ extension ControlTests {
     func testControl_enabled_true() {
         let control = NSControl(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
 
-        _ = Observable.just(true).bindTo(control.rx.enabled)
+        _ = Observable.just(true).bindTo(control.rx.isEnabled)
 
         XCTAssertEqual(true, control.isEnabled)
     }
 
     func testControl_enabled_false() {
         let control = NSControl(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
 
-        _ = Observable.just(false).bindTo(control.rx.enabled)
+        _ = Observable.just(false).bindTo(control.rx.isEnabled)
 
         XCTAssertEqual(false, control.isEnabled)
     }

Tests/RxCocoaTests/Control+RxTests+UIKit.swift

@@ -14,31 +14,31 @@ import XCTest
 extension ControlTests {
     func testSubscribeEnabledToTrue() {
         let subject = UIControl()
-        let disposable = Observable.just(true).subscribe(subject.rx.enabled)
+        let disposable = Observable.just(true).subscribe(subject.rx.isEnabled)
         defer { disposable.dispose() }
 
         XCTAssert(subject.isEnabled == true, "Expected enabled set to true")
     }
 
     func testSubscribeEnabledToFalse() {
         let subject = UIControl()
-        let disposable = Observable.just(false).subscribe(subject.rx.enabled)
+        let disposable = Observable.just(false).subscribe(subject.rx.isEnabled)
         defer { disposable.dispose() }
 
         XCTAssert(subject.isEnabled == false, "Expected enabled set to false")
     }
 
     func testSubscribedSelectedToTrue() {
         let subject = UIControl()
-        let disposable = Observable.just(true).subscribe(subject.rx.selected)
+        let disposable = Observable.just(true).subscribe(subject.rx.isSelected)
         defer { disposable.dispose() }
 
         XCTAssert(subject.isSelected == true, "Expected selected set to true")
     }
 
     func testSubscribeSelectedToFalse() {
         let subject = UIControl()
-        let disposable = Observable.just(false).subscribe(subject.rx.selected)
+        let disposable = Observable.just(false).subscribe(subject.rx.isSelected)
         defer { disposable.dispose() }
 
         XCTAssert(subject.isSelected == false, "Expected selected set to false")
@@ -126,14 +126,14 @@ extension ControlTests {
 // UIActivityIndicatorView
 extension ControlTests {
     func testActivityIndicator_HasWeakReference() {
-        ensureControlObserverHasWeakReference(UIActivityIndicatorView(), { (view: UIActivityIndicatorView) -> AnyObserver<Bool> in view.rx.animating.asObserver() }, { Variable<Bool>(true).asObservable() })
+        ensureControlObserverHasWeakReference(UIActivityIndicatorView(), { (view: UIActivityIndicatorView) -> AnyObserver<Bool> in view.rx.isAnimating.asObserver() }, { Variable<Bool>(true).asObservable() })
     }
 
     func testActivityIndicator_NextElementsSetsValue() {
         let subject = UIActivityIndicatorView()
         let boolSequence = Variable<Bool>(false)
 
-        let disposable = boolSequence.asObservable().bindTo(subject.rx.animating)
+        let disposable = boolSequence.asObservable().bindTo(subject.rx.isAnimating)
         defer { disposable.dispose() }
 
         boolSequence.value = true
@@ -148,14 +148,14 @@ extension ControlTests {
 extension ControlTests {
     func testAlertAction_Enable() {
         let subject = UIAlertAction()
-        Observable.just(false).subscribe(subject.rx.enabled).dispose()
+        Observable.just(false).subscribe(subject.rx.isEnabled).dispose()
 
         XCTAssertTrue(subject.isEnabled == false)
     }
 
     func testAlertAction_Disable() {
         let subject = UIAlertAction()
-        Observable.just(true).subscribe(subject.rx.enabled).dispose()
+        Observable.just(true).subscribe(subject.rx.isEnabled).dispose()
 
         XCTAssertTrue(subject.isEnabled == true)
     }

Tests/RxCocoaTests/NSControl+RxTests.swift

@@ -18,14 +18,14 @@ class NSControlTests : RxTest {
 extension NSControlTests {
     func testEnabled_False() {
         let subject = NSButton(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
-        Observable.just(false).subscribe(subject.rx.enabled).dispose()
+        Observable.just(false).subscribe(subject.rx.isEnabled).dispose()
 
         XCTAssertTrue(subject.isEnabled == false)
     }
 
     func testEnabled_True() {
         let subject = NSButton(frame: CGRect(x: 0, y: 0, width: 1, height: 1))
-        Observable.just(true).subscribe(subject.rx.enabled).dispose()
+        Observable.just(true).subscribe(subject.rx.isEnabled).dispose()
 
         XCTAssertTrue(subject.isEnabled == true)
     }

Tests/RxCocoaTests/NSView+RxTests.swift

@@ -18,14 +18,14 @@ class NSViewTests : RxTest {
 extension NSViewTests {
     func testHidden_True() {
         let subject = NSView(frame: CGRect.zero)
-        Observable.just(true).subscribe(subject.rx.hidden).dispose()
+        Observable.just(true).subscribe(subject.rx.isHidden).dispose()
 
         XCTAssertTrue(subject.isHidden == true)
     }
 
     func testHidden_False() {
         let subject = NSView(frame: CGRect.zero)
-        Observable.just(false).subscribe(subject.rx.hidden).dispose()
+        Observable.just(false).subscribe(subject.rx.isHidden).dispose()
 
         XCTAssertTrue(subject.isHidden == false)
     }