Feature/multi selection support + selection handler refacoring

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

@@ -95,6 +95,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
         // Let's get TableView
         mTableView = layout.findViewById(R.id.tableview);
+        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.
 
         initializeTableView();
 

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

@@ -17,7 +17,9 @@
 
 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;
 
 import androidx.annotation.NonNull;
@@ -26,14 +28,14 @@
 /**
  * Created by evrencoskun on 11/06/2017.
  */
-
-public class Cell implements ISortableModel, IFilterableModel {
+public class Cell implements ISortableModel, IFilterableModel, ISelectableModel {
     @NonNull
     private String mId;
     @Nullable
     private Object mData;
     @NonNull
     private String mFilterKeyword;
+    private AbstractViewHolder.SelectionState mSelectionState = AbstractViewHolder.SelectionState.UNSELECTED;
 
     public Cell(@NonNull String id, @Nullable Object data) {
         this.mId = id;
@@ -75,4 +77,15 @@ public void setData(@Nullable Object data) {
     public String getFilterableKeyword() {
         return mFilterKeyword;
     }
+
+    @Override
+    public AbstractViewHolder.SelectionState getSelectionState() {
+        return mSelectionState;
+    }
+
+    @NonNull
+    @Override
+    public void setSelectionState(AbstractViewHolder.SelectionState selectionState) {
+        mSelectionState = selectionState;
+    }
 }

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

@@ -61,6 +61,10 @@ public interface ITableView {
 
     boolean isSortable();
 
+    boolean isSelectable();
+
+    void setSelectable(boolean selectable);
+
     @NonNull
     Context getContext();
 

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

@@ -116,6 +116,7 @@ public class TableView extends FrameLayout implements ITableView {
     private boolean mAllowClickInsideRowHeader = false;
     private boolean mAllowClickInsideColumnHeader = false;
     private boolean mIsSortable;
+    private boolean mIsSelectable;
 
     public TableView(@NonNull Context context) {
         super(context);
@@ -378,6 +379,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;
     }
@@ -583,42 +594,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);
     }
 
     @NonNull

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

@@ -29,6 +29,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;
@@ -346,4 +347,32 @@ public void addAdapterDataSetChangedListener(@NonNull AdapterDataSetChangedListe
 
         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

@@ -60,6 +60,8 @@ public interface ITableAdapter<CH, RH, C> {
 
     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

@@ -133,25 +133,7 @@ public void onViewAttachedToWindow(@NonNull AbstractViewHolder holder) {
                 .scrollToPositionWithOffset(scrollHandler.getColumnPosition(), scrollHandler
                         .getColumnPositionOffset());
 
-        SelectionHandler selectionHandler = mTableView.getSelectionHandler();
-
-        if (selectionHandler.isAnyColumnSelected()) {
-
-            AbstractViewHolder cellViewHolder = (AbstractViewHolder) viewHolder.recyclerView
-                    .findViewHolderForAdapterPosition(selectionHandler.getSelectedColumnPosition());
-
-            if (cellViewHolder != null) {
-                // Control to ignore selection color
-                if (!mTableView.isIgnoreSelectionColors()) {
-                    cellViewHolder.setBackgroundColor(mTableView.getSelectedColor());
-                }
-                cellViewHolder.setSelected(SelectionState.SELECTED);
-
-            }
-        } else if (selectionHandler.isRowSelected(holder.getAdapterPosition())) {
-            selectionHandler.changeSelectionOfRecyclerView(viewHolder.recyclerView,
-                    SelectionState.SELECTED, mTableView.getSelectedColor());
-        }
+        // TODO?
 
     }
 
@@ -202,6 +184,28 @@ public void notifyCellDataSetChanged() {
         }
     }
 
+    @Nullable
+    public C getItem(int rowPosition, int columnPosition) {
+        if (mItemList.size() > rowPosition) {
+            List<C> row = (List<C>) mItemList.get(rowPosition);
+            if(row.size() > columnPosition) {
+                return row.get(columnPosition);
+            }
+        }
+        return null;
+    }
+
+    /**
+     * This method helps to get cell item model that is located on given row position.
+     *
+     * @param rowPosition
+     */
+    public List<C> getRowItems(int rowPosition) {
+        List<C> cellItems = new ArrayList<>();
+
+        return  (List<C>) mItemList.get(rowPosition);
+    }
+
     /**
      * This method helps to get cell item model that is located on given column position.
      *

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

@@ -26,6 +26,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;
 
 /**
  * Created by evrencoskun on 10/06/2017.
@@ -52,8 +53,24 @@ public AbstractViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int view
     }
 
     @Override
-    public void onBindViewHolder(@NonNull final AbstractViewHolder holder, final int xPosition) {
-        mTableAdapter.onBindCellViewHolder(holder, getItem(xPosition), xPosition, mYPosition);
+    public void onBindViewHolder(@NonNull final AbstractViewHolder viewHolder, final int xPosition) {
+        if (mTableAdapter != null) {
+            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 if (value != null) {
+                    // trigger exception, if isSelectable, Cells MUST implements ISelectableModel
+                    throw new ClassCastException("Item at position (" + mYPosition + ", " + xPosition + ") must implement ISelectableModel to be selectable.");
+                }
+            }
+
+            mTableAdapter.onBindCellViewHolder(viewHolder, value, xPosition, mYPosition);
+        }
     }
 
     public int getYPosition() {
@@ -73,22 +90,23 @@ public int getItemViewType(int position) {
     public void onViewAttachedToWindow(@NonNull AbstractViewHolder viewHolder) {
         super.onViewAttachedToWindow(viewHolder);
 
-        SelectionState selectionState = mTableView.getSelectionHandler().getCellSelectionState
-                (viewHolder.getAdapterPosition(), mYPosition);
+        if (mTableAdapter.getTableView().isSelectable()) {
+            SelectionState selectionState = mTableView.getSelectionHandler()
+                    .getCellSelectionState(viewHolder.getAdapterPosition(), mYPosition);
 
-        // Control to ignore selection color
-        if (!mTableView.isIgnoreSelectionColors()) {
+            // Control to ignore selection color
+            if (!mTableView.isIgnoreSelectionColors()) {
 
-            // Change the background color of the view considering selected row/cell position.
-            if (selectionState == SelectionState.SELECTED) {
-                viewHolder.setBackgroundColor(mTableView.getSelectedColor());
-            } else {
-                viewHolder.setBackgroundColor(mTableView.getUnSelectedColor());
+                // Change the background color of the view considering selected row/cell position.
+                if (selectionState == SelectionState.SELECTED) {
+                    viewHolder.setBackgroundColor(mTableView.getSelectedColor());
+                } else {
+                    viewHolder.setBackgroundColor(mTableView.getUnSelectedColor());
+                }
             }
+            // Change selection status
+            viewHolder.setSelected(selectionState);
         }
-
-        // Change selection status
-        viewHolder.setSelected(selectionState);
     }
 
     @Override

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

@@ -27,7 +27,7 @@
 import com.evrencoskun.tableview.adapter.ITableAdapter;
 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;
 
@@ -57,8 +57,22 @@ public AbstractViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int view
     }
 
     @Override
-    public void onBindViewHolder(@NonNull AbstractViewHolder holder, int position) {
-        mTableAdapter.onBindColumnHeaderViewHolder(holder, getItem(position), position);
+    public void onBindViewHolder(@NonNull AbstractViewHolder viewHolder, int position) {
+        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 if(value != null){
+                // trigger exception, if isSelectable, Cells MUST implements ISelectableModel
+                throw new ClassCastException("Item at position " + position + " must implement ISelectableModel to be selectable.");
+            }
+        }
+
+        mTableAdapter.onBindColumnHeaderViewHolder(viewHolder, value, position);
     }
 
     @Override
@@ -70,20 +84,19 @@ public int getItemViewType(int position) {
     public void onViewAttachedToWindow(@NonNull AbstractViewHolder viewHolder) {
         super.onViewAttachedToWindow(viewHolder);
 
-        SelectionState selectionState = mTableView.getSelectionHandler().getColumnSelectionState
-                (viewHolder.getAdapterPosition());
+        if (mTableAdapter.getTableView().isSelectable()) {
+            // Control to ignore selection color
+            if (!mTableView.isIgnoreSelectionColors()) {
 
-        // Control to ignore selection color
-        if (!mTableView.isIgnoreSelectionColors()) {
+                // Change background color of the view considering it's selected state
+                mTableView.getSelectionHandler()
+                        .changeColumnBackgroundColorBySelectionStatus(viewHolder, viewHolder.getSelected());
+            }
 
-            // Change background color of the view considering it's selected state
-            mTableView.getSelectionHandler().changeColumnBackgroundColorBySelectionStatus
-                    (viewHolder, selectionState);
+            // Change selection status
+            viewHolder.setSelected(viewHolder.getSelected());
         }
 
-        // Change selection status
-        viewHolder.setSelected(selectionState);
-
         // Control whether the TableView is sortable or not.
         if (mTableView.isSortable()) {
             if (viewHolder instanceof AbstractSorterViewHolder) {