chore: merge changes

Author: Kaushik Gopal

.gitignore

@@ -22,6 +22,7 @@ buck-out/
 .buckd/
 
 # Intellij project files
+.idea/
 .idea/libraries
 .idea/.name
 .idea/compiler.xml

README.md

@@ -10,22 +10,22 @@ I've also been giving talks about Learning Rx using many of the examples listed
 
 ## Examples:
 
-1. [Background work & concurrency (using Schedulers)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#1-background-work--concurrency-using-schedulers)
-2. [Accumulate calls (using buffer)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#2-accumulate-calls-using-buffer)
-3. [Instant/Auto searching text listeners (using Subjects & debounce)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#3-instantauto-searching-text-listeners-using-subjects--debounce)
-4. [Networking with Retrofit & RxJava (using zip, flatmap)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#4-networking-with-retrofit--rxjava-using-zip-flatmap)
-5. [Two-way data binding for TextViews (using PublishSubject)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#5-two-way-data-binding-for-textviews-using-publishsubject)
-6. [Simple and Advanced polling (using interval and repeatWhen)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#6-simple-and-advanced-polling-using-interval-and-repeatwhen)
-7. [Simple and Advanced exponential backoff (using delay and retryWhen)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#7-simple-and-advanced-exponential-backoff-using-delay-and-retrywhen)
-8. [Form validation (using combineLatest)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#8-form-validation-using-combinelatest)
-9. [Pseudo caching : retrieve data first from a cache, then a network call (using concat, concatEager, merge or publish)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#9-pseudo-caching--retrieve-data-first-from-a-cache-then-a-network-call-using-concat-concateager-merge-or-publish)
-10. [Simple timing demos (using timer, interval or delay)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#10-simple-timing-demos-using-timer-interval-and-delay)
-11. [RxBus : event bus using RxJava (using RxRelay (never terminating Subjects) and debouncedBuffer)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#11-rxbus--event-bus-using-rxjava-using-rxrelay-never-terminating-subjects-and-debouncedbuffer)
-12. [Persist data on Activity rotations (using Subjects and retained Fragments)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#12-persist-data-on-activity-rotations-using-subjects-and-retained-fragments)
-13. [Networking with Volley](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#13-networking-with-volley)
-14. [Pagination with Rx (using Subjects)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#14-pagination-with-rx-using-subjects)
-15. [Orchestrating Observable: make parallel network calls, then combine the result into a single data point (using flatmap & zip)](https://github.com/kaushikgopal/RxJava-Android-Samples/blob/master/README.md#15-orchestrating-observable-make-parallel-network-calls-then-combine-the-result-into-a-single-data-point-using-flatmap--zip)
-16. [Simple Timeout example (using timeout)]()
+1. [Background work & concurrency (using Schedulers)](#1-background-work--concurrency-using-schedulers)
+2. [Accumulate calls (using buffer)](#2-accumulate-calls-using-buffer)
+3. [Instant/Auto searching text listeners (using Subjects & debounce)](#3-instantauto-searching-text-listeners-using-subjects--debounce)
+4. [Networking with Retrofit & RxJava (using zip, flatmap)](#4-networking-with-retrofit--rxjava-using-zip-flatmap)
+5. [Two-way data binding for TextViews (using PublishSubject)](#5-two-way-data-binding-for-textviews-using-publishsubject)
+6. [Simple and Advanced polling (using interval and repeatWhen)](#6-simple-and-advanced-polling-using-interval-and-repeatwhen)
+7. [Simple and Advanced exponential backoff (using delay and retryWhen)](#7-simple-and-advanced-exponential-backoff-using-delay-and-retrywhen)
+8. [Form validation (using combineLatest)](#8-form-validation-using-combinelatest)
+9. [Pseudo caching : retrieve data first from a cache, then a network call (using concat, concatEager, merge or publish)](#9-pseudo-caching--retrieve-data-first-from-a-cache-then-a-network-call-using-concat-concateager-merge-or-publish)
+10. [Simple timing demos (using timer, interval or delay)](#10-simple-timing-demos-using-timer-interval-and-delay)
+11. [RxBus : event bus using RxJava (using RxRelay (never terminating Subjects) and debouncedBuffer)](#11-rxbus--event-bus-using-rxjava-using-rxrelay-never-terminating-subjects-and-debouncedbuffer)
+12. [Persist data on Activity rotations (using Subjects and retained Fragments)](#12-persist-data-on-activity-rotations-using-subjects-and-retained-fragments)
+13. [Networking with Volley](#13-networking-with-volley)
+14. [Pagination with Rx (using Subjects)](#14-pagination-with-rx-using-subjects)
+15. [Orchestrating Observable: make parallel network calls, then combine the result into a single data point (using flatmap & zip)](#15-orchestrating-observable-make-parallel-network-calls-then-combine-the-result-into-a-single-data-point-using-flatmap--zip)
+16. [Simple Timeout example (using timeout)](#16-simple-timeout-example-using-timeout)
 
 ## Description
 
@@ -100,6 +100,7 @@ We simulate this behaviour using RxJava with the [`retryWhen` operator](http://r
 
 * http://stackoverflow.com/a/25292833/159825
 * Another excellent implementation via @[sddamico](https://github.com/sddamico) : https://gist.github.com/sddamico/c45d7cdabc41e663bea1
+* This one includes support for jittering, by @[leandrofavarin](https://github.com/leandrofavarin) : http://leandrofavarin.com/exponential-backoff-rxjava-operator-with-jitter
 
 Also look at the [Polling example](https://github.com/kaushikgopal/RxJava-Android-Samples#polling-with-schedulers) where we use a very similar Exponential backoff mechanism.
 

app/build.gradle

@@ -4,10 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
-        // can be removed with android-gradle plugin is upgraded to 2.2
-        // https://twitter.com/JakeWharton/status/760836175586267136
-        classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
+        classpath 'me.tatarka:gradle-retrolambda:3.6.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
     }
 
@@ -17,6 +14,7 @@ buildscript {
 
 apply plugin: 'com.android.application'
 apply plugin: 'me.tatarka.retrolambda'
+apply plugin: 'com.f2prateek.javafmt'
 apply plugin: 'kotlin-android'
 
 dependencies {
@@ -25,8 +23,9 @@ dependencies {
     compile "com.android.support:recyclerview-v7:${supportLibVersion}"
 
     compile 'com.github.kaushikgopal:CoreTextUtils:c703fa12b6'
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.jakewharton.timber:timber:2.4.2'
+    compile "com.jakewharton:butterknife:${butterKnifeVersion}"
+    annotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
+    compile 'com.jakewharton.timber:timber:4.5.1'
     compile "com.squareup.retrofit2:retrofit:${retrofitVersion}"
     compile "com.squareup.retrofit2:converter-gson:${retrofitVersion}"
     compile "com.squareup.okhttp3:okhttp:${okhttpVersion}"
@@ -39,18 +38,15 @@ dependencies {
     // ----------------------------------
     //  Rx dependencies
 
-    compile 'io.reactivex.rxjava2:rxjava:2.0.1'
+    compile 'io.reactivex.rxjava2:rxjava:2.0.7'
 
     // 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.github.akarnokd:rxjava2-extensions:0.16.0"
     compile 'com.jakewharton.rxrelay2:rxrelay:2.0.0'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
+    compile 'com.jakewharton.rxbinding2:rxbinding:2.0.0'
     compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
 
     // ----------------------------------
@@ -70,23 +66,19 @@ android {
         versionCode 2
         versionName "1.2"
     }
-
     buildTypes {
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
-
     compileOptions {
         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

@@ -2,60 +2,58 @@
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 import com.morihacky.android.rxjava.fragments.MainFragment;
 import com.morihacky.android.rxjava.fragments.RotationPersist1WorkerFragment;
 import com.morihacky.android.rxjava.fragments.RotationPersist2WorkerFragment;
 import com.morihacky.android.rxjava.rxbus.RxBus;
 
-public class MainActivity
-      extends FragmentActivity {
+public class MainActivity extends AppCompatActivity {
 
-    private RxBus _rxBus = null;
+  private RxBus _rxBus = null;
 
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        _removeWorkerFragments();
-    }
+  @Override
+  public void onBackPressed() {
+    super.onBackPressed();
+    _removeWorkerFragments();
+  }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
 
-        if (savedInstanceState == null) {
-            getSupportFragmentManager().beginTransaction()
-                                       .replace(android.R.id.content, new MainFragment(), this.toString())
-                                       .commit();
-        }
+    if (savedInstanceState == null) {
+      getSupportFragmentManager()
+          .beginTransaction()
+          .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;
+  // This is better done with a DI Library like Dagger
+  public RxBus getRxBusSingleton() {
+    if (_rxBus == null) {
+      _rxBus = new RxBus();
     }
 
-    private void _removeWorkerFragments() {
-        Fragment frag = getSupportFragmentManager().findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
+    return _rxBus;
+  }
 
-        if (frag != null) {
-            getSupportFragmentManager()
-                  .beginTransaction()
-                  .remove(frag)
-                  .commit();
-        }
+  private void _removeWorkerFragments() {
+    Fragment frag =
+        getSupportFragmentManager()
+            .findFragmentByTag(RotationPersist1WorkerFragment.class.getName());
+
+    if (frag != null) {
+      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();
-        }
+    if (frag != null) {
+      getSupportFragmentManager().beginTransaction().remove(frag).commit();
     }
-}
+  }
+}

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

@@ -6,33 +6,38 @@
 import com.squareup.leakcanary.RefWatcher;
 import timber.log.Timber;
 
-public class MyApp
-      extends Application {
+public class MyApp extends Application {
 
-    private static MyApp _instance;
-    private RefWatcher _refWatcher;
+  private static MyApp _instance;
+  private RefWatcher _refWatcher;
 
-    public static MyApp get() {
-        return _instance;
-    }
+  public static MyApp get() {
+    return _instance;
+  }
 
-    public static RefWatcher getRefWatcher() {
-        return MyApp.get()._refWatcher;
-    }
+  public static RefWatcher getRefWatcher() {
+    return MyApp.get()._refWatcher;
+  }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
+  @Override
+  public void onCreate() {
+    super.onCreate();
 
-        _instance = (MyApp) getApplicationContext();
-        _refWatcher = LeakCanary.install(this);
+    if (LeakCanary.isInAnalyzerProcess(this)) {
+      // This process is dedicated to LeakCanary for heap analysis.
+      // You should not init your app in this process.
+      return;
+    }
 
-        // for better RxJava debugging
-        //RxJavaHooks.enableAssemblyTracking();
+    _instance = (MyApp) getApplicationContext();
+    _refWatcher = LeakCanary.install(this);
 
-        // Initialize Volley
-        MyVolley.init(this);
+    // for better RxJava debugging
+    //RxJavaHooks.enableAssemblyTracking();
 
-        Timber.plant(new Timber.DebugTree());
-    }
+    // Initialize Volley
+    MyVolley.init(this);
+
+    Timber.plant(new Timber.DebugTree());
+  }
 }

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

@@ -4,13 +4,12 @@
 import com.morihacky.android.rxjava.MyApp;
 import com.squareup.leakcanary.RefWatcher;
 
-public class BaseFragment
-      extends Fragment {
+public class BaseFragment extends Fragment {
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        RefWatcher refWatcher = MyApp.getRefWatcher();
-        refWatcher.watch(this);
-    }
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+    RefWatcher refWatcher = MyApp.getRefWatcher();
+    refWatcher.watch(this);
+  }
 }