Skip to content

Full Screen on Tap #76

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.

Sign up for GitHub

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

Open
KingOfBrian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Full Screen on Tap #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab8b584
Fixed a few issues with full size mode. Added a command to have a t…
KingOfBrian Apr 20, 2012
0dc4285
Fixed a rotation issue. didEnter is now triggered after the animati…
KingOfBrian Apr 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions GMGridView/GMGridView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ typedef enum
// Cells
- (GMGridViewCell *)cellForItemAtIndex:(NSInteger)position; // Might return nil if cell not loaded yet

- (void)openTransformAtIndex:(NSInteger)position;
- (void)closeTransform;
- (BOOL)isInTransformingState;

// Actions
- (void)reloadData;
- (void)insertObjectAtIndex:(NSInteger)index animated:(BOOL)animated;
Expand Down Expand Up @@ -185,6 +189,8 @@ typedef enum
@optional
- (void)GMGridView:(GMGridView *)gridView didStartTransformingCell:(GMGridViewCell *)cell;
- (void)GMGridView:(GMGridView *)gridView didEnterFullSizeForCell:(GMGridViewCell *)cell;
- (void)GMGridView:(GMGridView *)gridView willExitFullSizeForCell:(GMGridViewCell *)cell;

- (void)GMGridView:(GMGridView *)gridView didEndTransformingCell:(GMGridViewCell *)cell;

@end
249 changes: 140 additions & 109 deletions GMGridView/GMGridView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ - (void)panGestureUpdated:(UIPanGestureRecognizer *)panGesture
case UIGestureRecognizerStateFailed:
{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(transformingGestureDidFinish) object:nil];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.1];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.0];

self.scrollEnabled = YES;

Expand Down Expand Up @@ -879,7 +879,7 @@ - (void)pinchGestureUpdated:(UIPinchGestureRecognizer *)pinchGesture
case UIGestureRecognizerStateFailed:
{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(transformingGestureDidFinish) object:nil];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.1];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.0];

break;
}
Expand Down Expand Up @@ -939,7 +939,7 @@ - (void)rotationGestureUpdated:(UIRotationGestureRecognizer *)rotationGesture
case UIGestureRecognizerStateFailed:
{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(transformingGestureDidFinish) object:nil];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.1];
[self performSelector:@selector(transformingGestureDidFinish) withObject:nil afterDelay:0.0];

break;
}
Expand All @@ -963,6 +963,126 @@ - (void)rotationGestureUpdated:(UIRotationGestureRecognizer *)rotationGesture
}
}
}
- (void)startOpenTransformAtIndex:(NSInteger)index
{
_transformingItem = [self cellForItemAtIndex:index];

CGRect frameInMainView = [self convertRect:_transformingItem.frame toView:self.mainSuperView];

[_transformingItem removeFromSuperview];
_transformingItem.frame = self.mainSuperView.bounds;
_transformingItem.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
_transformingItem.contentView.frame = frameInMainView;
[self.mainSuperView addSubview:_transformingItem];
[self.mainSuperView bringSubviewToFront:_transformingItem];

_transformingItem.fullSize = [self.transformDelegate GMGridView:self sizeInFullSizeForCell:_transformingItem atIndex:index inInterfaceOrientation:[[UIApplication sharedApplication] statusBarOrientation]];
_transformingItem.fullSizeView = [self.transformDelegate GMGridView:self fullSizeViewForCell:_transformingItem atIndex:index];

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didStartTransformingCell:)])
{
[self.transformDelegate GMGridView:self didStartTransformingCell:_transformingItem];
}
}
- (void)completeOpenTransform
{
_lastRotation = 0;
_lastScale = 1;

[self bringSubviewToFront:_transformingItem];

[_transformingItem prepareContentToFullSize];

[UIView animateWithDuration:0.3
animations:^{
[_transformingItem transitionContentToFullSize];
}
completion:^(BOOL finished){
[self setNeedsLayout];
if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didEnterFullSizeForCell:)])
{
[self.transformDelegate GMGridView:self didEnterFullSizeForCell:_transformingItem];
}
}
];


_inTransformingState = YES;
_inFullSizeMode = YES;

