Merge pull request ReactiveX#66 from omo/reorg

Android-centric package reorganization (ReactiveX#65)

Author: JakeWharton

rxandroid/src/main/java/rx/android/subscriptions/AndroidSubscriptions.java renamed to rxandroid/src/main/java/rx/android/AndroidSubscriptions.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.subscriptions;
+package rx.android;
 
 import rx.Scheduler.Worker;
 import rx.Subscription;

rxandroid/src/main/java/rx/android/observables/AndroidObservable.java renamed to rxandroid/src/main/java/rx/android/content/ContentObservable.java

@@ -1,17 +1,4 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package rx.android.observables;
+package rx.android.content;
 
 import android.app.Activity;
 import android.app.Fragment;
@@ -21,47 +8,26 @@
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Handler;
-import android.view.View;
 
 import rx.Observable;
-import rx.android.operators.OperatorBroadcastRegister;
-import rx.android.operators.OperatorConditionalBinding;
-import rx.android.operators.OperatorLocalBroadcastRegister;
-import rx.android.operators.OperatorSharedPreferenceChange;
-import rx.android.operators.OperatorViewDetachedFromWindowFirst;
+import rx.android.internal.Assertions;
 import rx.functions.Func1;
 
 import static rx.android.schedulers.AndroidSchedulers.mainThread;
 
-
-public final class AndroidObservable {
-
-    private static final boolean USES_SUPPORT_FRAGMENTS;
-
-    static {
-        boolean supportFragmentsAvailable = false;
-        try {
-            Class.forName("android.support.v4.app.Fragment");
-            supportFragmentsAvailable = true;
-        } catch (ClassNotFoundException e) {
-        }
-        USES_SUPPORT_FRAGMENTS = supportFragmentsAvailable;
-    }
-
+public final class ContentObservable {
     private static final Func1<Activity, Boolean> ACTIVITY_VALIDATOR = new Func1<Activity, Boolean>() {
         @Override
         public Boolean call(Activity activity) {
             return !activity.isFinishing();
         }
     };
-
     private static final Func1<Fragment, Boolean> FRAGMENT_VALIDATOR = new Func1<Fragment, Boolean>() {
         @Override
         public Boolean call(Fragment fragment) {
             return fragment.isAdded() && !fragment.getActivity().isFinishing();
         }
     };
-
     private static final Func1<android.support.v4.app.Fragment, Boolean> FRAGMENTV4_VALIDATOR =
             new Func1<android.support.v4.app.Fragment, Boolean>() {
                 @Override
@@ -70,7 +36,17 @@ public Boolean call(android.support.v4.app.Fragment fragment) {
                 }
             };
 
-    private AndroidObservable() {
+    private static final boolean USES_SUPPORT_FRAGMENTS;
+
+    static {
+        boolean supportFragmentsAvailable = false;
+        try {
+            Class.forName("android.support.v4.app.Fragment");
+            supportFragmentsAvailable = true;
+        } catch (ClassNotFoundException e) {
+        }
+
+        USES_SUPPORT_FRAGMENTS = supportFragmentsAvailable;
     }
 
     /**
@@ -120,27 +96,6 @@ public static <T> Observable<T> bindFragment(Object fragment, Observable<T> sour
         }
     }
 
-    /**
-     * Binds the given source sequence to the view.
-     * <p>
-     * This helper will schedule the given sequence to be observed on the main UI thread and ensure
-     * that no notifications will be forwarded to the view in case it gets detached from its the window.
-     * <p>
-     * Unlike {@link #bindActivity} or {@link #bindFragment}, you don't have to unsubscribe the returned {@code Observable}
-     * on the detachment. {@link #bindView} does it automatically.
-     * That means that the subscriber doesn't see further sequence even if the view is recycled and
-     * attached again.
-     *
-     * @param view the view to bind the source sequence to
-     * @param source the source sequence
-     */
-    public static <T> Observable<T> bindView(View view, Observable<T> source) {
-        if (view == null || source == null)
-            throw new IllegalArgumentException("View and Observable must be given");
-        Assertions.assertUiThread();
-        return source.takeUntil(Observable.create(new OperatorViewDetachedFromWindowFirst(view))).observeOn(mainThread());
-    }
-
     /**
      * Create Observable that wraps BroadcastReceiver and emmit received intents.
      *
@@ -182,4 +137,7 @@ public static Observable<Intent> fromLocalBroadcast(Context context, IntentFilte
     public static Observable<String> fromSharedPreferencesChanges(SharedPreferences sharedPreferences){
         return Observable.create(new OperatorSharedPreferenceChange(sharedPreferences));
     }
+
+    private ContentObservable() {
+    }
 }

rxandroid/src/main/java/rx/android/operators/OperatorBroadcastRegister.java renamed to rxandroid/src/main/java/rx/android/content/OperatorBroadcastRegister.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.content;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,7 +25,7 @@
 import rx.functions.Action0;
 import rx.subscriptions.Subscriptions;
 
-public class OperatorBroadcastRegister implements Observable.OnSubscribe<Intent> {
+class OperatorBroadcastRegister implements Observable.OnSubscribe<Intent> {
 
     private final Context context;
     private final IntentFilter intentFilter;

rxandroid/src/main/java/rx/android/operators/OperatorConditionalBinding.java renamed to rxandroid/src/main/java/rx/android/content/OperatorConditionalBinding.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.content;
 
 import rx.Observable;
 import rx.Subscriber;
@@ -30,7 +30,7 @@
  * @param <T> the type of the objects emitted to a subscriber
  * @param <R> the type of the target object to bind to
  */
-public final class OperatorConditionalBinding<T, R> implements Observable.Operator<T, T> {
+final class OperatorConditionalBinding<T, R> implements Observable.Operator<T, T> {
 
     private static final String LOG_TAG = "ConditionalBinding";
 

rxandroid/src/main/java/rx/android/operators/OperatorLocalBroadcastRegister.java renamed to rxandroid/src/main/java/rx/android/content/OperatorLocalBroadcastRegister.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.content;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -25,7 +25,7 @@
 import rx.functions.Action0;
 import rx.subscriptions.Subscriptions;
 
-public class OperatorLocalBroadcastRegister implements Observable.OnSubscribe<Intent> {
+class OperatorLocalBroadcastRegister implements Observable.OnSubscribe<Intent> {
 
     private final Context context;
     private final IntentFilter intentFilter;

rxandroid/src/main/java/rx/android/operators/OperatorSharedPreferenceChange.java renamed to rxandroid/src/main/java/rx/android/content/OperatorSharedPreferenceChange.java

@@ -11,15 +11,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.content;
 
 import android.content.SharedPreferences;
 import rx.Observable;
 import rx.Subscriber;
 import rx.functions.Action0;
 import rx.subscriptions.Subscriptions;
 
-public class OperatorSharedPreferenceChange implements Observable.OnSubscribe<String>{
+class OperatorSharedPreferenceChange implements Observable.OnSubscribe<String>{
 
     private final SharedPreferences sharedPreferences;
 

rxandroid/src/main/java/rx/android/observables/Assertions.java renamed to rxandroid/src/main/java/rx/android/internal/Assertions.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.observables;
+package rx.android.internal;
 
 import android.os.Looper;
 

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

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.events;
+package rx.android.view;
 
 import android.widget.CompoundButton;
 

rxandroid/src/main/java/rx/android/events/OnCheckedChangeEvent.java renamed to rxandroid/src/main/java/rx/android/view/OnCheckedChangeEvent.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.events;
+package rx.android.view;
 
 import android.view.View;
 

rxandroid/src/main/java/rx/android/events/OnClickEvent.java renamed to rxandroid/src/main/java/rx/android/view/OnClickEvent.java

@@ -11,23 +11,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.view;
 
 import android.view.View;
 import rx.Observable;
 import rx.Subscriber;
 import rx.Subscription;
-import rx.android.events.OnClickEvent;
-import rx.android.observables.Assertions;
-import rx.android.subscriptions.AndroidSubscriptions;
+import rx.android.internal.Assertions;
+import rx.android.AndroidSubscriptions;
 import rx.functions.Action0;
 
 import java.util.ArrayList;
 import java.util.List;
 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/operators/OperatorViewClick.java renamed to rxandroid/src/main/java/rx/android/view/OperatorViewClick.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.operators;
+package rx.android.view;
 
 import android.view.View;
 
@@ -20,10 +20,10 @@
 import rx.Subscription;
 
 /**
- * An internal class that is used from #{@link rx.android.observables.AndroidObservable#bindView}.
+ * 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/operators/OperatorViewDetachedFromWindowFirst.java renamed to rxandroid/src/main/java/rx/android/view/OperatorViewDetachedFromWindowFirst.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.functions;
+package rx.android.view;
 
 import android.view.View;
 

rxandroid/src/main/java/rx/android/functions/ViewAction1.java renamed to rxandroid/src/main/java/rx/android/view/ViewAction1.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.functions;
+package rx.android.view;
 
 import android.view.View;
 

rxandroid/src/main/java/rx/android/functions/ViewActionSetActivated.java renamed to rxandroid/src/main/java/rx/android/view/ViewActionSetActivated.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.functions;
+package rx.android.view;
 
 import android.view.View;
 

rxandroid/src/main/java/rx/android/functions/ViewActionSetClickable.java renamed to rxandroid/src/main/java/rx/android/view/ViewActionSetClickable.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.android.functions;
+package rx.android.view;
 
 import android.view.View;