Merge branch 'master' into feature/multiSelectionSupport

Author: Cedric Ferry

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

@@ -18,11 +18,13 @@
 package com.evrencoskun.tableview.handler;
 
 import android.support.v7.util.DiffUtil;
+import android.util.Log;
 
 import com.evrencoskun.tableview.ITableView;
 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.sort.ColumnForRowHeaderSortComparator;
 import com.evrencoskun.tableview.sort.ColumnSortCallback;
 import com.evrencoskun.tableview.sort.ColumnSortComparator;
 import com.evrencoskun.tableview.sort.ISortableModel;
@@ -32,6 +34,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -75,18 +78,31 @@ public void sortByRowHeader(final SortState sortState) {
     public void sort(int column, SortState sortState) {
         List<List<ISortableModel>> originalList = mCellRecyclerViewAdapter.getItems();
         List<List<ISortableModel>> sortedList = new ArrayList<>(originalList);
-
+        List<ISortableModel> originalRowHeaderList
+                = mRowHeaderRecyclerViewAdapter.getItems();
+        List<ISortableModel> sortedRowHeaderList
+                = new ArrayList<>(originalRowHeaderList);
 
         if (sortState != SortState.UNSORTED) {
             // Do descending / ascending sort
             Collections.sort(sortedList, new ColumnSortComparator(column, sortState));
+
+            // Sorting RowHeader using the same logic has sorting DataSet
+            ColumnForRowHeaderSortComparator columnForRowHeaderSortComparator
+                    = new ColumnForRowHeaderSortComparator(
+                            originalRowHeaderList,
+                            originalList,
+                            column,
+                            sortState);
+
+            Collections.sort(sortedRowHeaderList, columnForRowHeaderSortComparator);
         }
 
         // Update sorting list of column headers
         mColumnHeaderRecyclerViewAdapter.getColumnSortHelper().setSortingStatus(column, sortState);
 
         // Set sorted data list
-        swapItems(originalList, sortedList, column);
+        swapItems(originalList, sortedList, column, sortedRowHeaderList);
     }
 
     private void swapItems(List<ISortableModel> oldItems, List<ISortableModel> newItems) {
@@ -104,7 +120,7 @@ private void swapItems(List<ISortableModel> oldItems, List<ISortableModel> newIt
     }
 
     private void swapItems(List<List<ISortableModel>> oldItems, List<List<ISortableModel>>
-            newItems, int column) {
+            newItems, int column, List<ISortableModel> newRowHeader) {
 
         // Find the differences between old cell items and new items.
         final ColumnSortCallback diffCallback = new ColumnSortCallback(oldItems, newItems, column);
@@ -113,6 +129,7 @@ private void swapItems(List<List<ISortableModel>> oldItems, List<List<ISortableM
 
         // Set new items without calling notifyCellDataSetChanged method of CellRecyclerViewAdapter
         mCellRecyclerViewAdapter.setItems(newItems, false);
+        mRowHeaderRecyclerViewAdapter.setItems(newRowHeader, false);
 
         diffResult.dispatchUpdatesTo(mCellRecyclerViewAdapter);
         diffResult.dispatchUpdatesTo(mRowHeaderRecyclerViewAdapter);

tableview/src/main/java/com/evrencoskun/tableview/sort/ColumnForRowHeaderSortComparator.java

@@ -0,0 +1,43 @@
+package com.evrencoskun.tableview.sort;
+
+/**
+ * Created by cedricferry on 7/2/18.
+ */
+
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * In order to keep RowHeader DataSet and Main DataSet aligned
+ * it is required to sort RowHeader the same.
+ * So if MainDataSet row 1 moved to position 10, RowHeader 1 move to position 10 too.
+ * To accomplish that we need to set a comparator that use MainDataSet
+ * in order to sort RowHeader.
+ */
+public class ColumnForRowHeaderSortComparator implements Comparator {
+
+    private List<ISortableModel> mRowHeaderList;
+    private List<List<ISortableModel>> mReferenceList;
+    private int column;
+    private SortState mRortState;
+    private ColumnSortComparator mColumnSortComparator;
+
+    public ColumnForRowHeaderSortComparator(List<ISortableModel> rowHeader, List<List<ISortableModel>> referenceList, int column, SortState sortState) {
+        this.mRowHeaderList = rowHeader;
+        this.mReferenceList = referenceList;
+        this.column = column;
+        this.mRortState = sortState;
+        this.mColumnSortComparator = new ColumnSortComparator(column, sortState);
+    }
+
+    @Override
+    public int compare(Object o, Object t1) {
+        Object o1 = mReferenceList.get(this.mRowHeaderList.indexOf(o)).get(column).getContent();
+        Object o2 = mReferenceList.get(this.mRowHeaderList.indexOf(t1)).get(column).getContent();
+        if (mRortState == SortState.DESCENDING) {
+            return mColumnSortComparator.compareContent(o2, o1);
+        } else {
+            return mColumnSortComparator.compareContent(o1, o2);
+        }
+    }
+}

tableview/src/main/java/com/evrencoskun/tableview/sort/ColumnSortComparator.java

@@ -47,6 +47,4 @@ public int compare(List<ISortableModel> t1, List<ISortableModel> t2) {
         }
     }
 
-
-
 }