// Transfer the gestures on the fullscreen to make is they are accessible (depends on self.mainSuperView)
[_transformingItem.fullSizeView addGestureRecognizer:_pinchGesture];
[_transformingItem.fullSizeView addGestureRecognizer:_rotationGesture];
[_transformingItem.fullSizeView addGestureRecognizer:_panGesture];
}

- (void)startCloseTransform
{
_inTransformingState = NO;
[_transformingItem prepareFullSizeToContent];

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:willExitFullSizeForCell:)])
{
[self.transformDelegate GMGridView:self willExitFullSizeForCell:_transformingItem];
}


[UIView animateWithDuration:0.3
animations:^{
[_transformingItem transitionFullSizeToContent];
}
completion:^(BOOL finished){
[self setNeedsLayout];
}
];
}

- (void)completeCloseTransform
{
_lastRotation = 0;
_lastScale = 1.0;

GMGridViewCell *transformingView = _transformingItem;
_transformingItem = nil;

NSInteger position = [self positionForItemSubview:transformingView];
CGPoint origin = [self.layoutStrategy originForItemAtPosition:position];

CGRect finalFrameInScroll = CGRectMake(origin.x, origin.y, _itemSize.width, _itemSize.height);
CGRect finalFrameInSuperview = [self convertRect:finalFrameInScroll toView:self.mainSuperView];

// [transformingView switchToFullSizeMode:NO];
transformingView.autoresizingMask = UIViewAutoresizingNone;
[UIView animateWithDuration: kDefaultAnimationDuration
delay:0
options: kDefaultAnimationOptions
animations:^{
transformingView.contentView.transform = CGAffineTransformIdentity;
transformingView.contentView.frame = finalFrameInSuperview;
transformingView.backgroundColor = [UIColor clearColor];
}
completion:^(BOOL finished){
[transformingView removeFromSuperview];
transformingView.frame = finalFrameInScroll;
transformingView.contentView.frame = transformingView.bounds;

transformingView.fullSizeView = nil;
[self addSubview:transformingView];

_inFullSizeMode = NO;

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didEndTransformingCell:)])
{
[self.transformDelegate GMGridView:self didEndTransformingCell:transformingView];
}

// Transfer the gestures back
[self addGestureRecognizer:_pinchGesture];
[self addGestureRecognizer:_rotationGesture];
[self addGestureRecognizer:_panGesture];
}
];
}

- (void)transformingGestureDidBeginWithGesture:(UIGestureRecognizer *)gesture
{
Expand All @@ -975,37 +1095,14 @@ - (void)transformingGestureDidBeginWithGesture:(UIGestureRecognizer *)gesture

if (_inTransformingState)
{
_inTransformingState = NO;

CGPoint center = _transformingItem.fullSizeView.center;

[_transformingItem switchToFullSizeMode:NO];
CGAffineTransform newTransform = CGAffineTransformMakeScale(2.5, 2.5);
_transformingItem.contentView.transform = newTransform;
_transformingItem.contentView.center = center;
[self startCloseTransform];
}
else if (!_transformingItem)
{
CGPoint locationTouch = [gesture locationOfTouch:0 inView:self];
NSInteger positionTouch = [self.layoutStrategy itemPositionFromLocation:locationTouch];
_transformingItem = [self cellForItemAtIndex:positionTouch];

CGRect frameInMainView = [self convertRect:_transformingItem.frame toView:self.mainSuperView];

[_transformingItem removeFromSuperview];
_transformingItem.frame = self.mainSuperView.bounds;
_transformingItem.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
_transformingItem.contentView.frame = frameInMainView;
[self.mainSuperView addSubview:_transformingItem];
[self.mainSuperView bringSubviewToFront:_transformingItem];

_transformingItem.fullSize = [self.transformDelegate GMGridView:self sizeInFullSizeForCell:_transformingItem atIndex:positionTouch inInterfaceOrientation:[[UIApplication sharedApplication] statusBarOrientation]];
_transformingItem.fullSizeView = [self.transformDelegate GMGridView:self fullSizeViewForCell:_transformingItem atIndex:positionTouch];

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didStartTransformingCell:)])
{
[self.transformDelegate GMGridView:self didStartTransformingCell:_transformingItem];
}

[self startOpenTransformAtIndex:positionTouch];
}
}

