Skip to content

Commit f986e56

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents cdd4082 + c0b871c commit f986e56

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@ public interface ITableView {
118118

119119
int getUnSelectedColor();
120120

121+
int getSeparatorColor();
122+
121123
void sortColumn(int columnPosition, SortState sortState);
122124

123125
void sortRowHeader(SortState sortState);

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,16 @@ int getSelectedColor() {
641641
return mSelectedColor;
642642
}
643643

644+
public void setSeparatorColor(@ColorInt int mSeparatorColor) {
645+
this.mSeparatorColor = mSeparatorColor;
646+
}
647+
648+
@Override
649+
public @ColorInt
650+
int getSeparatorColor() {
651+
return mSeparatorColor;
652+
}
653+
644654
/**
645655
* This method helps to change default unselected color programmatically.
646656
*

tableview/src/main/java/com/evrencoskun/tableview/pagination/Pagination.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public Pagination(ITableView tableView, int itemsPerPage, OnTableViewPageTurnedL
8080
initialize(tableView, itemsPerPage, listener);
8181
}
8282

83+
@SuppressWarnings("unchecked")
8384
private void initialize(ITableView tableView, int itemsPerPage, OnTableViewPageTurnedListener listener) {
8485
this.onTableViewPageTurnedListener = listener;
8586
this.itemsPerPage = itemsPerPage;
@@ -91,6 +92,8 @@ private void initialize(ITableView tableView, int itemsPerPage, OnTableViewPageT
9192
this.tableView.getColumnSortHandler().addColumnSortStateChangedListener(columnSortStateChangedListener);
9293
this.tableView.getAdapter().addAdapterDataSetChangedListener(adapterDataSetChangedListener);
9394
this.tableView.getFilterHandler().addFilterChangedListener(filterChangedListener);
95+
this.originalCellData = tableView.getAdapter().getCellRecyclerViewAdapter().getItems();
96+
this.originalRowData = tableView.getAdapter().getRowHeaderRecyclerViewAdapter().getItems();
9497
this.currentPage = 1;
9598
reloadPages();
9699
}

0 commit comments

Comments
 (0)