Split part of ViewObservable to WidgetObservable. (ReactiveX#65)

Some ViewObservable methods are for android.widget.* classes.
This change moves  these to newly introduced WidgetObservable.
This turns some internal classes from public to package-local.

Author: omo

rxandroid/src/main/java/rx/android/view/OperatorViewClick.java

@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-public final class OperatorViewClick implements Observable.OnSubscribe<OnClickEvent> {
+final class OperatorViewClick implements Observable.OnSubscribe<OnClickEvent> {
     private final boolean emitInitialValue;
     private final View view;
 

rxandroid/src/main/java/rx/android/view/OperatorViewDetachedFromWindowFirst.java

@@ -23,7 +23,7 @@
  * An internal class that is used from #{@link ViewObservable#bindView}.
  * This emits an event when the given #{@code View} is detached from the window for the first time.
  */
-public class OperatorViewDetachedFromWindowFirst implements Observable.OnSubscribe<View> {
+final class OperatorViewDetachedFromWindowFirst implements Observable.OnSubscribe<View> {
     private final View view;
 
     public OperatorViewDetachedFromWindowFirst(View view) {

rxandroid/src/main/java/rx/android/view/ViewObservable.java

@@ -21,17 +21,13 @@
 
 import rx.Observable;
 import rx.android.util.Assertions;
-import rx.android.widget.OnItemClickEvent;
-import rx.android.widget.OnListViewScrollEvent;
-import rx.android.widget.OperatorAdapterViewOnItemClick;
-import rx.android.widget.OperatorCompoundButtonInput;
-import rx.android.widget.OnSubscribeListViewScroll;
-import rx.android.widget.OperatorTextViewInput;
-import rx.android.widget.OnTextChangeEvent;
 
 import static rx.android.schedulers.AndroidSchedulers.mainThread;
 
-public class ViewObservable {
+public final class ViewObservable {
+
+    private ViewObservable() {
+    }
 
     public static Observable<OnClickEvent> clicks(final View view) {
         return clicks(view, false);
@@ -41,36 +37,6 @@ public static Observable<OnClickEvent> clicks(final View view, final boolean emi
         return Observable.create(new OperatorViewClick(view, emitInitialValue));
     }
 
-    public static Observable<OnTextChangeEvent> text(final TextView input) {
-        return text(input, false);
-    }
-
-    public static Observable<OnTextChangeEvent> text(final TextView input, final boolean emitInitialValue) {
-        return Observable.create(new OperatorTextViewInput(input, emitInitialValue));
-    }
-
-    public static Observable<OnCheckedChangeEvent> input(final CompoundButton button) {
-        return input(button, false);
-    }
-
-    public static Observable<OnCheckedChangeEvent> input(final CompoundButton button, final boolean emitInitialValue) {
-        return Observable.create(new OperatorCompoundButtonInput(button, emitInitialValue));
-    }
-
-    public static Observable<OnItemClickEvent> itemClicks(final AdapterView<?> adapterView) {
-        return Observable.create(new OperatorAdapterViewOnItemClick(adapterView));
-    }
-
-    /**
-     * Returns an observable that emits all the scroll events from the provided ListView.
-     * Note that this will replace any listeners previously set through
-     * {@link android.widget.AbsListView#setOnScrollListener(android.widget.AbsListView.OnScrollListener)} unless those
-     * were set by this method or {@link rx.android.widget.OnSubscribeListViewScroll}.
-     */
-    public static Observable<OnListViewScrollEvent> listScrollEvents(final AbsListView listView) {
-        return Observable.create(new OnSubscribeListViewScroll(listView));
-    }
-
     /**
      * Binds the given source sequence to the view.
      * <p>

rxandroid/src/main/java/rx/android/widget/OnSubscribeListViewScroll.java

@@ -27,7 +27,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-public class OnSubscribeListViewScroll implements Observable.OnSubscribe<OnListViewScrollEvent> {
+class OnSubscribeListViewScroll implements Observable.OnSubscribe<OnListViewScrollEvent> {
 
     private final AbsListView listView;
 

rxandroid/src/main/java/rx/android/widget/OperatorAdapterViewOnItemClick.java

@@ -29,7 +29,7 @@
 import rx.android.AndroidSubscriptions;
 import rx.functions.Action0;
 
-public class OperatorAdapterViewOnItemClick implements Observable.OnSubscribe<OnItemClickEvent> {
+class OperatorAdapterViewOnItemClick implements Observable.OnSubscribe<OnItemClickEvent> {
 
     private final AdapterView<?> adapterView;
 

rxandroid/src/main/java/rx/android/widget/OperatorCompoundButtonInput.java

@@ -28,7 +28,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-public class OperatorCompoundButtonInput implements Observable.OnSubscribe<OnCheckedChangeEvent> {
+class OperatorCompoundButtonInput implements Observable.OnSubscribe<OnCheckedChangeEvent> {
     private final boolean emitInitialValue;
     private final CompoundButton button;
 

rxandroid/src/main/java/rx/android/widget/OperatorTextViewInput.java

@@ -23,7 +23,7 @@
 import android.text.TextWatcher;
 import android.widget.TextView;
 
-public class OperatorTextViewInput implements Observable.OnSubscribe<OnTextChangeEvent> {
+class OperatorTextViewInput implements Observable.OnSubscribe<OnTextChangeEvent> {
     private final boolean emitInitialValue;
     private final TextView input;
 

rxandroid/src/main/java/rx/android/widget/WidgetObservable.java

@@ -0,0 +1,44 @@
+package rx.android.widget;
+
+import android.widget.AbsListView;
+import android.widget.AdapterView;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import rx.Observable;
+import rx.android.view.OnCheckedChangeEvent;
+
+public final class WidgetObservable {
+    private WidgetObservable() {
+    }
+
+    public static Observable<OnTextChangeEvent> text(final TextView input) {
+        return text(input, false);
+    }
+
+    public static Observable<OnTextChangeEvent> text(final TextView input, final boolean emitInitialValue) {
+        return Observable.create(new OperatorTextViewInput(input, emitInitialValue));
+    }
+
+    public static Observable<OnCheckedChangeEvent> input(final CompoundButton button) {
+        return input(button, false);
+    }
+
+    public static Observable<OnCheckedChangeEvent> input(final CompoundButton button, final boolean emitInitialValue) {
+        return Observable.create(new OperatorCompoundButtonInput(button, emitInitialValue));
+    }
+
+    public static Observable<OnItemClickEvent> itemClicks(final AdapterView<?> adapterView) {
+        return Observable.create(new OperatorAdapterViewOnItemClick(adapterView));
+    }
+
+    /**
+     * Returns an observable that emits all the scroll events from the provided ListView.
+     * Note that this will replace any listeners previously set through
+     * {@link android.widget.AbsListView#setOnScrollListener(android.widget.AbsListView.OnScrollListener)} unless those
+     * were set by this method or {@link OnSubscribeListViewScroll}.
+     */
+    public static Observable<OnListViewScrollEvent> listScrollEvents(final AbsListView listView) {
+        return Observable.create(new OnSubscribeListViewScroll(listView));
+    }
+}

rxandroid/src/test/java/rx/android/view/OperatorViewClickTest.java

@@ -15,20 +15,24 @@
 
 import android.app.Activity;
 import android.view.View;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
-import rx.android.view.OnClickEvent;
-import rx.android.view.ViewObservable;
 import rx.observers.TestObserver;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.refEq;
+import static org.mockito.Mockito.times;
 
 @RunWith(RobolectricTestRunner.class)
 public class OperatorViewClickTest {

rxandroid/src/test/java/rx/android/view/ViewAction1Test.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewAction1;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetActivatedTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetClickableTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetEnabledTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetFocusableTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetSelectedTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertFalse;

rxandroid/src/test/java/rx/android/view/ViewActionSetVisibilityTest.java

@@ -19,7 +19,6 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 
-import rx.android.view.ViewActions;
 import rx.subjects.PublishSubject;
 
 import static org.junit.Assert.assertEquals;

rxandroid/src/test/java/rx/android/widget/OperatorAdapterViewOnItemClickTest.java

@@ -36,8 +36,6 @@
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
-import rx.android.widget.OnItemClickEvent;
-import rx.android.view.ViewObservable;
 import rx.observers.TestObserver;
 
 import static org.mockito.Matchers.any;
@@ -209,7 +207,7 @@ public void testMultipleSubscriptionsGridViewNeverEmitOnCompletedAfterUnsubscrib
     private void performTestAdapterViewNeverEmitEventBeforeSubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnItemClickEvent>(observer));
 
@@ -223,7 +221,7 @@ private void performTestAdapterViewNeverEmitEventBeforeSubscribed(AdapterView<?
     private void performTestAdapterViewClickAllViewsEmitAllEvents(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnItemClickEvent>(observer));
 
@@ -241,7 +239,7 @@ private void performTestAdapterViewClickAllViewsEmitAllEvents(AdapterView<? exte
     private void performTestAdapterViewNeverEmitEventAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnItemClickEvent>(observer));
 
@@ -256,7 +254,7 @@ private void performTestAdapterViewNeverEmitEventAfterUnsubscribed(AdapterView<?
     private void performTestAdapterViewNeverEmitAnyThrowableAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnItemClickEvent>(observer));
 
@@ -270,7 +268,7 @@ private void performTestAdapterViewNeverEmitAnyThrowableAfterUnsubscribed(Adapte
     private void performTestAdapterViewNeverEmitOnCompletedAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnItemClickEvent>(observer));
 
@@ -284,7 +282,7 @@ private void performTestAdapterViewNeverEmitOnCompletedAfterUnsubscribed(Adapter
     private void performTestAdapterViewMultipleSubscriptionsNeverEmitEventBeforeSubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));
@@ -304,7 +302,7 @@ private void performTestAdapterViewMultipleSubscriptionsNeverEmitEventBeforeSubs
     private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEvents(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));
@@ -328,7 +326,7 @@ private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEven
     private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEventsForOneSubscriber(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));
@@ -355,7 +353,7 @@ private void performTestAdapterViewMultipleSubscriptionsClickAllViewsEmitAllEven
     private void performTestAdapterViewMultipleSubscriptionsNeverEmitEventAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));
@@ -375,7 +373,7 @@ private void performTestAdapterViewMultipleSubscriptionsNeverEmitEventAfterUnsub
     private void performTestAdapterViewMultipleSubscriptionsNeverEmitAnyThrowableAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));
@@ -395,7 +393,7 @@ private void performTestAdapterViewMultipleSubscriptionsNeverEmitAnyThrowableAft
     private void performTestAdapterViewMultipleSubscriptionsNeverEmitOnCompletedAfterUnsubscribed(AdapterView<? extends Adapter> adapterView) {
         Adapter adapter = adapterView.getAdapter();
         Assert.assertNotNull(adapter);
-        final Observable<OnItemClickEvent> observable = ViewObservable.itemClicks(adapterView);
+        final Observable<OnItemClickEvent> observable = WidgetObservable.itemClicks(adapterView);
         final Observer<OnItemClickEvent> observer1 = mock(Observer.class);
         final Observer<OnItemClickEvent> observer2 = mock(Observer.class);
         final Subscription subscription1 = observable.subscribe(new TestObserver<OnItemClickEvent>(observer1));

rxandroid/src/test/java/rx/android/widget/OperatorCompoundButtonInputTest.java

@@ -25,7 +25,6 @@
 import rx.Observer;
 import rx.Subscription;
 import rx.android.view.OnCheckedChangeEvent;
-import rx.android.view.ViewObservable;
 import rx.observers.TestObserver;
 
 import static org.mockito.Mockito.*;
@@ -48,7 +47,7 @@ private static CompoundButton mkCompoundButton(final boolean value) {
     @SuppressWarnings("unchecked")
     public void testWithoutInitialValue() {
         final CompoundButton button = mkCompoundButton(true);
-        final Observable<OnCheckedChangeEvent> observable = ViewObservable.input(button, false);
+        final Observable<OnCheckedChangeEvent> observable = WidgetObservable.input(button, false);
         final Observer<OnCheckedChangeEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnCheckedChangeEvent>(observer));
 
@@ -80,7 +79,7 @@ public void testWithoutInitialValue() {
     @SuppressWarnings("unchecked")
     public void testWithInitialValue() {
         final CompoundButton button = mkCompoundButton(true);
-        final Observable<OnCheckedChangeEvent> observable = ViewObservable.input(button, true);
+        final Observable<OnCheckedChangeEvent> observable = WidgetObservable.input(button, true);
         final Observer<OnCheckedChangeEvent> observer = mock(Observer.class);
         final Subscription subscription = observable.subscribe(new TestObserver<OnCheckedChangeEvent>(observer));
 
@@ -112,7 +111,7 @@ public void testWithInitialValue() {
     @SuppressWarnings("unchecked")
     public void testMultipleSubscriptions() {
         final CompoundButton button = mkCompoundButton(false);
-        final Observable<OnCheckedChangeEvent> observable = ViewObservable.input(button, false);
+        final Observable<OnCheckedChangeEvent> observable = WidgetObservable.input(button, false);
 
         final Observer<OnCheckedChangeEvent> observer1 = mock(Observer.class);
         final Observer<OnCheckedChangeEvent> observer2 = mock(Observer.class);