Feature/multi selection support + selection handler refacoring

app/src/main/java/com/evrencoskun/tableviewsample/MainFragment.java

@@ -97,6 +97,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
 
         // Create Table view
         mTableView = createTableView();
+        mTableView.setSelectable(true);
+        mTableView.getSelectionHandler().setShadowEnabled(true);
+        mTableView.getSelectionHandler().setMultiSelectionEnabled(true);
+        mTableFilter = new Filter(mTableView); // Create an instance of a Filter and pass the
+        // created TableView.
+
 
         if(paginationEnabled) {
             mTableFilter = new Filter(mTableView); // Create an instance of a Filter and pass the

app/src/main/java/com/evrencoskun/tableviewsample/tableview/model/Cell.java

@@ -17,18 +17,21 @@
 
 package com.evrencoskun.tableviewsample.tableview.model;
 
+import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
 import com.evrencoskun.tableview.filter.IFilterableModel;
+import com.evrencoskun.tableview.handler.ISelectableModel;
 import com.evrencoskun.tableview.sort.ISortableModel;
 
 /**
  * Created by evrencoskun on 11/06/2017.
  */
 
-public class Cell implements ISortableModel, IFilterableModel {
+public class Cell implements ISortableModel, IFilterableModel, ISelectableModel {
 
     private String mId;
     private Object mData;
     private String mFilterKeyword;
+    private AbstractViewHolder.SelectionState mSelectionState = AbstractViewHolder.SelectionState.UNSELECTED;
 
     public Cell(String id) {
         this.mId = id;
@@ -83,5 +86,15 @@ public void setFilterKeyword(String filterKeyword) {
     public String getFilterableKeyword() {
         return mFilterKeyword;
     }
+
+    @Override
+    public AbstractViewHolder.SelectionState getSelectionState() {
+        return mSelectionState;
+    }
+
+    @Override
+    public void setSelectionState(AbstractViewHolder.SelectionState selectionState) {
+        mSelectionState = selectionState;
+    }
 }
 

tableview/src/main/java/com/evrencoskun/tableview/ITableView.java

@@ -50,6 +50,10 @@ public interface ITableView {
 
     boolean isSortable();
 
+    boolean isSelectable();
+
+    void setSelectable(boolean selectable);
+
     CellRecyclerView getCellRecyclerView();
 
     CellRecyclerView getColumnHeaderRecyclerView();

tableview/src/main/java/com/evrencoskun/tableview/TableView.java

@@ -97,6 +97,7 @@ public class TableView extends FrameLayout implements ITableView {
     private boolean mShowHorizontalSeparators = true;
     private boolean mShowVerticalSeparators = true;
     private boolean mIsSortable;
+    private boolean mIsSelectable;
 
     public TableView(@NonNull Context context) {
         super(context);
@@ -345,6 +346,16 @@ public boolean isSortable() {
         return mIsSortable;
     }
 
+    @Override
+    public boolean isSelectable() {
+        return mIsSelectable;
+    }
+
+    @Override
+    public void setSelectable(boolean selectable) {
+        mIsSelectable = selectable;
+    }
+
     public void setShowHorizontalSeparators(boolean showSeparators) {
         this.mShowHorizontalSeparators = showSeparators;
     }
@@ -522,43 +533,37 @@ public boolean isRowVisible(int row) {
         return mVisibilityHandler.isRowVisible(row);
     }
 
+
+
+    public void setSelectedRow(int row) {
+        mSelectionHandler.setSelectedRowPosition(row);
+    }
+
     /**
      * Returns the index of the selected row, -1 if no row is selected.
      */
     public int getSelectedRow() {
-        return mSelectionHandler.getSelectedRowPosition();
-    }
-
-    public void setSelectedRow(int row) {
-        // Find the row header view holder which is located on row position.
-        AbstractViewHolder rowViewHolder = (AbstractViewHolder) getRowHeaderRecyclerView()
-                .findViewHolderForAdapterPosition(row);
-
-
-        mSelectionHandler.setSelectedRowPosition(rowViewHolder, row);
+        //TODO: reuse logic in mSelectionHandler.rowHasItemSelected
+        // to return list of selected rows
+        return -1;//mSelectionHandler.getSelectedRowPosition();
     }
 
     /**
      * Returns the index of the selected column, -1 if no column is selected.
      */
     public int getSelectedColumn() {
-        return mSelectionHandler.getSelectedColumnPosition();
+        //TODO: reuse logic in mSelectionHandler.columnHasItemSelected
+        // to return list of selected columns
+        return -1; //mSelectionHandler.getSelectedColumnPosition();
     }
 
     public void setSelectedColumn(int column) {
-        // Find the column view holder which is located on column position .
-        AbstractViewHolder columnViewHolder = (AbstractViewHolder) getColumnHeaderRecyclerView()
-                .findViewHolderForAdapterPosition(column);
-
-        mSelectionHandler.setSelectedColumnPosition(columnViewHolder, column);
+        mSelectionHandler.setSelectedColumnPosition(column);
     }
 
     public void setSelectedCell(int column, int row) {
         // Find the cell view holder which is located on x,y (column,row) position.
-        AbstractViewHolder cellViewHolder = getCellLayoutManager().getCellViewHolder
-                (column, row);
-
-        mSelectionHandler.setSelectedCellPositions(cellViewHolder, column, row);
+        mSelectionHandler.setSelectedCellPositions(row, column);
     }
 
     @Override

tableview/src/main/java/com/evrencoskun/tableview/adapter/AbstractTableAdapter.java

@@ -26,6 +26,7 @@
 import com.evrencoskun.tableview.adapter.recyclerview.CellRecyclerViewAdapter;
 import com.evrencoskun.tableview.adapter.recyclerview.ColumnHeaderRecyclerViewAdapter;
 import com.evrencoskun.tableview.adapter.recyclerview.RowHeaderRecyclerViewAdapter;
+import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -304,4 +305,32 @@ public void addAdapterDataSetChangedListener(AdapterDataSetChangedListener liste
 
         dataSetChangedListeners.add(listener);
     }
+
+    public boolean isSelectable(){
+        return mTableView.isSelectable();
+    }
+
+    public int getColorForSelection(AbstractViewHolder.SelectionState selectionState) {
+        switch (selectionState) {
+            case SELECTED:
+                return mTableView.getSelectedColor();
+            case SHADOWED:
+                return  mTableView.getShadowColor();
+        }
+        return mTableView.getUnSelectedColor();
+    }
+
+    public int getColumnHeaderItemCount() {
+        if( mColumnHeaderItems != null) {
+            return mColumnHeaderItems.size();
+        }
+        return 0;
+    }
+
+    public int getRowHeaderItemCount() {
+        if( mRowHeaderItems != null) {
+            return mRowHeaderItems.size();
+        }
+        return 0;
+    }
 }

tableview/src/main/java/com/evrencoskun/tableview/adapter/ITableAdapter.java

@@ -57,6 +57,8 @@ void onBindRowHeaderViewHolder(AbstractViewHolder holder, Object rowHeaderItemMo
 
     ITableView getTableView();
 
+    int getColorForSelection(AbstractViewHolder.SelectionState selectionState);
+
     /**
      * Sets the listener for changes of data set on the TableView.
      *

tableview/src/main/java/com/evrencoskun/tableview/adapter/recyclerview/CellRecyclerViewAdapter.java

@@ -124,29 +124,6 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
                 .scrollToPositionWithOffset(mHorizontalListener.getScrollPosition(),
                         mHorizontalListener.getScrollPositionOffset());
 
-        SelectionHandler selectionHandler = mTableAdapter.getTableView().getSelectionHandler();
-
-        if (selectionHandler.isAnyColumnSelected()) {
-
-            AbstractViewHolder cellViewHolder = (AbstractViewHolder) ((CellRowViewHolder) holder)
-                    .m_jRecyclerView.findViewHolderForAdapterPosition(selectionHandler
-                            .getSelectedColumnPosition());
-
-            if (cellViewHolder != null) {
-                // Control to ignore selection color
-                if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {
-                    cellViewHolder.setBackgroundColor(mTableAdapter.getTableView()
-                            .getSelectedColor());
-                }
-                cellViewHolder.setSelected(SelectionState.SELECTED);
-
-            }
-        } else if (selectionHandler.isRowSelected(holder.getAdapterPosition())) {
-
-            viewHolder.m_jRecyclerView.setSelected(SelectionState.SELECTED, mTableAdapter
-                    .getTableView().getSelectedColor(), mTableAdapter.getTableView()
-                    .isIgnoreSelectionColors());
-        }
 
     }
 

tableview/src/main/java/com/evrencoskun/tableview/adapter/recyclerview/CellRowRecyclerViewAdapter.java

@@ -24,6 +24,7 @@
 import com.evrencoskun.tableview.adapter.ITableAdapter;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder.SelectionState;
+import com.evrencoskun.tableview.handler.ISelectableModel;
 
 import java.util.List;
 
@@ -62,6 +63,17 @@ public void onBindViewHolder(final RecyclerView.ViewHolder holder, int xPosition
             AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
             Object value = getItem(xPosition);
 
+            // Apply Selection Style
+            if(mTableAdapter.getTableView().isSelectable()) {
+                if (value instanceof ISelectableModel) {
+                    viewHolder.setSelected(((ISelectableModel) value).getSelectionState());
+                    int color = mTableAdapter.getColorForSelection(((ISelectableModel) value).getSelectionState());
+                    viewHolder.setBackgroundColor(color);
+                } else {
+                    //TODO: trigger exception, if isSelectable, Cells MUST implements ISelectableModel
+                }
+            }
+
             mTableAdapter.onBindCellViewHolder(viewHolder, value, xPosition, mYPosition);
         }
     }
@@ -81,7 +93,7 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
         AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
 
         SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
-                .getCellSelectionState(holder.getAdapterPosition(), mYPosition);
+                .getSelectionStateCell(holder.getAdapterPosition(), mYPosition);
 
         // Control to ignore selection color
         if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {

tableview/src/main/java/com/evrencoskun/tableview/adapter/recyclerview/ColumnHeaderRecyclerViewAdapter.java

@@ -25,6 +25,7 @@
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractSorterViewHolder;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder.SelectionState;
+import com.evrencoskun.tableview.handler.ISelectableModel;
 import com.evrencoskun.tableview.sort.ColumnSortHelper;
 import com.evrencoskun.tableview.sort.SortState;
 
@@ -56,6 +57,17 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
         Object value = getItem(position);
 
+        // Apply Selection Style
+        if(mTableAdapter.getTableView().isSelectable()) {
+            if (value instanceof ISelectableModel) {
+                viewHolder.setSelected(((ISelectableModel) value).getSelectionState());
+                final int color = mTableAdapter.getColorForSelection(((ISelectableModel) value).getSelectionState());
+                viewHolder.setBackgroundColor(color);
+            } else {
+                //TODO: trigger exception, if isSelectable, Cells MUST implements ISelectableModel
+            }
+        }
+
         mTableAdapter.onBindColumnHeaderViewHolder(viewHolder, value, position);
     }
 
@@ -70,7 +82,7 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
         AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
 
         SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
-                .getColumnSelectionState(viewHolder.getAdapterPosition());
+                .getSelectionStateColumnHeader(viewHolder.getAdapterPosition());
 
         // Control to ignore selection color
         if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {

tableview/src/main/java/com/evrencoskun/tableview/adapter/recyclerview/RowHeaderRecyclerViewAdapter.java

@@ -24,8 +24,10 @@
 import com.evrencoskun.tableview.adapter.ITableAdapter;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
 import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder.SelectionState;
+import com.evrencoskun.tableview.handler.ISelectableModel;
 import com.evrencoskun.tableview.sort.RowHeaderSortHelper;
 
+
 import java.util.List;
 
 /**
@@ -53,6 +55,17 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
         Object value = getItem(position);
 
+        // Apply Selection Style
+        if(mTableAdapter.getTableView().isSelectable()) {
+            if (value instanceof ISelectableModel) {
+                viewHolder.setSelected(((ISelectableModel) value).getSelectionState());
+                int color = mTableAdapter.getColorForSelection(((ISelectableModel) value).getSelectionState());
+                viewHolder.setBackgroundColor(color);
+            } else {
+                //TODO: trigger exception, if isSelectable, Cells MUST implements ISelectableModel
+            }
+        }
+
         mTableAdapter.onBindRowHeaderViewHolder(viewHolder, value, position);
     }
 
@@ -67,7 +80,7 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
         AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
 
         SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
-                .getRowSelectionState(holder.getAdapterPosition());
+                .getSelectionStateRowHeader(holder.getAdapterPosition());
 
 
         // Control to ignore selection color

tableview/src/main/java/com/evrencoskun/tableview/handler/ISelectableModel.java

@@ -0,0 +1,12 @@
+package com.evrencoskun.tableview.handler;
+
+import com.evrencoskun.tableview.adapter.recyclerview.holder.AbstractViewHolder;
+
+/**
+ * Created by cedricferry on 8/2/18.
+ */
+
+public interface ISelectableModel {
+    AbstractViewHolder.SelectionState getSelectionState();
+    void setSelectionState(AbstractViewHolder.SelectionState selectionState);
+}