MVI sample - Updated to RxBindings 2.0 - removes RxInterop

sockeqwe · Mar 11, 2017 · d46f9f5 · d46f9f5
1 parent 3e86901
commit d46f9f5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ dependencies {
 
 	compile 'com.hannesdorfmann.mosby3:mvp:3.0.1-SNAPSHOT'
 	compile 'com.hannesdorfmann.mosby3:viewstate:3.0.1-SNAPSHOT'
-	
+
 	compile 'com.hannesdorfmann.mosby3:mvp-lce:3.0.1-SNAPSHOT'
 	compile 'com.hannesdorfmann.mosby3:mvp-nullobject-presenter:3.0.1-SNAPSHOT'
 }

diff --git a/sample-mvi/build.gradle b/sample-mvi/build.gradle
@@ -47,7 +47,7 @@ android {
 dependencies {
 
   def retrofitVersion = '2.1.1-SNAPSHOT'
-  def rxbindingVersion = '1.0.0'
+  def rxbindingVersion = '2.0.0'
   def okHttpVersion = '3.6.0'
 
 
@@ -87,14 +87,12 @@ dependencies {
   compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
   compile 'com.github.bumptech.glide:glide:3.7.0'
 
-  compile "com.github.akarnokd:rxjava2-interop:0.7.2"
-
   debugCompile 'com.squareup.leakcanary:leakcanary-android:' + rootProject.ext.leakcanaryVersion
   releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:' + rootProject.ext.leakcanaryVersion
   testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:' + rootProject.ext.leakcanaryVersion
 
-  compile "com.jakewharton.rxbinding:rxbinding:$rxbindingVersion"
-  compile "com.jakewharton.rxbinding:rxbinding-support-v4:$rxbindingVersion"
-  compile "com.jakewharton.rxbinding:rxbinding-design:$rxbindingVersion"
-  compile "com.jakewharton.rxbinding:rxbinding-recyclerview-v7:$rxbindingVersion"
+  compile "com.jakewharton.rxbinding2:rxbinding:$rxbindingVersion"
+  compile "com.jakewharton.rxbinding2:rxbinding-support-v4:$rxbindingVersion"
+  compile "com.jakewharton.rxbinding2:rxbinding-design:$rxbindingVersion"
+  compile "com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:$rxbindingVersion"
 }
diff --git a/...in/java/com/hannesdorfmann/mosby3/sample/mvi/dependencyinjection/DependencyInjection.java b/...in/java/com/hannesdorfmann/mosby3/sample/mvi/dependencyinjection/DependencyInjection.java
@@ -83,11 +83,6 @@ public class DependencyInjection {
       new ShoppingCartOverviewPresenter(shoppingCart, deleteSelectionRelay, clearSelectionRelay);
 
 
-  // Initializer block
-  {
-    httpLogger.setLevel(HttpLoggingInterceptor.Level.BODY);
-  }
-
   private SearchEngine newSearchEngine() {
     return new SearchEngine(backendApiDecorator);
   }

diff --git a/...rc/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/checkoutbutton/CheckoutButton.java b/...rc/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/checkoutbutton/CheckoutButton.java
@@ -94,6 +94,7 @@ public CheckoutButton(Context context, AttributeSet attrs) {
     mviDelegate.onDetachedFromWindow();
   }
 
+
   @Override public Parcelable onSaveInstanceState() {
     return mviDelegate.onSaveInstanceState();
   }

diff --git a/...rc/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/detail/ProductDetailsActivity.java b/...rc/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/detail/ProductDetailsActivity.java
@@ -35,12 +35,10 @@
 import com.hannesdorfmann.mosby3.mvi.MviActivity;
 import com.hannesdorfmann.mosby3.sample.mvi.R;
 import com.hannesdorfmann.mosby3.sample.mvi.SampleApplication;
-import com.hannesdorfmann.mosby3.sample.mvi.businesslogic.http.ProductBackendApi;
 import com.hannesdorfmann.mosby3.sample.mvi.businesslogic.interactor.details.ProductDetailsViewState;
 import com.hannesdorfmann.mosby3.sample.mvi.businesslogic.model.Product;
 import com.hannesdorfmann.mosby3.sample.mvi.dependencyinjection.DependencyInjection;
-import com.jakewharton.rxbinding.view.RxView;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import com.jakewharton.rxbinding2.view.RxView;
 import io.reactivex.Observable;
 import java.util.Locale;
 import timber.log.Timber;
@@ -77,8 +75,7 @@ public static void start(Activity activity, Product product) {
     setSupportActionBar(toolbar);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-    fabClickObservable =
-        RxJavaInterop.toV2Observable(RxView.clicks(fab).share().map(ignored -> true));
+    fabClickObservable = RxView.clicks(fab).share().map(ignored -> true);
   }
 
   @NonNull @Override public ProductDetailsPresenter createPresenter() {

diff --git a/sample-mvi/src/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/home/HomeFragment.java b/sample-mvi/src/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/home/HomeFragment.java
@@ -40,9 +40,8 @@
 import com.hannesdorfmann.mosby3.sample.mvi.view.detail.ProductDetailsActivity;
 import com.hannesdorfmann.mosby3.sample.mvi.view.ui.GridSpacingItemDecoration;
 import com.hannesdorfmann.mosby3.sample.mvi.view.ui.viewholder.ProductViewHolder;
-import com.jakewharton.rxbinding.support.v4.widget.RxSwipeRefreshLayout;
-import com.jakewharton.rxbinding.support.v7.widget.RxRecyclerView;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import com.jakewharton.rxbinding2.support.v4.widget.RxSwipeRefreshLayout;
+import com.jakewharton.rxbinding2.support.v7.widget.RxRecyclerView;
 import io.reactivex.Observable;
 import timber.log.Timber;
 
@@ -112,7 +111,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
   }
 
   @Override public Observable<Boolean> loadNextPageIntent() {
-    return RxJavaInterop.toV2Observable(RxRecyclerView.scrollStateChanges(recyclerView))
+    return RxRecyclerView.scrollStateChanges(recyclerView)
         .filter(event -> !adapter.isLoadingNextPage())
         .filter(event -> event == RecyclerView.SCROLL_STATE_IDLE)
         .filter(event -> layoutManager.findLastCompletelyVisibleItemPosition()
@@ -121,8 +120,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
   }
 
   @Override public Observable<Boolean> pullToRefreshIntent() {
-    return RxJavaInterop.toV2Observable(
-        RxSwipeRefreshLayout.refreshes(swipeRefreshLayout).map(ignored -> true));
+    return RxSwipeRefreshLayout.refreshes(swipeRefreshLayout).map(ignored -> true);
   }
 
   @Override public Observable<String> loadAllProductsFromCategoryIntent() {

diff --git a/...le-mvi/src/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/search/SearchFragment.java b/...le-mvi/src/main/java/com/hannesdorfmann/mosby3/sample/mvi/view/search/SearchFragment.java
@@ -22,8 +22,7 @@
 import com.hannesdorfmann.mosby3.sample.mvi.view.detail.ProductDetailsActivity;
 import com.hannesdorfmann.mosby3.sample.mvi.view.ui.GridSpacingItemDecoration;
 import com.hannesdorfmann.mosby3.sample.mvi.view.ui.viewholder.ProductViewHolder;
-import com.jakewharton.rxbinding.widget.RxSearchView;
-import hu.akarnokd.rxjava.interop.RxJavaInterop;
+import com.jakewharton.rxbinding2.widget.RxSearchView;
 import io.reactivex.Observable;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -73,7 +72,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
   }
 
   @Override public Observable<String> searchIntent() {
-    return RxJavaInterop.toV2Observable(RxSearchView.queryTextChanges(searchView))
+    return RxSearchView.queryTextChanges(searchView)
         .skip(2) // Because after screen orientation changes query Text will be resubmitted again
         .filter(queryString -> queryString.length() > 3 || queryString.length() == 0)
         .debounce(500, TimeUnit.MILLISECONDS)