Bladeren bron

patches/aqgridview: remove patches since we don't use this anymore

Felix Paul Kühne 11 jaren geleden
bovenliggende
commit
a5319a1f9e

+ 0 - 36
patches/aqgridview/0001-Fix-memory-management-issue.patch

@@ -1,37 +0,0 @@
-From c8bbdf191e486317ebde2f36b0e9b555e4c44b6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Thu, 11 Apr 2013 12:37:48 +0200
-Subject: [PATCH 1/3] Fix memory management issue
-
----
- Classes/AQGridViewCell.m       | 1 +
- Classes/AQGridViewUpdateInfo.m | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/Classes/AQGridViewCell.m b/Classes/AQGridViewCell.m
-index 7cc9b68..837586f 100644
---- a/Classes/AQGridViewCell.m
-+++ b/Classes/AQGridViewCell.m
-@@ -98,6 +98,7 @@
- {
- 	if ( _selectionColorInfo != NULL )
- 		CFRelease( _selectionColorInfo );
-+    [super dealloc];
- }
- 
- - (NSComparisonResult) compareOriginAgainstCell: (AQGridViewCell *) otherCell
-diff --git a/Classes/AQGridViewUpdateInfo.m b/Classes/AQGridViewUpdateInfo.m
-index 9bf5148..12d7665 100644
---- a/Classes/AQGridViewUpdateInfo.m
-+++ b/Classes/AQGridViewUpdateInfo.m
-@@ -70,6 +70,7 @@
- 		free( _oldToNewIndexMap );
- 	if ( _newToOldIndexMap != NULL )
- 		free( _newToOldIndexMap );
-+    [super dealloc];
- }
- 
- - (NSMutableArray *) updateItemArrayForAction: (AQGridViewUpdateAction) action
-1.7.12.4 (Apple Git-37)
-

+ 0 - 154
patches/aqgridview/0002-Convert-code-to-ARC.patch

