Issue lxcid#45

- fix dropCurrentItemOnIndexPath
- revert condition for drop/move

Author: Mykola Vyshynskyi

LXReorderableCollectionViewFlowLayout/LXReorderableCollectionViewFlowLayout.m

@@ -110,7 +110,7 @@ - (void)setupCollectionView {
 
 - (id)init {
     self = [super init];
-    if (self) {
+    if (self){
         [self setDefaults];
         [self addObserver:self forKeyPath:kLXCollectionViewKeyPath options:NSKeyValueObservingOptionNew context:nil];
     }
@@ -119,7 +119,7 @@ - (id)init {
 
 - (id)initWithCoder:(NSCoder *)aDecoder {
     self = [super initWithCoder:aDecoder];
-    if (self) {
+    if (self){
         [self setDefaults];
         [self addObserver:self forKeyPath:kLXCollectionViewKeyPath options:NSKeyValueObservingOptionNew context:nil];
     }
@@ -199,11 +199,15 @@ - (void)moveCurrentItemToIndexPath:(NSIndexPath *)newIndexPath {
 }
 
 - (void)dropCurrentItemOnIndexPath:(NSIndexPath *)newIndexPath {
-    if ((newIndexPath == nil) || [newIndexPath isEqual:self.selectedItemIndexPath] || [newIndexPath isEqual:self.catchItemIndexPath]) {
+    if ((newIndexPath == nil) || [newIndexPath isEqual:self.selectedItemIndexPath]) {
         [self resetCatchItemIfNeeded];
         return;
     }
 
+    if ([newIndexPath isEqual:self.catchItemIndexPath]) {
+        return;
+    }
+    
     if (![self.dataSource respondsToSelector:@selector(collectionView:canDropItemAtIndexPath:toIndexPath:)]) {
         [self moveCurrentItemToIndexPath:newIndexPath];
         return;
@@ -223,12 +227,22 @@ - (void)invalidateLayoutIfNecessary {
 
     UICollectionViewLayoutAttributes *theLayoutAttributesOfSelectedItem = [self layoutAttributesForItemAtIndexPath:newIndePath];
     CGRect theFrame = theLayoutAttributesOfSelectedItem.frame;
-    CGRect intersectionFrame = CGRectIntersection(self.currentView.frame, theFrame);
+    CGRect theLeftFrame, theRightFrame;
+    //    CGRectDivide(theFrame, &theLeftFrame, &theRightFrame, CGRectGetWidth(theFrame) / 2.0f, CGRectMinXEdge);
+    CGRectDivide(theFrame, &theLeftFrame, &theRightFrame, CGRectGetHeight(theFrame) / 2.0f, CGRectMinYEdge);
 
-    if (intersectionFrame.size.height > theFrame.size.height/2 || intersectionFrame.size.width > theFrame.size.width/2) {
-        [self dropCurrentItemOnIndexPath:newIndePath];
-    } else {
-        [self moveCurrentItemToIndexPath:newIndePath];
+    if (CGRectContainsPoint(theLeftFrame, theCurrentViewCenter)) {
+        if (self.selectedItemIndexPath.item > newIndePath.item) {
+            [self moveCurrentItemToIndexPath:newIndePath];
+        } else {
+            [self dropCurrentItemOnIndexPath:newIndePath];
+        }
+    } else if (CGRectContainsPoint(theRightFrame, theCurrentViewCenter)) {
+        if (self.selectedItemIndexPath.item < newIndePath.item) {
+            [self moveCurrentItemToIndexPath:newIndePath];
+        } else {
+            [self dropCurrentItemOnIndexPath:newIndePath];
+        }
     }
 }