feat: port to RxJava 2.X

app/build.gradle

@@ -29,23 +29,34 @@ dependencies {
     compile "com.android.support:appcompat-v7:${supportLibVersion}"
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
 
-    compile 'io.reactivex:rxandroid:1.2.0'
-    // Because RxAndroid releases are few and far between, it is recommended you also
-    // explicitly depend on RxJava's latest version for bug fixes and new features.
-    compile 'io.reactivex:rxjava:1.1.4'
-    compile 'io.reactivex:rxjava-math:1.0.0'
     compile 'com.github.kaushikgopal:CoreTextUtils:c703fa12b6'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
     compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
     compile 'com.jakewharton.timber:timber:2.4.2'
     compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
-    compile "com.squareup.retrofit2:adapter-rxjava:${retrofitVersion}"
     compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
     compile "com.squareup.okhttp3:okhttp-urlconnection:${okhttpVersion}"
     compile 'com.mcxiaoke.volley:library:1.0.19'
 
+    // ----------------------------------
+    //  Rx dependencies
+
+    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+
+    // Because RxAndroid releases are few and far between, it is recommended you also
+    // explicitly depend on RxJava's latest version for bug fixes and new features.
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    // libs like rxbinding + rxjava-math haven't been ported to RxJava 2.x yet, so this helps
+    compile "com.github.akarnokd:rxjava2-interop:0.6.1"
+
+    compile 'io.reactivex:rxjava-math:1.0.0'
+    compile 'com.jakewharton.rxrelay:rxrelay:1.2.0'
+    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
+    compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
+
+    // ----------------------------------
+
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
 }
@@ -71,4 +82,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    packagingOptions {
+        pickFirst  'META-INF/rxjava.properties'
+    }
 }

app/src/main/java/com/morihacky/android/rxjava/MainActivity.java

@@ -13,15 +13,6 @@ public class MainActivity
 
     private RxBus _rxBus = null;
 
-    // This is better done with a DI Library like Dagger
-    public RxBus getRxBusSingleton() {
-        if (_rxBus == null) {
-            _rxBus = new RxBus();
-        }
-
-        return _rxBus;
-    }
-
     @Override
     public void onBackPressed() {
         super.onBackPressed();
@@ -34,24 +25,37 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             getSupportFragmentManager().beginTransaction()
-                  .replace(android.R.id.content, new MainFragment(), this.toString())
-                  .commit();
+                                       .replace(android.R.id.content, new MainFragment(), this.toString())
+                                       .commit();
         }
     }
 
+    // This is better done with a DI Library like Dagger
+    public RxBus getRxBusSingleton() {
+        if (_rxBus == null) {
+            _rxBus = new RxBus();
+        }
+
+        return _rxBus;
+    }
+
     private void _removeWorkerFragments() {
-        Fragment frag = getSupportFragmentManager()//
-              .findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
+        Fragment frag = getSupportFragmentManager().findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
 
         if (frag != null) {
-            getSupportFragmentManager().beginTransaction().remove(frag).commit();
+            getSupportFragmentManager()
+                  .beginTransaction()
+                  .remove(frag)
+                  .commit();
         }
 
-        frag = getSupportFragmentManager()//
-              .findFragmentByTag(RotationPersist2WorkerFragment.class.getName());
+        frag = getSupportFragmentManager().findFragmentByTag(RotationPersist2WorkerFragment.class.getName());
 
         if (frag != null) {
-            getSupportFragmentManager().beginTransaction().remove(frag).commit();
+            getSupportFragmentManager()
+                  .beginTransaction()
+                  .remove(frag)
+                  .commit();
         }
     }
 }

app/src/main/java/com/morihacky/android/rxjava/MyApp.java

@@ -1,7 +1,6 @@
 package com.morihacky.android.rxjava;
 
 import android.app.Application;
-
 import com.morihacky.android.rxjava.volley.MyVolley;
 import com.squareup.leakcanary.LeakCanary;
 import com.squareup.leakcanary.RefWatcher;
