further changes

Author: jonathan-caryl

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'
     }
 
     // Exclude the lombok version that the android plugin depends on.
@@ -19,10 +16,11 @@ apply plugin: 'me.tatarka.retrolambda'
 apply plugin: 'com.f2prateek.javafmt'
 
 ext {
-    okhttpVersion = "3.0.1"
-    retrofitVersion = "2.0.0"
-    sdkVersion = 24
-    supportLibVersion = "25.2.0"
+    okhttpVersion = '3.6.0'
+    retrofitVersion = "2.2.0"
+    sdkVersion = 25
+    supportLibVersion = '25.3.0'
+    leakCanaryVersion = '1.5'
     butterKnifeVersion = '8.5.1'
 }
 
@@ -34,7 +32,7 @@ dependencies {
     compile 'com.github.kaushikgopal:CoreTextUtils:c703fa12b6'
     compile "com.jakewharton:butterknife:$butterKnifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterKnifeVersion"
-    compile 'com.jakewharton.timber:timber:2.4.2'
+    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}"
@@ -44,18 +42,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'
 
     // ----------------------------------

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

@@ -2,13 +2,13 @@
 
 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;
 

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

@@ -23,6 +23,12 @@ public static RefWatcher getRefWatcher() {
   public void onCreate() {
     super.onCreate();
 
+    if (LeakCanary.isInAnalyzerProcess(this)) {
+      // This process is dedicated to LeakCanary for heap analysis.
+      // You should not init your app in this process.
+      return;
+    }
+
     _instance = (MyApp) getApplicationContext();
     _refWatcher = LeakCanary.install(this);
 

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

@@ -10,7 +10,7 @@
 import android.widget.Button;
 import android.widget.ListView;
 
-import com.jakewharton.rxbinding.view.RxView;
+import com.jakewharton.rxbinding2.view.RxView;
 import com.morihacky.android.rxjava.R;
 import com.morihacky.android.rxjava.wiring.LogAdapter;
 
@@ -20,7 +20,6 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 import butterknife.Unbinder;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -91,7 +90,7 @@ public void onDestroyView() {
   // Main Rx entities
 
   private Disposable _getBufferedDisposable() {
-    return RxJavaInterop.toV2Observable(RxView.clickEvents(_tapBtn))
+    return RxView.clicks(_tapBtn)
         .map(
             onClickEvent -> {
               Timber.d("--------- GOT A TAP");

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

@@ -12,8 +12,8 @@
 import android.widget.EditText;
 import android.widget.ListView;
 
-import com.jakewharton.rxbinding.widget.RxTextView;
-import com.jakewharton.rxbinding.widget.TextViewTextChangeEvent;
+import com.jakewharton.rxbinding2.widget.RxTextView;
+import com.jakewharton.rxbinding2.widget.TextViewTextChangeEvent;
 import com.morihacky.android.rxjava.R;
 
 import java.util.ArrayList;
@@ -23,7 +23,6 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 import butterknife.Unbinder;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
@@ -75,7 +74,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     _setupLogger();
 
     _disposable =
-        RxJavaInterop.toV2Observable(RxTextView.textChangeEvents(_inputSearchText))
+        RxTextView.textChangeEvents(_inputSearchText)
             .debounce(400, TimeUnit.MILLISECONDS) // default Scheduler is Computation
             .filter(changes -> isNotNullOrEmpty(changes.text().toString()))
             .observeOn(AndroidSchedulers.mainThread())

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

@@ -13,9 +13,9 @@
 import butterknife.OnClick;
 import com.morihacky.android.rxjava.R;
 import com.morihacky.android.rxjava.wiring.LogAdapter;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
 
 import butterknife.Unbinder;
+import hu.akarnokd.rxjava2.math.MathFlowable;
 import io.reactivex.Flowable;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.functions.Function;
@@ -24,7 +24,6 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import org.reactivestreams.Publisher;
-import rx.observables.MathObservable;
 import timber.log.Timber;
 
 import static android.os.Looper.getMainLooper;
@@ -131,8 +130,7 @@ public void onComplete() {
         .delay(
             integer -> {
               // Rx-y way of doing the Fibonnaci :P
-              return RxJavaInterop.toV2Flowable(
-                      MathObservable.sumInteger(rx.Observable.range(1, integer)))
+              return MathFlowable.sumInt(Flowable.range(1, integer))
                   .flatMap(
                       targetSecondDelay ->
                           Flowable.just(integer).delay(targetSecondDelay, TimeUnit.SECONDS));

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

@@ -9,11 +9,12 @@
 import android.widget.TextView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import com.jakewharton.rxbinding.widget.RxTextView;
+
+import com.jakewharton.rxbinding2.widget.RxTextView;
 import com.morihacky.android.rxjava.R;
 
 import butterknife.Unbinder;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import io.reactivex.BackpressureStrategy;
 import io.reactivex.Flowable;
 import io.reactivex.subscribers.DisposableSubscriber;
 import timber.log.Timber;
@@ -47,10 +48,9 @@ public View onCreateView(
     View layout = inflater.inflate(R.layout.fragment_form_validation_comb_latest, container, false);
     unbinder = ButterKnife.bind(this, layout);
 
-    _emailChangeObservable = RxJavaInterop.toV2Flowable(RxTextView.textChanges(_email).skip(1));
-    _passwordChangeObservable =
-        RxJavaInterop.toV2Flowable(RxTextView.textChanges(_password).skip(1));
-    _numberChangeObservable = RxJavaInterop.toV2Flowable(RxTextView.textChanges(_number).skip(1));
+    _emailChangeObservable = RxTextView.textChanges(_email).skip(1).toFlowable(BackpressureStrategy.LATEST);
+    _passwordChangeObservable = RxTextView.textChanges(_password).skip(1).toFlowable(BackpressureStrategy.LATEST);
+    _numberChangeObservable = RxTextView.textChanges(_number).skip(1).toFlowable(BackpressureStrategy.LATEST);
 
     _combineLatestEvents();
 

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

@@ -158,9 +158,9 @@ public void onError(Throwable e) {
                   }
 
                   @Override
-                  public void onNext(Pair pair) {
-                    User user = ((Pair<User, Contributor>) pair).first;
-                    Contributor contributor = ((Pair<User, Contributor>) pair).second;
+                  public void onNext(Pair<User, Contributor> pair) {
+                    User user = pair.first;
+                    Contributor contributor = pair.second;
 
                     _adapter.add(
                         format(

app/src/main/res/layout/fragment_buffer.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -21,8 +20,8 @@
         android:layout_width="match_parent"
         android:layout_marginLeft="90dp"
         android:layout_marginRight="90dp"
-        android:textSize="16dp"
-        android:text="tap me"
+        android:textSize="16sp"
+        android:text="@string/tap_me"
         />
 
     <ListView

app/src/main/res/layout/fragment_concurrency_schedulers.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -27,7 +26,7 @@
             android:layout_width="wrap_content"
             android:layout_marginLeft="20dp"
             android:textSize="16sp"
-            android:text="Start long operation"
+            android:text="@string/start_long_operation"
             />
 
         <ProgressBar

app/src/main/res/layout/fragment_debounce.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -27,7 +26,7 @@
             android:layout_height="match_parent"
             android:layout_width="0dp"
             android:textSize="16sp"
-            android:hint="Enter some search text"
+            android:hint="@string/enter_some_search_text"
             android:inputType="textNoSuggestions"
             />
 

app/src/main/res/layout/fragment_demo_timing.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -38,15 +37,15 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="BTN 1"
+                android:text="@string/btn_1"
                 />
 
             <Button
                 android:id="@+id/btn_demo_timing_2"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="BTN 2"
+                android:text="@string/btn_2"
                 />
         </TableRow>
 
@@ -60,15 +59,15 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="BTN 3"
+                android:text="@string/btn_3"
                 />
 
             <Button
                 android:id="@+id/btn_demo_timing_4"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="BTN 4"
+                android:text="@string/btn_4"
                 />
         </TableRow>
 
@@ -82,7 +81,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="BTN 5"
+                android:text="@string/btn_5"
                 />
 
             <Button
@@ -91,7 +90,7 @@
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:text="CLEAR LOG"
+                android:text="@string/clear_log"
                 />
         </TableRow>
     </TableLayout>

app/src/main/res/layout/fragment_double_binding_textview.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -27,7 +26,7 @@
             android:layout_height="50dp"
             android:layout_width="0dp"
             android:gravity="center"
-            android:text="100"
+            android:text="@string/one_hundred"
             android:inputType="numberDecimal"
             />
 
@@ -36,7 +35,7 @@
             android:layout_height="50dp"
             android:layout_width="0dp"
             android:gravity="center"
-            android:text="+"
+            android:text="@string/plus"
             />
 
         <EditText
@@ -45,7 +44,7 @@
             android:layout_height="50dp"
             android:layout_width="0dp"
             android:gravity="center"
-            android:text="8"
+            android:text="@string/eight"
             android:inputType="numberDecimal"
             />
     </LinearLayout>
@@ -57,7 +56,7 @@
         android:layout_marginTop="10dp"
         android:gravity="center"
         android:textSize="45sp"
-        android:text="0"
+        android:text="@string/zero"
         />
 
 </LinearLayout>

app/src/main/res/layout/fragment_exponential_backoff.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <LinearLayout
     android:orientation="vertical"
     android:layout_height="match_parent"
@@ -27,15 +26,15 @@
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:text="Retry"
+            android:text="@string/retry"
             />
 
         <Button
             android:id="@+id/btn_eb_delay"
             android:layout_weight="1"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:text="Delay"
+            android:text="@string/delay"
             />
     </LinearLayout>