Merge pull request #8 from edwardaa/remove-and-restore-LayoutTransition

Fix animation conflicts with LayoutTransition

Author: justasm

library/src/main/java/com/jmedeisis/draglinearlayout/DragLinearLayout.java

@@ -61,6 +61,8 @@ public interface OnViewSwapListener {
 
     private OnViewSwapListener swapListener;
 
+    private LayoutTransition layoutTransition;
+
     /**
      * Mapping from child index to drag-related info container.
      * Presence of mapping implies the child can be dragged, and is considered for swaps with the
@@ -357,6 +359,13 @@ private void startDetectingDrag(View child) {
     }
 
     private void startDrag() {
+        // remove layout transition, it conflicts with drag animation
+        // we will restore it after drag animation end, see stopDrag()
+        layoutTransition = getLayoutTransition();
+        if (layoutTransition != null) {
+            setLayoutTransition(null);
+        }
+
         draggedItem.onDragStart();
         requestDisallowInterceptTouchEvent(true);
     }
@@ -398,6 +407,11 @@ public void onAnimationEnd(Animator animation) {
 
                 if (null != dragTopShadowDrawable) dragTopShadowDrawable.setAlpha(255);
                 dragBottomShadowDrawable.setAlpha(255);
+
+                // restore layout transition
+                if (layoutTransition != null && getLayoutTransition() == null) {
+                    setLayoutTransition(layoutTransition);
+                }
             }
         });
         draggedItem.settleAnimation.start();