From 1afcf5a8e1171b6ad2e32ca2b0d208c32ae3fa8f Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Sat, 3 Sep 2016 22:58:56 +0200 Subject: [PATCH] Adapts UITextView extensions to Swift 3.0 syntax. --- RxCocoa/iOS/UITextView+Rx.swift | 16 ++++++++-------- Tests/RxCocoaTests/UITextView+RxTests.swift | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RxCocoa/iOS/UITextView+Rx.swift b/RxCocoa/iOS/UITextView+Rx.swift index 0db527af..752019f6 100644 --- a/RxCocoa/iOS/UITextView+Rx.swift +++ b/RxCocoa/iOS/UITextView+Rx.swift @@ -69,8 +69,8 @@ extension Reactive where Base: UITextView { /** Reactive wrapper for `delegate` message. */ - public var rx_didBeginEditing: ControlEvent<()> { - return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidBeginEditing(_:))) + public var didBeginEditing: ControlEvent<()> { + return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidBeginEditing(_:))) .map { a in return () }) @@ -79,8 +79,8 @@ extension Reactive where Base: UITextView { /** Reactive wrapper for `delegate` message. */ - public var rx_didEndEditing: ControlEvent<()> { - return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidEndEditing(_:))) + public var didEndEditing: ControlEvent<()> { + return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidEndEditing(_:))) .map { a in return () }) @@ -89,8 +89,8 @@ extension Reactive where Base: UITextView { /** Reactive wrapper for `delegate` message. */ - public var rx_didChange: ControlEvent<()> { - return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidChange(_:))) + public var didChange: ControlEvent<()> { + return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidChange(_:))) .map { a in return () }) @@ -99,8 +99,8 @@ extension Reactive where Base: UITextView { /** Reactive wrapper for `delegate` message. */ - public var rx_didChangeSelection: ControlEvent<()> { - return ControlEvent<()>(events: self.rx_delegate.observe(#selector(UITextViewDelegate.textViewDidChangeSelection(_:))) + public var didChangeSelection: ControlEvent<()> { + return ControlEvent<()>(events: self.delegate.observe(#selector(UITextViewDelegate.textViewDidChangeSelection(_:))) .map { a in return () }) diff --git a/Tests/RxCocoaTests/UITextView+RxTests.swift b/Tests/RxCocoaTests/UITextView+RxTests.swift index 72fa6113..6fafc8cf 100644 --- a/Tests/RxCocoaTests/UITextView+RxTests.swift +++ b/Tests/RxCocoaTests/UITextView+RxTests.swift @@ -34,9 +34,9 @@ class UITextViewTests : RxTest { var value: ()? autoreleasepool { - let textView = UITextView(frame: CGRectMake(0, 0, 1, 1)) + let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1)) - _ = textView.rx_didBeginEditing.subscribe(onNext: { n in + _ = textView.rx.didBeginEditing.subscribe(onNext: { n in value = n }, onCompleted: { completed = true @@ -54,9 +54,9 @@ class UITextViewTests : RxTest { var value: ()? autoreleasepool { - let textView = UITextView(frame: CGRectMake(0, 0, 1, 1)) + let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1)) - _ = textView.rx_didEndEditing.subscribe(onNext: { n in + _ = textView.rx.didEndEditing.subscribe(onNext: { n in value = n }, onCompleted: { completed = true @@ -74,9 +74,9 @@ class UITextViewTests : RxTest { var value: ()? autoreleasepool { - let textView = UITextView(frame: CGRectMake(0, 0, 1, 1)) + let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1)) - _ = textView.rx_didChange.subscribe(onNext: { n in + _ = textView.rx.didChange.subscribe(onNext: { n in value = n }, onCompleted: { completed = true @@ -94,9 +94,9 @@ class UITextViewTests : RxTest { var value: ()? autoreleasepool { - let textView = UITextView(frame: CGRectMake(0, 0, 1, 1)) + let textView = UITextView(frame: CGRect(x: 0, y: 0, width: 1, height: 1)) - _ = textView.rx_didChangeSelection.subscribe(onNext: { n in + _ = textView.rx.didChangeSelection.subscribe(onNext: { n in value = n }, onCompleted: { completed = true