Skip to content

Commit 6c8362a

Browse files
author
Cedric Ferry
committed
check if table isSelectable before accessing SelectionState
1 parent 543ccea commit 6c8362a

File tree

2 files changed

+24
-20
lines changed

2 files changed

+24
-20
lines changed

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,21 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
8181
super.onViewAttachedToWindow(holder);
8282
AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
8383

84-
SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
85-
.getSelectionStateColumnHeader(viewHolder.getAdapterPosition());
84+
if(mTableAdapter.getTableView().isSelectable()) {
85+
SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
86+
.getSelectionStateColumnHeader(viewHolder.getAdapterPosition());
8687

87-
// Control to ignore selection color
88-
if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {
88+
// Control to ignore selection color
89+
if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {
8990

90-
// Change background color of the view considering it's selected state
91-
mTableAdapter.getTableView().getSelectionHandler()
92-
.changeColumnBackgroundColorBySelectionStatus(viewHolder, selectionState);
93-
}
91+
// Change background color of the view considering it's selected state
92+
mTableAdapter.getTableView().getSelectionHandler()
93+
.changeColumnBackgroundColorBySelectionStatus(viewHolder, selectionState);
94+
}
9495

95-
// Change selection status
96-
viewHolder.setSelected(selectionState);
96+
// Change selection status
97+
viewHolder.setSelected(selectionState);
98+
}
9799

98100
// Control whether the TableView is sortable or not.
99101
if (mTableAdapter.getTableView().isSortable()) {

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,21 @@ public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
7979
super.onViewAttachedToWindow(holder);
8080
AbstractViewHolder viewHolder = (AbstractViewHolder) holder;
8181

82-
SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
83-
.getSelectionStateRowHeader(holder.getAdapterPosition());
82+
if(mTableAdapter.getTableView().isSelectable()) {
83+
SelectionState selectionState = mTableAdapter.getTableView().getSelectionHandler()
84+
.getSelectionStateRowHeader(holder.getAdapterPosition());
8485

8586

86-
// Control to ignore selection color
87-
if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {
88-
// Change background color of the view considering it's selected state
89-
mTableAdapter.getTableView().getSelectionHandler()
90-
.changeRowBackgroundColorBySelectionStatus(viewHolder, selectionState);
91-
}
87+
// Control to ignore selection color
88+
if (!mTableAdapter.getTableView().isIgnoreSelectionColors()) {
89+
// Change background color of the view considering it's selected state
90+
mTableAdapter.getTableView().getSelectionHandler()
91+
.changeRowBackgroundColorBySelectionStatus(viewHolder, selectionState);
92+
}
9293

93-
// Change selection status
94-
viewHolder.setSelected(selectionState);
94+
// Change selection status
95+
viewHolder.setSelected(selectionState);
96+
}
9597
}
9698

9799
public RowHeaderSortHelper getRowHeaderSortHelper() {

0 commit comments

Comments
 (0)