Merge branch 'develop'

Author: lxcid

LXRCVFL Example using Storyboard/LXRCVFL Example using Storyboard/LXCollectionViewController.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "LXReorderableCollectionViewFlowLayout.h"
 
-@interface LXCollectionViewController : UICollectionViewController <LXReorderableCollectionViewDatasource, LXReorderableCollectionViewDelegateFlowLayout>
+@interface LXCollectionViewController : UICollectionViewController <LXReorderableCollectionViewDataSource, LXReorderableCollectionViewDelegateFlowLayout>
 
 @property (strong, nonatomic) NSMutableArray *deck;
 

LXRCVFL Example using Storyboard/LXRCVFL Example using Storyboard/LXCollectionViewController.m

@@ -78,7 +78,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cell
     return playingCardCell;
 }
 
-#pragma mark - LXReorderableCollectionViewDatasource methods
+#pragma mark - LXReorderableCollectionViewDataSource methods
 
 - (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)fromIndexPath willMoveToIndexPath:(NSIndexPath *)toIndexPath {
     PlayingCard *playingCard = [self.deck objectAtIndex:fromIndexPath.item];

LXReorderableCollectionViewFlowLayout/LXReorderableCollectionViewFlowLayout.h

@@ -11,14 +11,14 @@
 
 @property (assign, nonatomic) CGFloat scrollingSpeed;
 @property (assign, nonatomic) UIEdgeInsets scrollingTriggerEdgeInsets;
-@property (weak, nonatomic, readonly) UILongPressGestureRecognizer *longPressGestureRecognizer;
-@property (weak, nonatomic, readonly) UIPanGestureRecognizer *panGestureRecognizer;
+@property (strong, nonatomic, readonly) UILongPressGestureRecognizer *longPressGestureRecognizer;
+@property (strong, nonatomic, readonly) UIPanGestureRecognizer *panGestureRecognizer;
 
 - (void)setUpGestureRecognizersOnCollectionView __attribute__((deprecated("Calls to setUpGestureRecognizersOnCollectionView method are not longer needed as setup are done automatically through KVO.")));
 
 @end
 
-@protocol LXReorderableCollectionViewDatasource <UICollectionViewDataSource>
+@protocol LXReorderableCollectionViewDataSource <UICollectionViewDataSource>
 
 - (void)collectionView:(UICollectionView *)collectionView itemAtIndexPath:(NSIndexPath *)fromIndexPath willMoveToIndexPath:(NSIndexPath *)toIndexPath;
 

LXReorderableCollectionViewFlowLayout/LXReorderableCollectionViewFlowLayout.m

@@ -54,7 +54,7 @@ @interface LXReorderableCollectionViewFlowLayout ()
 @property (assign, nonatomic) CGPoint panTranslationInCollectionView;
 @property (strong, nonatomic) NSTimer *scrollingTimer;
 
-@property (assign, nonatomic, readonly) id<LXReorderableCollectionViewDatasource> dataSource;
+@property (assign, nonatomic, readonly) id<LXReorderableCollectionViewDataSource> dataSource;
 @property (assign, nonatomic, readonly) id<LXReorderableCollectionViewDelegateFlowLayout> delegate;
 
 @end
@@ -67,25 +67,23 @@ - (void)setDefaults {
 }
 
 - (void)setupCollectionView {
-    UILongPressGestureRecognizer *longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
-                                                                                                             action:@selector(handleLongPressGesture:)];
-    longPressGestureRecognizer.delegate = self;
-    [self.collectionView addGestureRecognizer:longPressGestureRecognizer];
+    _longPressGestureRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self
+                                                                                action:@selector(handleLongPressGesture:)];
+    _longPressGestureRecognizer.delegate = self;
+    [self.collectionView addGestureRecognizer:_longPressGestureRecognizer];
 
     // Links the default long press gesture recognizer to the custom long press gesture recognizer we are creating now
     // by enforcing failure dependency so that they doesn't clash.
     for (UIGestureRecognizer *gestureRecognizer in self.collectionView.gestureRecognizers) {
         if ([gestureRecognizer isKindOfClass:[UILongPressGestureRecognizer class]]) {
-            [gestureRecognizer requireGestureRecognizerToFail:longPressGestureRecognizer];
+            [gestureRecognizer requireGestureRecognizerToFail:_longPressGestureRecognizer];
         }
     }
-    _longPressGestureRecognizer = longPressGestureRecognizer;
 
-    UIPanGestureRecognizer *panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self
-                                                                                           action:@selector(handlePanGesture:)];
-    panGestureRecognizer.delegate = self;
-    [self.collectionView addGestureRecognizer:panGestureRecognizer];
-    _panGestureRecognizer = panGestureRecognizer;
+    _panGestureRecognizer = [[UIPanGestureRecognizer alloc] initWithTarget:self
+                                                                    action:@selector(handlePanGesture:)];
+    _panGestureRecognizer.delegate = self;
+    [self.collectionView addGestureRecognizer:_panGestureRecognizer];
 }
 
 - (id)init {
@@ -117,8 +115,8 @@ - (void)applyLayoutAttributes:(UICollectionViewLayoutAttributes *)layoutAttribut
     }
 }
 
-- (id<LXReorderableCollectionViewDatasource>)dataSource {
-    return (id<LXReorderableCollectionViewDatasource>)self.collectionView.dataSource;
+- (id<LXReorderableCollectionViewDataSource>)dataSource {
+    return (id<LXReorderableCollectionViewDataSource>)self.collectionView.dataSource;
 }
 
 - (id<LXReorderableCollectionViewDelegateFlowLayout>)delegate {