TBR: Renaming SyncbaseXAdapter -> RxXAdapter
These adapters no longer have much to do with Syncbase, as that
functionality has been factored into functional(ish) accumulators instead.
Change-Id: I4edfe5ffcf188ca534544dddeb51cccf097160c7
diff --git a/baku-toolkit/lib/src/androidTest/java/io/v/baku/toolkit/bind/CollectionBindingTest.java b/baku-toolkit/lib/src/androidTest/java/io/v/baku/toolkit/bind/CollectionBindingTest.java
index 2b17d53..60ababf 100644
--- a/baku-toolkit/lib/src/androidTest/java/io/v/baku/toolkit/bind/CollectionBindingTest.java
+++ b/baku-toolkit/lib/src/androidTest/java/io/v/baku/toolkit/bind/CollectionBindingTest.java
@@ -37,7 +37,7 @@
mTable.put("Good morning", "starshine")));
final ListView listView = new ListView(getContext());
- try (final SyncbaseListAdapter<RxTable.Row<String>> adapter = CollectionBinding.builder()
+ try (final RxListAdapter<RxTable.Row<String>> adapter = CollectionBinding.builder()
.onError(t -> fail(Throwables.getStackTraceAsString(t)))
.viewAdapterContext(getContext())
.rxTable(mTable)
diff --git a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/CollectionAdapterBuilder.java b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/CollectionAdapterBuilder.java
index bbaf946..9a8c972 100644
--- a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/CollectionAdapterBuilder.java
+++ b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/CollectionAdapterBuilder.java
@@ -56,24 +56,24 @@
public abstract Observable<? extends ListAccumulator<T>> buildListAccumulator();
- public SyncbaseListAdapter<T> buildListAdapter() {
- return subscribeAdapter(new SyncbaseListAdapter<>(
+ public RxListAdapter<T> buildListAdapter() {
+ return subscribeAdapter(new RxListAdapter<>(
buildListAccumulator(), getViewAdapter(), mBase.mOnError));
}
- public SyncbaseRecyclerAdapter<T, ?> buildRecyclerAdapter() {
- return subscribeAdapter(new SyncbaseRecyclerAdapter<>(
+ public RxRecyclerAdapter<T, ?> buildRecyclerAdapter() {
+ return subscribeAdapter(new RxRecyclerAdapter<>(
buildListAccumulator(), getViewAdapter(), mBase.mOnError));
}
- public SyncbaseListAdapter<T> bindTo(final ListView listView) {
- final SyncbaseListAdapter<T> adapter = buildListAdapter();
+ public RxListAdapter<T> bindTo(final ListView listView) {
+ final RxListAdapter<T> adapter = buildListAdapter();
listView.setAdapter(adapter);
return adapter;
}
- public SyncbaseRecyclerAdapter<T, ?> bindTo(final RecyclerView recyclerView) {
- final SyncbaseRecyclerAdapter<T, ?> adapter = buildRecyclerAdapter();
+ public RxRecyclerAdapter<T, ?> bindTo(final RecyclerView recyclerView) {
+ final RxRecyclerAdapter<T, ?> adapter = buildRecyclerAdapter();
recyclerView.setAdapter(adapter);
return adapter;
}
diff --git a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseListAdapter.java b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxListAdapter.java
similarity index 86%
rename from baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseListAdapter.java
rename to baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxListAdapter.java
index 7877239..29b2f51 100644
--- a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseListAdapter.java
+++ b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxListAdapter.java
@@ -17,7 +17,7 @@
import rx.functions.Action1;
@Accessors(prefix = "m")
-public class SyncbaseListAdapter<T> extends BaseAdapter
+public class RxListAdapter<T> extends BaseAdapter
implements RangeAdapter, ListAccumulator<T> {
private final ViewAdapter<? super T, ?> mViewAdapter;
@Delegate
@@ -25,9 +25,9 @@
@Getter
private final Subscription mSubscription;
- public SyncbaseListAdapter(final Observable<? extends ListAccumulator<T>> data,
- final ViewAdapter<? super T, ?> viewAdapter,
- final Action1<Throwable> onError) {
+ public RxListAdapter(final Observable<? extends ListAccumulator<T>> data,
+ final ViewAdapter<? super T, ?> viewAdapter,
+ final Action1<Throwable> onError) {
mViewAdapter = viewAdapter;
mSubscription = data
.observeOn(AndroidSchedulers.mainThread())
diff --git a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseRecyclerAdapter.java b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxRecyclerAdapter.java
similarity index 85%
rename from baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseRecyclerAdapter.java
rename to baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxRecyclerAdapter.java
index 1bc4d83..34ee173 100644
--- a/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/SyncbaseRecyclerAdapter.java
+++ b/baku-toolkit/lib/src/main/java/io/v/baku/toolkit/bind/RxRecyclerAdapter.java
@@ -16,8 +16,8 @@
import rx.functions.Action1;
@Accessors(prefix = "m")
-public class SyncbaseRecyclerAdapter<T, VH extends ViewHolder>
- extends RecyclerView.Adapter<SyncbaseRecyclerAdapter.ViewHolderAdapter<VH>>
+public class RxRecyclerAdapter<T, VH extends ViewHolder>
+ extends RecyclerView.Adapter<RxRecyclerAdapter.ViewHolderAdapter<VH>>
implements RangeAdapter, ListAccumulator<T> {
public static class ViewHolderAdapter<B extends ViewHolder> extends RecyclerView.ViewHolder {
@@ -34,9 +34,9 @@
@Getter
private final Subscription mSubscription;
- public SyncbaseRecyclerAdapter(final Observable<? extends ListAccumulator<T>> data,
- final ViewAdapter<? super T, VH> viewAdapter,
- final Action1<Throwable> onError) {
+ public RxRecyclerAdapter(final Observable<? extends ListAccumulator<T>> data,
+ final ViewAdapter<? super T, VH> viewAdapter,
+ final Action1<Throwable> onError) {
mViewAdapter = viewAdapter;
mSubscription = data
.observeOn(AndroidSchedulers.mainThread())