Make Android ViewObservable.input observe TextView instead of String

Author: ronshapiro

rxjava-contrib/rxjava-android/src/main/java/rx/android/observables/ViewObservable.java

@@ -17,21 +17,21 @@
 
 import rx.Observable;
 import rx.operators.OperatorCompoundButtonInput;
-import rx.operators.OperatorEditTextInput;
+import rx.operators.OperatorTextViewInput;
 import rx.operators.OperatorViewClick;
 
 import android.view.View;
 import android.widget.CompoundButton;
-import android.widget.EditText;
+import android.widget.TextView;
 
 public class ViewObservable {
 
     public static <T extends View> Observable<T> clicks(final T view, final boolean emitInitialValue) {
         return Observable.create(new OperatorViewClick<T>(view, emitInitialValue));
     }
 
-    public static Observable<String> input(final EditText input, final boolean emitInitialValue) {
-        return Observable.create(new OperatorEditTextInput(input, emitInitialValue));
+    public static <T extends TextView> Observable<T> input(final T input, final boolean emitInitialValue) {
+        return Observable.create(new OperatorTextViewInput<T>(input, emitInitialValue));
     }
 
     public static Observable<Boolean> input(final CompoundButton button, final boolean emitInitialValue) {

rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorEditTextInput.java renamed to rxjava-contrib/rxjava-android/src/main/java/rx/operators/OperatorTextViewInput.java

@@ -23,27 +23,27 @@
 import rx.functions.Action0;
 import android.text.Editable;
 import android.text.TextWatcher;
-import android.widget.EditText;
+import android.widget.TextView;
 
-public class OperatorEditTextInput implements Observable.OnSubscribe<String> {
-    private final EditText input;
+public class OperatorTextViewInput<T extends TextView> implements Observable.OnSubscribe<T> {
+    private final T input;
     private final boolean emitInitialValue;
 
-    public OperatorEditTextInput(final EditText input, final boolean emitInitialValue) {
+    public OperatorTextViewInput(final T input, final boolean emitInitialValue) {
         this.input = input;
         this.emitInitialValue = emitInitialValue;
     }
 
     @Override
-    public void call(final Subscriber<? super String> observer) {
+    public void call(final Subscriber<? super T> observer) {
         Assertions.assertUiThread();
         final TextWatcher watcher = new SimpleTextWatcher() {
             @Override
             public void afterTextChanged(final Editable editable) {
-                observer.onNext(editable.toString());
+                observer.onNext(input);
             }
         };
-        
+
         final Subscription subscription = AndroidSubscriptions.unsubscribeInUiThread(new Action0() {
             @Override
             public void call() {
@@ -52,7 +52,7 @@ public void call() {
         });
 
         if (emitInitialValue) {
-            observer.onNext(input.getEditableText().toString());
+            observer.onNext(input);
         }
 
         input.addTextChangedListener(watcher);

rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperatorEditTextInputTest.java renamed to rxjava-contrib/rxjava-android/src/test/java/rx/android/operators/OperatorTextViewInputTest.java

@@ -20,6 +20,7 @@
 
 import android.app.Activity;
 import android.widget.EditText;
+import android.widget.TextView;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
@@ -29,10 +30,22 @@
 import rx.Observer;
 import rx.Subscription;
 import rx.android.observables.ViewObservable;
+import rx.functions.Func1;
 import rx.observers.TestObserver;
 
 @RunWith(RobolectricTestRunner.class)
-public class OperatorEditTextInputTest {
+public class OperatorTextViewInputTest {
+
+    private static TextView createTextView(final String value) {
+        final Activity activity = Robolectric.buildActivity(Activity.class).create().get();
+        final TextView text = new TextView(activity);
+
+        if (value != null) {
+            text.setText(value);
+        }
+
+        return text;
+    }
 
     private static EditText createEditText(final String value) {
         final Activity activity = Robolectric.buildActivity(Activity.class).create().get();
@@ -48,27 +61,27 @@ private static EditText createEditText(final String value) {
     @Test
     @SuppressWarnings("unchecked")
     public void testWithoutInitialValue() {
-        final EditText input = createEditText("initial");
-        final Observable<String> observable = ViewObservable.input(input, false);
-        final Observer<String> observer = mock(Observer.class);
-        final Subscription subscription = observable.subscribe(new TestObserver<String>(observer));
+        final TextView input = createTextView("initial");
+        final Observable<TextView> observable = ViewObservable.input(input, false);
+        final Observer<TextView> observer = mock(Observer.class);
+        final Subscription subscription = observable.subscribe(new TestObserver<TextView>(observer));
 
         final InOrder inOrder = inOrder(observer);
 
-        inOrder.verify(observer, never()).onNext(anyString());
+        inOrder.verify(observer, never()).onNext(any(TextView.class));
 
         input.setText("1");
-        inOrder.verify(observer, times(1)).onNext("1");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         input.setText("2");
-        inOrder.verify(observer, times(1)).onNext("2");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         input.setText("3");
-        inOrder.verify(observer, times(1)).onNext("3");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         subscription.unsubscribe();
         input.setText("4");
-        inOrder.verify(observer, never()).onNext(anyString());
+        inOrder.verify(observer, never()).onNext(any(TextView.class));
 
         inOrder.verify(observer, never()).onError(any(Throwable.class));
         inOrder.verify(observer, never()).onCompleted();
@@ -77,27 +90,27 @@ public void testWithoutInitialValue() {
     @Test
     @SuppressWarnings("unchecked")
     public void testWithInitialValue() {
-        final EditText input = createEditText("initial");
-        final Observable<String> observable = ViewObservable.input(input, true);
-        final Observer<String> observer = mock(Observer.class);
-        final Subscription subscription = observable.subscribe(new TestObserver<String>(observer));
+        final TextView input = createTextView("initial");
+        final Observable<TextView> observable = ViewObservable.input(input, true);
+        final Observer<TextView> observer = mock(Observer.class);
+        final Subscription subscription = observable.subscribe(new TestObserver<TextView>(observer));
 
         final InOrder inOrder = inOrder(observer);
 
-        inOrder.verify(observer, times(1)).onNext("initial");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         input.setText("one");
-        inOrder.verify(observer, times(1)).onNext("one");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         input.setText("two");
-        inOrder.verify(observer, times(1)).onNext("two");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         input.setText("three");
-        inOrder.verify(observer, times(1)).onNext("three");
+        inOrder.verify(observer, times(1)).onNext(input);
 
         subscription.unsubscribe();
         input.setText("four");
-        inOrder.verify(observer, never()).onNext(anyString());
+        inOrder.verify(observer, never()).onNext(any(TextView.class));
 
         inOrder.verify(observer, never()).onError(any(Throwable.class));
         inOrder.verify(observer, never()).onCompleted();
@@ -106,40 +119,86 @@ public void testWithInitialValue() {
     @Test
     @SuppressWarnings("unchecked")
     public void testMultipleSubscriptions() {
-        final EditText input = createEditText("initial");
-        final Observable<String> observable = ViewObservable.input(input, false);
+        final TextView input = createTextView("initial");
+        final Observable<TextView> observable = ViewObservable.input(input, false);
 
-        final Observer<String> observer1 = mock(Observer.class);
-        final Observer<String> observer2 = mock(Observer.class);
+        final Observer<TextView> observer1 = mock(Observer.class);
+        final Observer<TextView> observer2 = mock(Observer.class);
 
-        final Subscription subscription1 = observable.subscribe(new TestObserver<String>(observer1));
-        final Subscription subscription2 = observable.subscribe(new TestObserver<String>(observer2));
+        final Subscription subscription1 = observable.subscribe(new TestObserver<TextView>(observer1));
+        final Subscription subscription2 = observable.subscribe(new TestObserver<TextView>(observer2));
 
         final InOrder inOrder1 = inOrder(observer1);
         final InOrder inOrder2 = inOrder(observer2);
 
         input.setText("1");
-        inOrder1.verify(observer1, times(1)).onNext("1");
-        inOrder2.verify(observer2, times(1)).onNext("1");
+        inOrder1.verify(observer1, times(1)).onNext(input);
+        inOrder2.verify(observer2, times(1)).onNext(input);
 
         input.setText("2");
-        inOrder1.verify(observer1, times(1)).onNext("2");
-        inOrder2.verify(observer2, times(1)).onNext("2");
+        inOrder1.verify(observer1, times(1)).onNext(input);
+        inOrder2.verify(observer2, times(1)).onNext(input);
         subscription1.unsubscribe();
 
         input.setText("3");
-        inOrder1.verify(observer1, never()).onNext(anyString());
-        inOrder2.verify(observer2, times(1)).onNext("3");
+        inOrder1.verify(observer1, never()).onNext(any(TextView.class));
+        inOrder2.verify(observer2, times(1)).onNext(input);
         subscription2.unsubscribe();
 
         input.setText("4");
-        inOrder1.verify(observer1, never()).onNext(anyString());
-        inOrder2.verify(observer2, never()).onNext(anyString());
+        inOrder1.verify(observer1, never()).onNext(any(TextView.class));
+        inOrder2.verify(observer2, never()).onNext(any(TextView.class));
 
         inOrder1.verify(observer1, never()).onError(any(Throwable.class));
         inOrder2.verify(observer2, never()).onError(any(Throwable.class));
 
         inOrder1.verify(observer1, never()).onCompleted();
         inOrder2.verify(observer2, never()).onCompleted();
     }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testTextViewSubclass() {
+        final EditText input = createEditText("initial");
+        final Observable<EditText> observable = ViewObservable.input(input, false);
+        final Observer<EditText> observer = mock(Observer.class);
+        observable.subscribe(new TestObserver<EditText>(observer));
+
+        final InOrder inOrder = inOrder(observer);
+
+        inOrder.verify(observer, never()).onNext(any(EditText.class));
+
+        input.setText("1");
+        inOrder.verify(observer, times(1)).onNext(input);
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void testLegacyStringObservableCompatibility() {
+        final EditText input = createEditText("initial");
+        final Observable<String> observable = ViewObservable.input(input, false)
+            .map(new Func1<EditText, String>() {
+
+                    @Override
+                    public String call(EditText view) {
+                        return view.getText().toString();
+                    }
+                });
+        final Observer<String> observer = mock(Observer.class);
+        observable.subscribe(new TestObserver<String>(observer));
+
+        final InOrder inOrder = inOrder(observer);
+
+        inOrder.verify(observer, never()).onNext(anyString());
+
+        input.setText("1");
+        inOrder.verify(observer, times(1)).onNext("1");
+
+        input.setText("2");
+        inOrder.verify(observer, times(1)).onNext("2");
+
+        input.setText("3");
+        inOrder.verify(observer, times(1)).onNext("3");
+    }
+
 }