From cb025d1a29ab160ecf99b7a79c007758ab556f57 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 26 Apr 2019 13:55:18 +0200
Subject: [PATCH] Issue #903 - Allow to drag timelines with the right handle &
 Avoid "swipe-to-remove" for main tabs

---
 .../fr/gouv/etalab/mastodon/drawers/ReorderTabAdapter.java   | 5 ++++-
 .../etalab/mastodon/fragments/DisplayReorderTabFragment.java | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ReorderTabAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ReorderTabAdapter.java
index 7b69c0dfe..29a82fcd4 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ReorderTabAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ReorderTabAdapter.java
@@ -62,6 +62,7 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<ReorderTabAdapter.It
 
     private Context context;
     private SharedPreferences sharedpreferences;
+
     public ReorderTabAdapter(Context context, List<ManageTimelines> manageTimelines, OnStartDragListener dragStartListener) {
         this. mDragStartListener = dragStartListener;
         this.mItems = manageTimelines;
@@ -183,12 +184,14 @@ public class ReorderTabAdapter extends RecyclerView.Adapter<ReorderTabAdapter.It
         holder.handleView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
-                if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+                if (event.getAction() == MotionEvent.ACTION_DOWN) {
                     mDragStartListener.onStartDrag(holder);
+                    return true;
                 }
                 return false;
             }
         });
+
     }
 
     @Override
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayReorderTabFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayReorderTabFragment.java
index dcf2b796f..d95a1a75b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayReorderTabFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayReorderTabFragment.java
@@ -49,6 +49,7 @@ public class DisplayReorderTabFragment extends Fragment implements OnStartDragLi
 
     private Context context;
     public static boolean updated;
+    private ItemTouchHelper touchHelper;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, final ViewGroup container, Bundle savedInstanceState) {
@@ -64,7 +65,7 @@ public class DisplayReorderTabFragment extends Fragment implements OnStartDragLi
 
         ItemTouchHelper.Callback callback =
                 new SimpleItemTouchHelperCallback(adapter);
-        ItemTouchHelper touchHelper = new ItemTouchHelper(callback);
+        touchHelper = new ItemTouchHelper(callback);
         touchHelper.attachToRecyclerView(lv_reorder_tabs);
 
         lv_reorder_tabs.setAdapter(adapter);
@@ -88,6 +89,6 @@ public class DisplayReorderTabFragment extends Fragment implements OnStartDragLi
 
     @Override
     public void onStartDrag(RecyclerView.ViewHolder viewHolder) {
-
+        touchHelper.startDrag(viewHolder);
     }
 }