Merge pull request #30 from DevAhamed/1.2.3-update

1.2.3 update

Author: DevAhamed

README.md

@@ -20,10 +20,10 @@ The minimum API level supported by this library is API 9.
 
 ```gradle
 dependencies {
-    compile 'com.github.devahamed:multi-view-adapter:1.2.2'
+    compile 'com.github.devahamed:multi-view-adapter:1.2.3'
     
     // If you want to use data binding
-    compile 'com.github.devahamed:multi-view-adapter-databinding:1.2.2'
+    compile 'com.github.devahamed:multi-view-adapter-databinding:1.2.3'
 }
 ```
 

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Tue Apr 11 15:51:27 IST 2017
+#Thu Sep 21 00:26:32 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -34,7 +34,7 @@ android {
     minSdkVersion 9
     targetSdkVersion 25
     versionCode 1
-    versionName "1.2.2"
+    versionName "1.2.3"
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
@@ -60,7 +60,7 @@ publish {
   userOrg = 'devahamed'
   groupId = 'com.github.devahamed'
   artifactId = 'multi-view-adapter-databinding'
-  publishVersion = '1.2.2'
+  publishVersion = '1.2.3'
   repoName = 'MultiViewAdapter'
   desc = 'Additional DataBinding support for MultiViewAdapter'
   website = 'https://github.com/DevAhamed/MultiViewAdapter'

multi-view-adapter-databinding/build.gradle

@@ -24,7 +24,7 @@
  * @param <M> Refers to the model class
  * @param <VDB> Refers to the DataBinding class of the model
  */
-abstract class BindingViewHolder<M, VDB extends ViewDataBinding> extends BaseViewHolder<M> {
+abstract class BindingViewHolder<M, VDB extends ViewDataBinding> extends ItemViewHolder<M> {
 
   private final VDB binding;
 

multi-view-adapter-databinding/src/main/java/com/ahamed/multiviewadapter/BindingViewHolder.java

@@ -54,7 +54,7 @@ android {
     minSdkVersion 9
     targetSdkVersion 25
     versionCode 1
-    versionName "1.2.2"
+    versionName "1.2.3"
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
@@ -93,7 +93,7 @@ publish {
   groupId = 'com.github.devahamed'
   artifactId = 'multi-view-adapter'
   repoName = 'MultiViewAdapter'
-  publishVersion = '1.2.2'
+  publishVersion = '1.2.3'
   desc = 'Recyclerview Adapter library to create composable view holders'
   website = 'https://github.com/DevAhamed/MultiViewAdapter'
 }

multi-view-adapter/build.gradle

@@ -30,11 +30,10 @@
 
 @RunWith(AndroidJUnit4.class) public class RecyclerAdapterITest {
 
-  private RecyclerAdapter recyclerAdapter = new RecyclerAdapter();
-  private SelectableAdapter selectableAdapter = new SelectableAdapter();
-
   @Mock ItemSelectionChangedListener<DummyOne> itemSelectionChangedListener;
   @Mock MultiSelectionChangedListener<DummyOne> multiSelectionChangedListener;
+  private RecyclerAdapter recyclerAdapter = new RecyclerAdapter();
+  private SelectableAdapter selectableAdapter = new SelectableAdapter();
 
   @Test public void setExpandableModeTest() {
     recyclerAdapter.setExpandableMode(RecyclerAdapter.EXPANDABLE_MODE_MULTIPLE);

multi-view-adapter/src/androidTest/java/com/ahamed/multiviewadapter/RecyclerAdapterITest.java

@@ -25,7 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-class BaseDataManager<M> implements ListUpdateCallback {
+@RestrictTo(RestrictTo.Scope.LIBRARY) public abstract class BaseDataManager<M>
+    implements ListUpdateCallback {
 
   final RecyclerAdapter adapter;
   private List<M> dataList = new ArrayList<>();

multi-view-adapter/src/main/java/com/ahamed/multiviewadapter/BaseDataManager.java

@@ -16,177 +16,11 @@
 
 package com.ahamed.multiviewadapter;
 
-import android.support.annotation.RestrictTo;
-import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.view.View;
-import com.ahamed.multiviewadapter.listener.ItemActionListener;
 
-public class BaseViewHolder<M> extends ViewHolder
-    implements View.OnClickListener, View.OnLongClickListener {
-
-  private M item;
-  private OnItemClickListener<M> itemClickListener;
-  private OnItemLongClickListener<M> itemLongClickListener;
-  private ItemActionListener actionListener;
+@Deprecated public class BaseViewHolder<M> extends ItemViewHolder<M> {
 
   public BaseViewHolder(View itemView) {
     super(itemView);
-    itemView.setOnClickListener(this);
-    itemView.setOnLongClickListener(this);
-  }
-
-  @RestrictTo(RestrictTo.Scope.LIBRARY) @Override public final void onClick(View view) {
-    if (null == itemClickListener) return;
-    itemClickListener.onItemClick(view, getItem());
-  }
-
-  @RestrictTo(RestrictTo.Scope.LIBRARY) @Override public final boolean onLongClick(View view) {
-    return null != itemLongClickListener && itemLongClickListener.onItemLongClick(view, getItem());
-  }
-
-  final void setItemActionListener(ItemActionListener actionListener) {
-    this.actionListener = actionListener;
-  }
-
-  final void setItem(M item) {
-    this.item = item;
-  }
-
-  ////////////////////////////////////////
-  ///////// Public Methods ///////////////
-  ////////////////////////////////////////
-
-  /**
-   * Returns the item object bounded by this {@link BaseViewHolder}
-   *
-   * @return item bounded by this {@link BaseViewHolder}
-   */
-  public final M getItem() {
-    return item;
-  }
-
-  /**
-   * Can be called by the child view holders to toggle the selection.
-   */
-  protected final void toggleItemSelection() {
-    actionListener.onItemSelectionToggled(getAdapterPosition());
-  }
-
-  /**
-   * Can be called by the child view holders to toggle the {@link BaseViewHolder}'s expansion
-   * status.
-   */
-  protected final void toggleItemExpansion() {
-    actionListener.onItemExpansionToggled(getAdapterPosition());
-  }
-
-  /**
-   * Can be called by the child view holders to toggle the {@link DataGroupManager}'s expansion
-   * status.
-   */
-  protected final void toggleGroupExpansion() {
-    actionListener.onGroupExpansionToggled(getAdapterPosition());
-  }
-
-  /**
-   * Register a callback to be invoked when this {@link BaseViewHolder} is clicked. If this {@link
-   * BaseViewHolder} is not clickable, it becomes clickable.
-   *
-   * @param itemClickListener The callback that will run
-   */
-  protected final void setItemClickListener(OnItemClickListener<M> itemClickListener) {
-    this.itemClickListener = itemClickListener;
-  }
-
-  /**
-   * Register a callback to be invoked when this {@link BaseViewHolder} is clicked and held. If this
-   * {@link BaseViewHolder} is not long clickable, it becomes long clickable.
-   *
-   * @param itemLongClickListener The callback that will run
-   */
-  protected final void setItemLongClickListener(OnItemLongClickListener<M> itemLongClickListener) {
-    this.itemLongClickListener = itemLongClickListener;
-  }
-
-  /**
-   * @return boolean value indicating whether the viewholder is selected or not.
-   * @see BaseViewHolder#toggleItemSelection()
-   */
-  public final boolean isItemSelected() {
-    return actionListener.isItemSelected(getAdapterPosition());
-  }
-
-  /**
-   * @return boolean value indicating whether the viewholder is expanded or not.
-   * @see BaseViewHolder#toggleItemExpansion()
-   */
-  public final boolean isItemExpanded() {
-    return actionListener.isItemExpanded(getAdapterPosition());
-  }
-
-  /**
-   * @return boolean value indicating whether the adapter is in context mode or not.
-   * @see RecyclerAdapter#startActionMode() ()
-   * @see RecyclerAdapter#stopActionMode() ()
-   */
-  public final boolean isInActionMode() {
-    return actionListener.isAdapterInActionMode();
-  }
-
-  /**
-   * Returns the swipe directions for the provided ViewHolder.
-   * Default implementation returns the swipe directions as 0.
-   * This method can be overridden by child classes to provide valid swipe direction flags.
-   *
-   * @return A binary OR of direction flags.
-   */
-  public int getSwipeDirections() {
-    return 0;
-  }
-
-  /**
-   * Returns the drag directions for the provided ViewHolder. Default implementation returns the
-   * drag directions as 0.
-   * This method can be overridden by child classes to provide valid drag direction flags.
-   *
-   * @return A binary OR of direction flags.
-   */
-  public int getDragDirections() {
-    return 0;
-  }
-
-  /**
-   * The method lets the user to start dragging the viewholder
-   */
-  public final void startDrag() {
-    actionListener.onStartDrag(this);
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when a {@link BaseViewHolder} is clicked.
-   */
-  public interface OnItemClickListener<M> {
-    /**
-     * Called when a {@link BaseViewHolder} has been clicked.
-     *
-     * @param view The view that was clicked.
-     * @param item Item that is bounded by the {@link BaseViewHolder}
-     */
-    void onItemClick(View view, M item);
-  }
-
-  /**
-   * Interface definition for a callback to be invoked when a {@link BaseViewHolder} has been
-   * clicked and held.
-   */
-  public interface OnItemLongClickListener<M> {
-    /**
-     * Called when a {@link BaseViewHolder} has been clicked and held.
-     *
-     * @param view The view that was clicked and held.
-     * @param item Item that is bounded by the {@link BaseViewHolder}
-     * @return true if the callback consumed the long click, false otherwise.
-     */
-    boolean onItemLongClick(View view, M item);
   }
 }

multi-view-adapter/src/main/java/com/ahamed/multiviewadapter/BaseViewHolder.java

@@ -32,7 +32,7 @@
 import static com.ahamed.multiviewadapter.RecyclerAdapter.EXPANDABLE_MODE_NONE;
 import static com.ahamed.multiviewadapter.RecyclerAdapter.EXPANDABLE_MODE_SINGLE;
 
-class CoreRecyclerAdapter extends RecyclerView.Adapter<BaseViewHolder> {
+class CoreRecyclerAdapter extends RecyclerView.Adapter<ItemViewHolder> {
 
   final List<BaseDataManager> dataManagers = new ArrayList<>();
   final ItemDecorationManager itemDecorationManager;
@@ -75,7 +75,7 @@ class CoreRecyclerAdapter extends RecyclerView.Adapter<BaseViewHolder> {
       return isInActionMode;
     }
 
-    @Override public void onStartDrag(BaseViewHolder viewHolder) {
+    @Override public void onStartDrag(ItemViewHolder viewHolder) {
       itemTouchHelper.startDrag(viewHolder);
     }
   };
@@ -89,18 +89,18 @@ private boolean itemExpanded(int position) {
   }
 
   @RestrictTo(RestrictTo.Scope.LIBRARY) @Override
-  public final BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+  public final ItemViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
     return binders.get(viewType)
         .createViewHolder(LayoutInflater.from(parent.getContext()), parent, actionListener);
   }
 
   @RestrictTo(RestrictTo.Scope.LIBRARY) @Override
-  public final void onBindViewHolder(BaseViewHolder holder, int adapterPosition) {
+  public final void onBindViewHolder(ItemViewHolder holder, int adapterPosition) {
     onBindViewHolder(holder, adapterPosition, null);
   }
 
   @RestrictTo(RestrictTo.Scope.LIBRARY) @Override
-  public final void onBindViewHolder(BaseViewHolder holder, int adapterPosition,
+  public final void onBindViewHolder(ItemViewHolder holder, int adapterPosition,
       List<Object> payloads) {
     ItemBinder baseBinder = binders.get(holder.getItemViewType());