Expand All @@ -1019,93 +1116,27 @@ - (void)transformingGestureDidFinish
if ([self isInTransformingState])
{
if (_lastScale > 2 && !_inTransformingState)
{
_lastRotation = 0;
_lastScale = 1;

[self bringSubviewToFront:_transformingItem];

CGFloat rotationValue = atan2f(_transformingItem.contentView.transform.b, _transformingItem.contentView.transform.a);

_transformingItem.contentView.transform = CGAffineTransformIdentity;

[_transformingItem switchToFullSizeMode:YES];
_transformingItem.backgroundColor = [[UIColor darkGrayColor] colorWithAlphaComponent:0.9];

_transformingItem.fullSizeView.transform = CGAffineTransformMakeRotation(rotationValue);

[UIView animateWithDuration:kDefaultAnimationDuration
delay:0
options:kDefaultAnimationOptions
animations:^{
_transformingItem.fullSizeView.transform = CGAffineTransformIdentity;
}
completion:nil
];

_inTransformingState = YES;
_inFullSizeMode = YES;

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didEnterFullSizeForCell:)])
{
[self.transformDelegate GMGridView:self didEnterFullSizeForCell:_transformingItem];
}

// Transfer the gestures on the fullscreen to make is they are accessible (depends on self.mainSuperView)
[_transformingItem.fullSizeView addGestureRecognizer:_pinchGesture];
[_transformingItem.fullSizeView addGestureRecognizer:_rotationGesture];
[_transformingItem.fullSizeView addGestureRecognizer:_panGesture];
{
[self completeOpenTransform];
}
else if (!_inTransformingState)
{
_lastRotation = 0;
_lastScale = 1.0;

GMGridViewCell *transformingView = _transformingItem;
_transformingItem = nil;

NSInteger position = [self positionForItemSubview:transformingView];
CGPoint origin = [self.layoutStrategy originForItemAtPosition:position];

CGRect finalFrameInScroll = CGRectMake(origin.x, origin.y, _itemSize.width, _itemSize.height);
CGRect finalFrameInSuperview = [self convertRect:finalFrameInScroll toView:self.mainSuperView];

[transformingView switchToFullSizeMode:NO];
transformingView.autoresizingMask = UIViewAutoresizingNone;

[UIView animateWithDuration: kDefaultAnimationDuration
delay:0
options: kDefaultAnimationOptions
animations:^{
transformingView.contentView.transform = CGAffineTransformIdentity;
transformingView.contentView.frame = finalFrameInSuperview;
transformingView.backgroundColor = [UIColor clearColor];
}
completion:^(BOOL finished){

[transformingView removeFromSuperview];
transformingView.frame = finalFrameInScroll;
transformingView.contentView.frame = transformingView.bounds;
[self addSubview:transformingView];

transformingView.fullSizeView = nil;
_inFullSizeMode = NO;

if ([self.transformDelegate respondsToSelector:@selector(GMGridView:didEndTransformingCell:)])
{
[self.transformDelegate GMGridView:self didEndTransformingCell:transformingView];
}

// Transfer the gestures back
[self addGestureRecognizer:_pinchGesture];
[self addGestureRecognizer:_rotationGesture];
[self addGestureRecognizer:_panGesture];
}
];
[self completeCloseTransform];
}
}
}

- (void)openTransformAtIndex:(NSInteger)position
{
[self startOpenTransformAtIndex:position];
[self completeOpenTransform];
}
- (void)closeTransform
{
[self startCloseTransform];
[self completeCloseTransform];
}

//////////////////////////////////////////////////////////////
#pragma mark Tap gesture
//////////////////////////////////////////////////////////////
Expand Down
5 changes: 5 additions & 0 deletions GMGridView/GMGridViewCell+Extended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,10 @@ typedef void (^GMGridViewCellDeleteBlock)(GMGridViewCell*);

- (void)switchToFullSizeMode:(BOOL)fullSizeEnabled;
- (void)stepToFullsizeWithAlpha:(CGFloat)alpha; // not supported yet
- (void)prepareContentToFullSize;
- (void)transitionContentToFullSize;

- (void)prepareFullSizeToContent;
- (void)transitionFullSizeToContent;

@end
Loading