@@ -1,155 +0,0 @@
-From 885ddfe009c833098aa9eecdb839668ad9eb80d4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sun, 28 Apr 2013 17:14:56 +0200
-Subject: [PATCH 2/3] Convert code to ARC
-
----
- Classes/AQGridView.h             |  8 ++++----
- Classes/AQGridView.m             |  2 +-
- Classes/AQGridViewAnimatorItem.h |  2 +-
- Classes/AQGridViewCell.h         | 10 +++++-----
- Classes/AQGridViewCell.m         |  3 +--
- Classes/AQGridViewController.h   |  2 +-
- Classes/AQGridViewUpdateInfo.m   |  1 -
- 7 files changed, 13 insertions(+), 15 deletions(-)
-
-diff --git a/Classes/AQGridView.h b/Classes/AQGridView.h
-index 2f8d460..07b1bc8 100755
---- a/Classes/AQGridView.h
-+++ b/Classes/AQGridView.h
-@@ -227,20 +227,20 @@ extern NSString * const AQGridViewSelectionDidChangeNotification;
- //  this property is set to YES, or to vertical otherwise.
- @property (nonatomic, assign) BOOL clipsContentWidthToBounds __attribute__((deprecated));	// default is YES. If you want to enable horizontal scrolling, set this to NO.
- 
--@property (nonatomic, retain) UIView * backgroundView;		// specifies a view to place behind the cells
-+@property (nonatomic, strong) UIView * backgroundView;		// specifies a view to place behind the cells
- @property (nonatomic) BOOL backgroundViewExtendsUp;			// default is NO. If YES, the background view extends upward and is visible during a bounce.
- @property (nonatomic) BOOL backgroundViewExtendsDown;		// default is NO. If YES, the background view extends downward and is visible during a bounce.
- @property (nonatomic) BOOL usesPagedHorizontalScrolling;	// default is NO, and scrolls verticalls only. Set to YES to have horizontal-only scrolling by page.
- 
- @property (nonatomic) AQGridViewCellSeparatorStyle separatorStyle;	// default is AQGridViewCellSeparatorStyleEmptySpace
--@property (nonatomic, retain) UIColor * separatorColor;		// ignored unless separatorStyle == AQGridViewCellSeparatorStyleSingleLine. Default is standard separator gray.
-+@property (nonatomic, strong) UIColor * separatorColor;		// ignored unless separatorStyle == AQGridViewCellSeparatorStyleSingleLine. Default is standard separator gray.
- 
- - (AQGridViewCell *) dequeueReusableCellWithIdentifier: (NSString *) reuseIdentifier;
- 
- // Headers and Footers
- 
--@property (nonatomic, retain) UIView * gridHeaderView;
--@property (nonatomic, retain) UIView * gridFooterView;
-+@property (nonatomic, strong) UIView * gridHeaderView;
-+@property (nonatomic, strong) UIView * gridFooterView;
- 
- @property (nonatomic, assign) CGFloat leftContentInset;
- @property (nonatomic, assign) CGFloat rightContentInset;
-diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
-index 3f62735..babe070 100755
---- a/Classes/AQGridView.m
-+++ b/Classes/AQGridView.m
-@@ -908,7 +908,7 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- {
- 	NSAssert([_updateInfoStack lastObject] != nil, @"_updateInfoStack should not be empty at this point" );
-     
--	__block AQGridViewUpdateInfo * info = [_updateInfoStack lastObject];
-+	__weak AQGridViewUpdateInfo * info = [_updateInfoStack lastObject];
- 
- 	if ( info.numberOfUpdates == 0 )
- 	{
-diff --git a/Classes/AQGridViewAnimatorItem.h b/Classes/AQGridViewAnimatorItem.h
-index a6449ef..0542e84 100644
---- a/Classes/AQGridViewAnimatorItem.h
-+++ b/Classes/AQGridViewAnimatorItem.h
-@@ -12,7 +12,7 @@
- 
- + (AQGridViewAnimatorItem *) itemWithView: (UIView *) aView index: (NSUInteger) anIndex;
- 
--@property (nonatomic, retain) UIView * animatingView;	// probably an AQGridViewCell, maybe a UIImageView
-+@property (nonatomic, strong) UIView * animatingView;	// probably an AQGridViewCell, maybe a UIImageView
- @property (nonatomic, assign) NSUInteger index;			// the DESTINATION index -- use NSNotFound if this is being deleted
- 
- - (NSUInteger) hash;
-diff --git a/Classes/AQGridViewCell.h b/Classes/AQGridViewCell.h
-index e23f978..4476791 100644
---- a/Classes/AQGridViewCell.h
-+++ b/Classes/AQGridViewCell.h
-@@ -92,13 +92,13 @@ typedef enum {
- - (id) initWithFrame: (CGRect) frame reuseIdentifier: (NSString *) reuseIdentifier;
- 
- // If you want to customize cells by simply adding additional views, you should add them to the content view so they will be positioned appropriately as the cell transitions into and out of editing mode.
--@property (nonatomic, readonly, retain) UIView * contentView;
-+@property (nonatomic, readonly, strong) UIView * contentView;
- 
- // default is nil. The background view will be added as a subview behind all other views
--@property (nonatomic, retain) UIView * backgroundView;
-+@property (nonatomic, strong) UIView * backgroundView;
- 
- // The 'selectedBackgroundView' will be added as a subview directly above the backgroundView if not nil, or behind all other views. It is added as a subview only when the cell is selected. Calling -setSelected:animated: will cause the 'selectedBackgroundView' to animate in and out with an alpha fade.
--@property (nonatomic, retain) UIView * selectedBackgroundView;
-+@property (nonatomic, strong) UIView * selectedBackgroundView;
- 
- @property (nonatomic, readonly, copy) NSString * reuseIdentifier;
- - (void) prepareForReuse;		// if the cell is reusable (has a reuse identifier), this is called just before the cell is returned from the grid view method dequeueReusableCellWithIdentifier:.  If you override, you MUST call super.
-@@ -106,12 +106,12 @@ typedef enum {
- @property (nonatomic) AQGridViewCellSelectionStyle selectionStyle;		// default is AQGridViewCellSelectionStyleGlow
- @property (nonatomic, getter=isSelected) BOOL selected;					// default is NO
- @property (nonatomic, getter=isHighlighted) BOOL highlighted;			// default is NO
--@property (nonatomic, retain) UIColor * selectionGlowColor;				// default is dark grey, ignored if selectionStyle != AQGridViewCellSelectionStyleGlow
-+@property (nonatomic, strong) UIColor * selectionGlowColor;				// default is dark grey, ignored if selectionStyle != AQGridViewCellSelectionStyleGlow
- @property (nonatomic) CGFloat selectionGlowShadowRadius;				// default is 12.0, ignored if selectionStyle != AQGridViewCellSelectionStyleGlow
- 
- // this can be overridden by subclasses to return a subview's layer to which to add the glow
- // the default implementation returns the contentView's layer
--@property (nonatomic, readonly) CALayer * glowSelectionLayer;
-+@property (weak, nonatomic, readonly) CALayer * glowSelectionLayer;
- 
- - (void) setSelected: (BOOL) selected animated: (BOOL) animated;
- - (void) setHighlighted: (BOOL) highlighted animated: (BOOL) animated;
-diff --git a/Classes/AQGridViewCell.m b/Classes/AQGridViewCell.m
-index 837586f..d5307df 100644
---- a/Classes/AQGridViewCell.m
-+++ b/Classes/AQGridViewCell.m
-@@ -45,7 +45,7 @@
- #endif
- 
- @interface AQGridViewCell ()
--@property (nonatomic, retain) UIView * contentView;
-+@property (nonatomic, strong) UIView * contentView;
- @property (nonatomic, copy) NSString * reuseIdentifier;
- - (void) flipHighlightTimerFired: (NSTimer *) timer;
- @end
-@@ -98,7 +98,6 @@
- {
- 	if ( _selectionColorInfo != NULL )
- 		CFRelease( _selectionColorInfo );
--    [super dealloc];
- }
- 
- - (NSComparisonResult) compareOriginAgainstCell: (AQGridViewCell *) otherCell
-diff --git a/Classes/AQGridViewController.h b/Classes/AQGridViewController.h
-index e23fb80..b89121b 100644
---- a/Classes/AQGridViewController.h
-+++ b/Classes/AQGridViewController.h
-@@ -47,7 +47,7 @@
- 	BOOL _popoverShowing;
- }
- 
--@property (nonatomic, retain) AQGridView * gridView;
-+@property (nonatomic, strong) AQGridView * gridView;
- @property (nonatomic) BOOL clearsSelectionOnViewWillAppear;
- 
- @end
-diff --git a/Classes/AQGridViewUpdateInfo.m b/Classes/AQGridViewUpdateInfo.m
-index 12d7665..9bf5148 100644
---- a/Classes/AQGridViewUpdateInfo.m
-+++ b/Classes/AQGridViewUpdateInfo.m
-@@ -70,7 +70,6 @@
- 		free( _oldToNewIndexMap );
- 	if ( _newToOldIndexMap != NULL )
- 		free( _newToOldIndexMap );
--    [super dealloc];
- }
- 
- - (NSMutableArray *) updateItemArrayForAction: (AQGridViewUpdateAction) action
-1.7.12.4 (Apple Git-37)
-

+ 0 - 230
patches/aqgridview/0003-Upgrade-ObjC-syntax.patch

@@ -1,231 +0,0 @@
-From 282d6daa3c4e2132f892da3b3a82c5171ae411c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
-Date: Sun, 28 Apr 2013 17:35:08 +0200
-Subject: [PATCH 3/3] Upgrade ObjC syntax
-
----
- Classes/AQGridView.m           | 16 ++++++++--------
- Classes/AQGridViewCell.m       | 18 +++++++++---------
- Classes/AQGridViewUpdateInfo.m | 24 ++++++++++++------------
- 3 files changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
-index babe070..38d2525 100755
---- a/Classes/AQGridView.m
-+++ b/Classes/AQGridView.m
-@@ -574,7 +574,7 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- 
- - (AQGridViewCell *) dequeueReusableCellWithIdentifier: (NSString *) reuseIdentifier
- {
--	NSMutableSet * cells = [_reusableGridCells objectForKey: reuseIdentifier];
-+	NSMutableSet * cells = _reusableGridCells[reuseIdentifier];
- 	AQGridViewCell * cell = [cells anyObject];
- 	if ( cell == nil )
- 		return ( nil );
-@@ -589,11 +589,11 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- {
- 	for ( AQGridViewCell * cell in reusableCells )
- 	{
--		NSMutableSet * reuseSet = [_reusableGridCells objectForKey: cell.reuseIdentifier];
-+		NSMutableSet * reuseSet = _reusableGridCells[cell.reuseIdentifier];
- 		if ( reuseSet == nil )
- 		{
- 			reuseSet = [[NSMutableSet alloc] initWithCapacity: 32];
--			[_reusableGridCells setObject: reuseSet forKey: cell.reuseIdentifier];
-+			_reusableGridCells[cell.reuseIdentifier] = reuseSet;
- 		}
- 		else if ( [reuseSet member: cell] == cell )
- 		{
-@@ -724,7 +724,7 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- {
- 	// simple case -- there's a cell already, we can just ask for its frame
- 	if ( NSLocationInRange(index, _visibleIndices) )
--		return ( [[_visibleCells objectAtIndex: [self visibleCellListIndexForItemIndex: index]] frame] );
-+		return ( [_visibleCells[[self visibleCellListIndexForItemIndex: index]] frame] );
- 
- 	// complex case-- compute the frame manually
- 	return ( [self fixCellFrame: CGRectZero forGridRect: [_gridData cellRectAtIndex: index]] );
-@@ -738,7 +738,7 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- 	// we don't clip to visible range-- when animating edits the visible cell list can contain extra items
- 	NSUInteger visibleCellListIndex = [self visibleCellListIndexForItemIndex: index];
- 	if ( visibleCellListIndex < [_visibleCells count] )
--		return ( [_visibleCells objectAtIndex: visibleCellListIndex] );
-+		return ( _visibleCells[visibleCellListIndex] );
- 	return ( nil );
- }
- 
-@@ -1340,7 +1340,7 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- 					// NB: In UITableView:
- 					// if ( [self usesGestureRecognizers] && [self isDragging] ) skip next line
- 					[self performSelector: @selector(_gridViewDeferredTouchesBegan:)
--							   withObject: [NSNumber numberWithUnsignedInteger: index]
-+							   withObject: @(index)
- 							   afterDelay: 0.0];
- 				}
- 			}
-@@ -1485,7 +1485,7 @@ NSArray * __sortDescriptors;
- {
-     static dispatch_once_t onceToken;
-     dispatch_once(&onceToken, ^{
--		__sortDescriptors = [[NSArray alloc] initWithObjects: [[NSSortDescriptor alloc] initWithKey: @"displayIndex" ascending: YES], nil];
-+		__sortDescriptors = @[[[NSSortDescriptor alloc] initWithKey: @"displayIndex" ascending: YES]];
-     });
- 
- 	[_visibleCells sortUsingDescriptors: __sortDescriptors];
-@@ -1654,7 +1654,7 @@ NSArray * __sortDescriptors;
-                     NSUInteger i, count = [_visibleCells count];
-                     for ( i = 0; i < count; i++ )
-                     {
--                        AQGridViewCell * cell = [_visibleCells objectAtIndex: i];
-+                        AQGridViewCell * cell = _visibleCells[i];
-                         if ( [newVisibleIndices containsIndex: cell.displayIndex] == NO &&
-                             [animatingDestinationIndices containsIndex: cell.displayIndex] == NO )
-                         {
-diff --git a/Classes/AQGridViewCell.m b/Classes/AQGridViewCell.m
-index d5307df..1eb72ba 100644
---- a/Classes/AQGridViewCell.m
-+++ b/Classes/AQGridViewCell.m
-@@ -127,7 +127,7 @@
-         _contentView.autoresizesSubviews = YES;
-         self.autoresizesSubviews = YES;
-         _contentView.backgroundColor = [UIColor whiteColor];
--		[_contentView.layer setValue: [NSNumber numberWithBool: YES] forKey: @"KoboHackInterestingLayer"];
-+		[_contentView.layer setValue: @YES forKey: @"KoboHackInterestingLayer"];
-         [self addSubview: _contentView];
-     }
- 	return ( _contentView );
-@@ -206,7 +206,7 @@
- 			id value = view.backgroundColor;
- 			if ( value == nil )
- 				value = [NSNull null];
--			[info setObject: value forKey: @"backgroundColor"];
-+			info[@"backgroundColor"] = value;
- 			
- 			view.opaque = NO;
- 			view.backgroundColor = color;
-@@ -223,7 +223,7 @@
- 		NSMutableDictionary * info = (NSMutableDictionary *) objc_unretainedObject(CFDictionaryGetValue( _selectionColorInfo, objc_unretainedPointer(view) ));
- 		if ( info != nil )
- 		{
--			id value = [info objectForKey: @"backgroundColor"];
-+			id value = info[@"backgroundColor"];
- 			if ( value == nil )
- 				continue;
- 			
-@@ -254,15 +254,15 @@
- 			
- 			// don't overwrite any prior cache of a view's original highlighted state.
- 			// this is because 'highlighted' will be set, then 'selected', which can perform 'highlight' again before the animation completes
--			if ( [info objectForKey: @"highlighted"] == nil )
-+			if ( info[@"highlighted"] == nil )
- 			{
- 				id value = [view valueForKey: @"highlighted"];
- 				if ( value == nil )
--					value = [NSNumber numberWithBool: NO];
--				[info setObject: value forKey: @"highlighted"];
-+					value = @NO;
-+				info[@"highlighted"] = value;
- 			}
- 			
--			[view setValue: [NSNumber numberWithBool: YES]
-+			[view setValue: @YES
- 					forKey: @"highlighted"];
- 		}
- 		
-@@ -278,7 +278,7 @@
- 			NSMutableDictionary * info = (NSMutableDictionary *) objc_unretainedObject(CFDictionaryGetValue( _selectionColorInfo, objc_unretainedPointer(view) ));
- 			if ( info != nil )
- 			{
--				id value = [info objectForKey: @"highlighted"];
-+				id value = info[@"highlighted"];
- 				[view setValue: value forKey: @"highlighted"];
- 			}
- 		}
-@@ -388,7 +388,7 @@
- 											  interval: 0.1
- 												target: self
- 											  selector: @selector(flipHighlightTimerFired:)
--											  userInfo: [NSNumber numberWithBool: highlightOn]
-+											  userInfo: @(highlightOn)
- 											   repeats: NO];
- 		[[NSRunLoop currentRunLoop] addTimer: _fadeTimer forMode: NSDefaultRunLoopMode];
- 	}
-diff --git a/Classes/AQGridViewUpdateInfo.m b/Classes/AQGridViewUpdateInfo.m
-index 9bf5148..f016dec 100644
---- a/Classes/AQGridViewUpdateInfo.m
-+++ b/Classes/AQGridViewUpdateInfo.m
-@@ -562,8 +562,8 @@
- 	
- 	CGSize cellSize = cell.frame.size;
-     
--    [itemsToSetBeforeAnimation setObject: [NSNumber numberWithFloat: 0.0] forKey: @"alpha"];
--    [itemsToAnimate setObject: [NSNumber numberWithFloat: 1.0] forKey: @"alpha"];
-+    itemsToSetBeforeAnimation[@"alpha"] = @0.0f;
-+    itemsToAnimate[@"alpha"] = @1.0f;
- 	
- 	switch ( animation )
- 	{
-@@ -576,36 +576,36 @@
- 		case AQGridViewItemAnimationRight:
- 		{
- 			CGPoint center = cell.center;
--			[itemsToAnimate setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToAnimate[@"center"] = [NSValue valueWithCGPoint: center];
- 			center.x += cellSize.width;
--			[itemsToSetBeforeAnimation setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToSetBeforeAnimation[@"center"] = [NSValue valueWithCGPoint: center];
- 			break;
- 		}
- 			
- 		case AQGridViewItemAnimationLeft:
- 		{
- 			CGPoint center = cell.center;
--			[itemsToAnimate setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToAnimate[@"center"] = [NSValue valueWithCGPoint: center];
- 			center.x -= cellSize.width;
--			[itemsToSetBeforeAnimation setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToSetBeforeAnimation[@"center"] = [NSValue valueWithCGPoint: center];
- 			break;
- 		}
- 			
- 		case AQGridViewItemAnimationTop:
- 		{
- 			CGPoint center = cell.center;
--			[itemsToAnimate setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToAnimate[@"center"] = [NSValue valueWithCGPoint: center];
- 			center.y -= cellSize.height;
--			[itemsToSetBeforeAnimation setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToSetBeforeAnimation[@"center"] = [NSValue valueWithCGPoint: center];
- 			break;
- 		}
- 			
- 		case AQGridViewItemAnimationBottom:
- 		{
- 			CGPoint center = cell.center;
--			[itemsToAnimate setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToAnimate[@"center"] = [NSValue valueWithCGPoint: center];
- 			center.y += cellSize.height;
--			[itemsToSetBeforeAnimation setObject: [NSValue valueWithCGPoint: center] forKey: @"center"];
-+			itemsToSetBeforeAnimation[@"center"] = [NSValue valueWithCGPoint: center];
- 			break;
- 		}
- 			
-@@ -616,13 +616,13 @@
- 	[UIView setAnimationsEnabled: NO];
- 	for ( NSString * keyPath in itemsToSetBeforeAnimation )
- 	{
--		[cell setValue: [itemsToSetBeforeAnimation objectForKey: keyPath] forKey: keyPath];
-+		[cell setValue: itemsToSetBeforeAnimation[keyPath] forKey: keyPath];
- 	}
- 	[UIView setAnimationsEnabled: YES];
- 	
- 	for ( NSString * keyPath in itemsToAnimate )
- 	{
--		[cell setValue: [itemsToAnimate objectForKey: keyPath] forKey: keyPath];
-+		[cell setValue: itemsToAnimate[keyPath] forKey: keyPath];
- 	}
-     
- }
-1.7.12.4 (Apple Git-37)
-

+ 0 - 43
patches/aqgridview/0005-Use-array-for-storing-reusable-cell.patch

@@ -1,44 +0,0 @@
-From 5655c1d8eb63f0a505455610dd1b56f3be444deb Mon Sep 17 00:00:00 2001
-From: Gleb Pinigin <gpinigin@gmail.com>
-Date: Tue, 11 Jun 2013 22:33:42 +0700
-Subject: [PATCH 5/5] Use array for storing reusable cell
-
----
- Classes/AQGridView.m | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
-index aaa0c9a..1ab0df0 100755
---- a/Classes/AQGridView.m
-+++ b/Classes/AQGridView.m
-@@ -574,8 +574,8 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- 
- - (AQGridViewCell *) dequeueReusableCellWithIdentifier: (NSString *) reuseIdentifier
- {
--	NSMutableSet * cells = _reusableGridCells[reuseIdentifier];
--	AQGridViewCell * cell = [cells anyObject];
-+	NSMutableArray * cells = _reusableGridCells[reuseIdentifier];
-+	AQGridViewCell * cell = [cells lastObject];
- 	if ( cell == nil )
- 		return ( nil );
- 
-@@ -589,13 +589,13 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- {
- 	for ( AQGridViewCell * cell in reusableCells )
- 	{
--		NSMutableSet * reuseSet = _reusableGridCells[cell.reuseIdentifier];
-+		NSMutableArray * reuseSet = _reusableGridCells[cell.reuseIdentifier];
- 		if ( reuseSet == nil )
- 		{
--			reuseSet = [[NSMutableSet alloc] initWithCapacity: 32];
-+			reuseSet = [[NSMutableArray alloc] initWithCapacity: 32];
- 			_reusableGridCells[cell.reuseIdentifier] = reuseSet;
- 		}
--		else if ( [reuseSet member: cell] == cell )
-+		else if ( [reuseSet containsObject:cell] )
- 		{
- 			NSLog( @"Warning: tried to add duplicate gridview cell" );
- 			continue;
-1.7.12.4 (Apple Git-37)
-

+ 0 - 40
patches/aqgridview/0006-Fix-resetting-grid-view-frame.patch

@@ -1,41 +0,0 @@
-From 36e96717af0d398510ec6376bd4148473967e0ed Mon Sep 17 00:00:00 2001
-From: Gleb Pinigin <gpinigin@gmail.com>
-Date: Sun, 1 Sep 2013 12:24:03 +0700
-Subject: [PATCH 6/6] Fix resetting grid view frame
-
----
- Classes/AQGridView.m     | 4 ++--
- Classes/AQGridViewCell.m | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Classes/AQGridView.m b/Classes/AQGridView.m
-index 1ab0df0..c000a5a 100755
---- a/Classes/AQGridView.m
-+++ b/Classes/AQGridView.m
-@@ -642,8 +642,8 @@ NSString * const AQGridViewSelectionDidChangeNotification = @"AQGridViewSelectio
- 	// -layoutSubviews will update the visible cell list
- 
- 	// layout -- no animation
--	[self setNeedsLayout];
--	_flags.allCellsNeedLayout = 1;
-+    _flags.allCellsNeedLayout = 1;
-+	[self setNeedsLayout];	
- }
- 
- #define MAX_BOUNCE_DISTANCE (500.0f)
-diff --git a/Classes/AQGridViewCell.m b/Classes/AQGridViewCell.m
-index 1eb72ba..aedd73e 100644
---- a/Classes/AQGridViewCell.m
-+++ b/Classes/AQGridViewCell.m
-@@ -539,7 +539,7 @@
-     
-     _cellFlags.setShadowPath = 0;
- 	
--	CGRect cFrame = self.bounds;
-+	CGRect cFrame = self.frame;
- 	if ( _cellFlags.separatorStyle == AQGridViewCellSeparatorStyleSingleLine )
- 	{
- 		if ( _cellFlags.separatorEdge & AQGridViewCellSeparatorEdgeBottom )
-1.7.12.4 (Apple Git-37)
-