fix: column resize behaviour to match ios (#142)

qlik-oss · Nov 17, 2022 · d34c26d · d34c26d
1 parent 8819225
commit d34c26d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 32 deletions.
diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/DataProvider.java b/android/src/main/java/com/qliktrialreactnativestraighttable/DataProvider.java
@@ -283,14 +283,9 @@ public boolean updateWidth(float deltaWidth, int column) {
       }
     }
 
-    int next = column + 1;
-    if (next < dataColumns.size()) {
-      dataColumns.get(next).width -= (int)deltaWidth;
-    }
-
     dataColumns.get(column).width += (int)deltaWidth;
-
     columnWidths.updateWidths();
+
     return true;
   }
 

diff --git a/android/src/main/java/com/qliktrialreactnativestraighttable/GrabberView.java b/android/src/main/java/com/qliktrialreactnativestraighttable/GrabberView.java
@@ -37,6 +37,7 @@ public class GrabberView extends LinearLayout {
   class TouchListener implements OnTouchListener {
     float dX = 0;
     float lastX = 0;
+
     @Override
     public boolean onTouch(View view, MotionEvent motionEvent) {
       int action = motionEvent.getAction();
@@ -55,13 +56,13 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
           return true;
         }
         case MotionEvent.ACTION_MOVE: {
-          float x = motionEvent.getRawX() + dX;
           float motionDx = motionEvent.getRawX() - lastX;
           motionDx = (float) Math.round(motionDx);
           if (dataProvider.updateWidth(motionDx, GrabberView.this.column)) {
             // cast here to avoid drift
-            GrabberView.this.setTranslationX((int)x);
-            GrabberView.this.updateTotals(motionDx);
+
+            GrabberView.this.updateGrabbers(motionDx);
+            GrabberView.this.updateTotals();
             GrabberView.this.updateHeader(motionDx);
             GrabberView.this.updateFixedTotalsCell(motionDx);
             GrabberView.this.updateFirstColumnHeader(motionDx);
@@ -91,7 +92,6 @@ public boolean onTouch(View view, MotionEvent motionEvent) {
           if(screenGuideView != null) {
             screenGuideView.fade(1, 0);
           }
-
           return  true;
         }
       }
@@ -176,24 +176,21 @@ public void updateHeader(float dxMotion) {
     HeaderCell headerCell = (HeaderCell)headerView.getChildAt(column);
     resizeView(headerCell, dxMotion);
     headerCell.cell.testTextWrap();
-    View neighbour = updateNeighbour(headerView, dxMotion);
-    if(neighbour != null) {
-      headerCell = (HeaderCell) neighbour;
-      headerCell.cell.testTextWrap();
+  }
+
+  public void updateGrabbers(float dxMotion) {
+    for(GrabberView grabber : tableView.grabbers) {
+      if(grabber.getX() >= GrabberView.this.getX()) {
+        grabber.setTranslationX((int) (grabber.getTranslationX() + dxMotion));
+      }
     }
   }
 
-  public void updateTotals(float dxMotion) {
+  public void updateTotals() {
     TotalsView totalsView = tableView.getTotalsView();
     if(totalsView != null) {
-      TotalsViewCell totalsViewCell = (TotalsViewCell) totalsView.getChildAt(column);
-      resizeView(totalsViewCell, dxMotion);
-      totalsViewCell.testTextWrap();
-      View neighbour = updateNeighbour(totalsView, dxMotion);
-      if(neighbour != null) {
-        totalsViewCell = (TotalsViewCell) neighbour;
-        totalsViewCell.testTextWrap();
-      }
+      totalsView.updateLayout();
+      totalsView.testTextWrap();
     }
   }
 
@@ -210,15 +207,6 @@ public void updateFirstColumnHeader(float dxMotion) {
     }
   }
 
-  public View updateNeighbour(LinearLayout container, float dxMotion) {
-    if(column + 1 < container.getChildCount()) {
-      View neighbour = container.getChildAt(column + 1);
-      resizeView(neighbour, -dxMotion);
-      return neighbour;
-    }
-    return null;
-  }
-
   public void resizeView(View view, float dxMotion) {
     ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
     layoutParams.width += dxMotion;