Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed a few ARC issues #203

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Classes/AQGridView.h
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Classes/AQGridView.m
Expand Up @@ -908,7 +908,7 @@ - (void) endUpdateAnimations
{
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 )
{
Expand Down
2 changes: 1 addition & 1 deletion Classes/AQGridViewAnimatorItem.h
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions Classes/AQGridViewCell.h
Expand Up @@ -92,26 +92,26 @@ 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.

@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;
Expand Down
2 changes: 1 addition & 1 deletion Classes/AQGridViewCell.m
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Classes/AQGridViewController.h
Expand Up @@ -47,7 +47,7 @@
BOOL _popoverShowing;
}

@property (nonatomic, retain) AQGridView * gridView;
@property (nonatomic, strong) AQGridView * gridView;
@property (nonatomic) BOOL clearsSelectionOnViewWillAppear;

@end