From b288fd04bf1977493c140b6cb2bcc64264d2e791 Mon Sep 17 00:00:00 2001
From: Robert Benedikt <robert.benedikt@sap.com>
Date: Thu, 20 Feb 2020 16:38:34 +0100
Subject: [PATCH] fix: item swap considering whole range

---
 .../BaseDraggableSwipeAdapter.java            | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/dragandswipelist/BaseDraggableSwipeAdapter.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/dragandswipelist/BaseDraggableSwipeAdapter.java
index 8aafec32352..8c5cad278b0 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/dragandswipelist/BaseDraggableSwipeAdapter.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/dragandswipelist/BaseDraggableSwipeAdapter.java
@@ -1,11 +1,11 @@
 package com.sap.sailing.racecommittee.app.ui.adapters.dragandswipelist;
 
-import java.util.Collections;
-import java.util.List;
-
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
 
+import java.util.Collections;
+import java.util.List;
+
 public abstract class BaseDraggableSwipeAdapter<VH extends RecyclerView.ViewHolder> extends RecyclerView.Adapter<VH>
         implements ItemTouchHelperAdapter {
 
@@ -40,17 +40,23 @@ public abstract class BaseDraggableSwipeAdapter<VH extends RecyclerView.ViewHold
      * Implementations should call {@link RecyclerView.Adapter#notifyItemMoved(int, int)} after adjusting the underlying
      * data to reflect this move.
      *
-     * @param fromPosition
-     *            The start position of the moved item.
-     * @param toPosition
-     *            Then resolved position of the moved item.
+     * @param fromPosition The start position of the moved item.
+     * @param toPosition   Then resolved position of the moved item.
      * @return True if the item was moved to the new adapter position.
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */
     @Override
     public boolean onItemMove(int fromPosition, int toPosition) {
-        Collections.swap(mItems, fromPosition, toPosition);
+        if (fromPosition < toPosition) {
+            for (int i = fromPosition; i < toPosition; i++) {
+                Collections.swap(mItems, i, i + 1);
+            }
+        } else if (fromPosition > toPosition) {
+            for (int i = fromPosition; i > toPosition; i--) {
+                Collections.swap(mItems, i, i - 1);
+            }
+        }
         notifyItemMoved(fromPosition, toPosition);
         return true;
     }
@@ -61,8 +67,7 @@ public abstract class BaseDraggableSwipeAdapter<VH extends RecyclerView.ViewHold
      * Implementations should call {@link RecyclerView.Adapter#notifyItemRemoved(int)} after adjusting the underlying
      * data to reflect this removal.
      *
-     * @param position
-     *            The position of the item dismissed.
+     * @param position The position of the item dismissed.
      * @see RecyclerView#getAdapterPositionFor(RecyclerView.ViewHolder)
      * @see RecyclerView.ViewHolder#getAdapterPosition()
      */