@@ -28,6 +27,9 @@ public void onCreate() {
         _instance = (MyApp) getApplicationContext();
         _refWatcher = LeakCanary.install(this);
 
+        // for better RxJava debugging
+        //RxJavaHooks.enableAssemblyTracking();
+
         // Initialize Volley
         MyVolley.init(this);
 

app/src/main/java/com/morihacky/android/rxjava/fragments/BufferDemoFragment.java

@@ -20,9 +20,10 @@
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
+import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.observers.DisposableObserver;
 import timber.log.Timber;
 
 /**
@@ -48,18 +49,18 @@ public class BufferDemoFragment
     private LogAdapter _adapter;
     private List<String> _logs;
 
-    private Subscription _subscription;
+    private Disposable _disposable;
 
     @Override
     public void onResume() {
         super.onResume();
-        _subscription = _getBufferedSubscription();
+        _disposable = _getBufferedDisposable();
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        _subscription.unsubscribe();
+        _disposable.dispose();
     }
 
     @Override
@@ -85,19 +86,19 @@ public View onCreateView(LayoutInflater inflater,
     // -----------------------------------------------------------------------------------
     // Main Rx entities
 
-    private Subscription _getBufferedSubscription() {
-        return RxView.clickEvents(_tapBtn)
+    private Disposable _getBufferedDisposable() {
+        return  RxJavaInterop.toV2Observable(RxView.clickEvents(_tapBtn))
               .map(onClickEvent -> {
                   Timber.d("--------- GOT A TAP");
                   _log("GOT A TAP");
                   return 1;
               })
               .buffer(2, TimeUnit.SECONDS)
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(new Observer<List<Integer>>() {
+              .subscribeWith(new DisposableObserver<List<Integer>>() {
 
                   @Override
-                  public void onCompleted() {
+                  public void onComplete() {
                       // fyi: you'll never reach here
                       Timber.d("----- onCompleted");
                   }

app/src/main/java/com/morihacky/android/rxjava/fragments/ConcurrencyWithSchedulersDemoFragment.java

@@ -15,14 +15,13 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import com.morihacky.android.rxjava.R;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.CompositeDisposable;
+import io.reactivex.observers.DisposableObserver;
+import io.reactivex.schedulers.Schedulers;
 import java.util.ArrayList;
 import java.util.List;
-import rx.Observable;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-import rx.subscriptions.CompositeSubscription;
 import timber.log.Timber;
 
 public class ConcurrencyWithSchedulersDemoFragment
@@ -33,13 +32,13 @@ public class ConcurrencyWithSchedulersDemoFragment
 
     private LogAdapter _adapter;
     private List<String> _logs;
-    private CompositeSubscription _subscriptions = new CompositeSubscription();
+    private CompositeDisposable _disposables = new CompositeDisposable();
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         ButterKnife.unbind(this);
-        _subscriptions.clear();
+        _disposables.clear();
     }
 
     @Override
@@ -63,12 +62,14 @@ public void startLongOperation() {
         _progress.setVisibility(View.VISIBLE);
         _log("Button Clicked");
 
-        Subscription s = _getObservable()//
+        DisposableObserver<Boolean> d = _getDisposableObserver();
+
+        _getObservable()
               .subscribeOn(Schedulers.io())
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(_getObserver()); // Observer
+              .subscribe(d);
 
-        _subscriptions.add(s);
+        _disposables.add(d);
     }
 
     private Observable<Boolean> _getObservable() {
@@ -86,11 +87,11 @@ private Observable<Boolean> _getObservable() {
      * 2. onError
      * 3. onNext
      */
-    private Observer<Boolean> _getObserver() {
-        return new Observer<Boolean>() {
+    private DisposableObserver<Boolean> _getDisposableObserver() {
+        return new DisposableObserver<Boolean>() {
 
             @Override
-            public void onCompleted() {
+            public void onComplete() {
                 _log("On complete");
                 _progress.setVisibility(View.INVISIBLE);
             }

app/src/main/java/com/morihacky/android/rxjava/fragments/DebounceSearchEmitterFragment.java

@@ -23,9 +23,10 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
+import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.observers.DisposableObserver;
 import timber.log.Timber;
 
 import static co.kaush.core.util.CoreNullnessUtils.isNotNullOrEmpty;
@@ -40,12 +41,12 @@ public class DebounceSearchEmitterFragment
     private LogAdapter _adapter;
     private List<String> _logs;
 
-    private Subscription _subscription;
+    private Disposable _disposable;
 
     @Override
     public void onDestroy() {
         super.onDestroy();
-        _subscription.unsubscribe();
+        _disposable.dispose();
         ButterKnife.unbind(this);
     }
 
@@ -70,20 +71,20 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         _setupLogger();
 
-        _subscription = RxTextView.textChangeEvents(_inputSearchText)
+        _disposable = RxJavaInterop.toV2Observable(RxTextView.textChangeEvents(_inputSearchText))
               .debounce(400, TimeUnit.MILLISECONDS)// default Scheduler is Computation
               .filter(changes -> isNotNullOrEmpty(_inputSearchText.getText().toString()))
               .observeOn(AndroidSchedulers.mainThread())
-              .subscribe(_getSearchObserver());
+              .subscribeWith(_getSearchObserver());
     }
 
     // -----------------------------------------------------------------------------------
     // Main Rx entities
 
-    private Observer<TextViewTextChangeEvent> _getSearchObserver() {
-        return new Observer<TextViewTextChangeEvent>() {
+    private DisposableObserver<TextViewTextChangeEvent> _getSearchObserver() {
+        return new DisposableObserver<TextViewTextChangeEvent>() {
             @Override
-            public void onCompleted() {
+            public void onComplete() {
                 Timber.d("--------- onComplete");
             }
 

app/src/main/java/com/morihacky/android/rxjava/fragments/DoubleBindingTextViewFragment.java

@@ -7,14 +7,13 @@
 import android.view.ViewGroup;
 import android.widget.EditText;
 import android.widget.TextView;
-
-import com.morihacky.android.rxjava.R;
-
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import butterknife.OnTextChanged;
-import rx.Subscription;
-import rx.subjects.PublishSubject;
+import com.morihacky.android.rxjava.R;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.processors.PublishProcessor;
+
 
 import static android.text.TextUtils.isEmpty;
 
@@ -25,8 +24,8 @@ public class DoubleBindingTextViewFragment
     @Bind(R.id.double_binding_num2) EditText _number2;
     @Bind(R.id.double_binding_result) TextView _result;
 
-    Subscription _subscription;
-    PublishSubject<Float> _resultEmitterSubject;
+    Disposable _disposable;
+    PublishProcessor<Float> _resultEmitterSubject;
 
     @Override
     public View onCreateView(LayoutInflater inflater,
@@ -35,12 +34,11 @@ public View onCreateView(LayoutInflater inflater,
         View layout = inflater.inflate(R.layout.fragment_double_binding_textview, container, false);
         ButterKnife.bind(this, layout);
 
-        _resultEmitterSubject = PublishSubject.create();
-        _subscription = _resultEmitterSubject//
-              .asObservable()//
-              .subscribe(aFloat -> {
-                  _result.setText(String.valueOf(aFloat));
-              });
+        _resultEmitterSubject = PublishProcessor.create();
+
+        _disposable = _resultEmitterSubject.subscribe(aFloat -> {
+            _result.setText(String.valueOf(aFloat));
+        });
 
         onNumberChanged();
         _number2.requestFocus();
@@ -67,7 +65,7 @@ public void onNumberChanged() {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        _subscription.unsubscribe();
+        _disposable.dispose();
         ButterKnife.unbind(this);
     }
 }