Merge pull request #51 from square/jw/latest-rx

Latest RxJava, RxAndroid, and add RxBinding to replace old RxAndroid things.

Author: Alec Strong

build.gradle

@@ -29,8 +29,9 @@ ext {
   timber = 'com.jakewharton.timber:timber:2.7.1'
   autoParcel = 'com.github.frankiesardo:auto-parcel:0.3'
   autoParcelProcessor = 'com.github.frankiesardo:auto-parcel-processor:0.3'
-  rxJava = 'io.reactivex:rxjava:1.0.13'
-  rxAndroid = 'io.reactivex:rxandroid:0.25.0'
+  rxJava = 'io.reactivex:rxjava:1.0.14'
+  rxAndroid = 'io.reactivex:rxandroid:1.0.1'
+  rxBinding = 'com.jakewharton.rxbinding:rxbinding:0.2.0'
   truth = 'com.google.truth:truth:0.27'
   findbugsJsr305 = 'com.google.code.findbugs:jsr305:3.0.0'
   findbugsAnnotations = 'com.google.code.findbugs:annotations:3.0.0'

sqlbrite-sample/build.gradle

@@ -21,7 +21,9 @@ dependencies {
   // Third-party dependencies.
   compile rootProject.ext.butterKnife
   compile rootProject.ext.timber
+  compile rootProject.ext.rxJava
   compile rootProject.ext.rxAndroid
+  compile rootProject.ext.rxBinding
   compile rootProject.ext.autoParcel
   apt rootProject.ext.autoParcelProcessor
 
@@ -54,7 +56,7 @@ android {
   }
 
   defaultConfig {
-    minSdkVersion 9
+    minSdkVersion 14
     targetSdkVersion 23
     applicationId 'com.example.sqlbrite.todo'
 

sqlbrite-sample/src/main/java/com/example/sqlbrite/todo/ui/ItemsFragment.java

@@ -35,12 +35,12 @@
 import com.example.sqlbrite.todo.db.Db;
 import com.example.sqlbrite.todo.db.TodoItem;
 import com.example.sqlbrite.todo.db.TodoList;
+import com.jakewharton.rxbinding.widget.AdapterViewItemClickEvent;
+import com.jakewharton.rxbinding.widget.RxAdapterView;
 import com.squareup.sqlbrite.BriteDatabase;
 import javax.inject.Inject;
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
-import rx.android.widget.OnItemClickEvent;
-import rx.android.widget.WidgetObservable;
 import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.functions.Func2;
@@ -136,11 +136,10 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     listView.setEmptyView(emptyView);
     listView.setAdapter(adapter);
 
-    WidgetObservable.itemClicks(listView) //
-        .subscribeOn(AndroidSchedulers.mainThread())
+    RxAdapterView.itemClickEvents(listView) //
         .observeOn(Schedulers.io())
-        .subscribe(new Action1<OnItemClickEvent>() {
-          @Override public void call(OnItemClickEvent event) {
+        .subscribe(new Action1<AdapterViewItemClickEvent>() {
+          @Override public void call(AdapterViewItemClickEvent event) {
             boolean newValue = !adapter.getItem(event.position()).complete();
             db.update(TodoItem.TABLE, new TodoItem.Builder().complete(newValue).build(),
                 TodoItem.ID + " = ?", String.valueOf(event.id()));

sqlbrite-sample/src/main/java/com/example/sqlbrite/todo/ui/NewItemFragment.java

@@ -29,12 +29,10 @@
 import com.example.sqlbrite.todo.R;
 import com.example.sqlbrite.todo.TodoApp;
 import com.example.sqlbrite.todo.db.TodoItem;
+import com.jakewharton.rxbinding.widget.RxTextView;
 import com.squareup.sqlbrite.BriteDatabase;
 import javax.inject.Inject;
 import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.android.widget.OnTextChangeEvent;
-import rx.android.widget.WidgetObservable;
 import rx.functions.Action1;
 import rx.functions.Func2;
 import rx.schedulers.Schedulers;
@@ -72,15 +70,12 @@ private long getListId() {
     View view = LayoutInflater.from(context).inflate(R.layout.new_item, null);
 
     EditText name = findById(view, android.R.id.input);
-    Observable<OnTextChangeEvent> nameText = WidgetObservable.text(name);
-
-    Observable.combineLatest(createClicked, nameText,
-        new Func2<String, OnTextChangeEvent, String>() {
-          @Override public String call(String ignored, OnTextChangeEvent event) {
-            return event.text().toString();
+    Observable.combineLatest(createClicked, RxTextView.textChanges(name),
+        new Func2<String, CharSequence, String>() {
+          @Override public String call(String ignored, CharSequence text) {
+            return text.toString();
           }
         }) //
-        .subscribeOn(AndroidSchedulers.mainThread())
         .observeOn(Schedulers.io())
         .subscribe(new Action1<String>() {
           @Override public void call(String description) {
@@ -98,7 +93,7 @@ private long getListId() {
           }
         })
         .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-          @Override public void onClick(DialogInterface dialog, int which) {
+          @Override public void onClick(@NonNull DialogInterface dialog, int which) {
           }
         })
         .create();

sqlbrite-sample/src/main/java/com/example/sqlbrite/todo/ui/NewListFragment.java

@@ -29,12 +29,10 @@
 import com.example.sqlbrite.todo.R;
 import com.example.sqlbrite.todo.TodoApp;
 import com.example.sqlbrite.todo.db.TodoList;
+import com.jakewharton.rxbinding.widget.RxTextView;
 import com.squareup.sqlbrite.BriteDatabase;
 import javax.inject.Inject;
 import rx.Observable;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.android.widget.OnTextChangeEvent;
-import rx.android.widget.WidgetObservable;
 import rx.functions.Action1;
 import rx.functions.Func2;
 import rx.schedulers.Schedulers;
@@ -61,15 +59,12 @@ public static NewListFragment newInstance() {
     View view = LayoutInflater.from(context).inflate(R.layout.new_list, null);
 
     EditText name = findById(view, android.R.id.input);
-    Observable<OnTextChangeEvent> nameText = WidgetObservable.text(name);
-
-    Observable.combineLatest(createClicked, nameText,
-        new Func2<String, OnTextChangeEvent, String>() {
-          @Override public String call(String ignored, OnTextChangeEvent event) {
-            return event.text().toString();
+    Observable.combineLatest(createClicked, RxTextView.textChanges(name),
+        new Func2<String, CharSequence, String>() {
+          @Override public String call(String ignored, CharSequence text) {
+            return text.toString();
           }
         }) //
-        .subscribeOn(AndroidSchedulers.mainThread())
         .observeOn(Schedulers.io())
         .subscribe(new Action1<String>() {
           @Override public void call(String name) {
@@ -86,7 +81,7 @@ public static NewListFragment newInstance() {
           }
         })
         .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
-          @Override public void onClick(DialogInterface dialog, int which) {
+          @Override public void onClick(@NonNull DialogInterface dialog, int which) {
           }
         })
         .create();