Skip to content

Fix for iOS 5 animation bug #22

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for iOS 5 animation bug #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 23 additions & 12 deletions OpenFlow/AFOpenFlowView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ - (void)setUpInitialState {
selectedCoverView = nil;

// Set up the cover's left & right transforms.
leftTransform = CATransform3DIdentity;
leftTransform = CATransform3DTranslate(CATransform3DIdentity, 0, 0, SIDE_COVER_ZPOSITION / 2.0);
leftTransform = CATransform3DRotate(leftTransform, SIDE_COVER_ANGLE, 0.0f, 1.0f, 0.0f);
rightTransform = CATransform3DIdentity;
rightTransform = CATransform3DTranslate(CATransform3DIdentity, 0, 0, SIDE_COVER_ZPOSITION / 2.0);
rightTransform = CATransform3DRotate(rightTransform, SIDE_COVER_ANGLE, 0.0f, -1.0f, 0.0f);

// Set some perspective
Expand Down Expand Up @@ -117,7 +117,7 @@ - (AFItemView *)dequeueReusableCover {
- (void)layoutCover:(AFItemView *)aCover selectedCover:(int)selectedIndex animated:(Boolean)animated {
int coverNumber = aCover.number;
CATransform3D newTransform;
CGFloat newZPosition = SIDE_COVER_ZPOSITION;
CGFloat newZPosition = SIDE_COVER_ZPOSITION / 2.0;
CGPoint newPosition;

newPosition.x = halfScreenWidth + aCover.horizontalPosition;
Expand All @@ -137,10 +137,21 @@ - (void)layoutCover:(AFItemView *)aCover selectedCover:(int)selectedIndex animat
[UIView beginAnimations:nil context:nil];
[UIView setAnimationCurve:UIViewAnimationCurveEaseOut];
[UIView setAnimationBeginsFromCurrentState:YES];
[UIView setAnimationDuration:.3];
}

aCover.layer.transform = newTransform;
aCover.layer.zPosition = newZPosition;
if([[[UIDevice currentDevice] systemVersion] floatValue] >= 5.0 && animated) {
CABasicAnimation *zPositionAnimation = [CABasicAnimation animationWithKeyPath:@"zPosition"];
[zPositionAnimation setToValue:[NSNumber numberWithFloat:newZPosition]];
[zPositionAnimation setDuration:.3];
[zPositionAnimation setTimingFunction:[CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut]];
[zPositionAnimation setRemovedOnCompletion:NO];
[zPositionAnimation setFillMode:kCAFillModeForwards];
[aCover.layer addAnimation:zPositionAnimation forKey:nil];
} else {
aCover.layer.zPosition = newZPosition;
}
aCover.layer.position = newPosition;

if (animated) {
Expand Down Expand Up @@ -209,18 +220,18 @@ - (void)setBounds:(CGRect)newSize {

halfScreenWidth = self.bounds.size.width / 2;
halfScreenHeight = self.bounds.size.height / 2;

int lowerBound = MAX(-1, selectedCoverView.number - COVER_BUFFER);
int upperBound = MIN(self.numberOfImages - 1, selectedCoverView.number + COVER_BUFFER);

[self layoutCovers:selectedCoverView.number fromCover:lowerBound toCover:upperBound];
[self centerOnSelectedCover:NO];
}

- (void)setNumberOfImages:(int)newNumberOfImages {
numberOfImages = newNumberOfImages;
scrollView.contentSize = CGSizeMake(newNumberOfImages * COVER_SPACING + self.bounds.size.width, self.bounds.size.height);

int lowerBound = MAX(0, selectedCoverView.number - COVER_BUFFER);
int upperBound = MIN(self.numberOfImages - 1, selectedCoverView.number + COVER_BUFFER);

Expand Down Expand Up @@ -261,14 +272,14 @@ - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
CALayer *targetLayer = (CALayer *)[scrollView.layer hitTest:startPoint];
AFItemView *targetCover = [self findCoverOnscreen:targetLayer];
isDraggingACover = (targetCover != nil);

beginningCover = selectedCoverView.number;
// Make sure the user is tapping on a cover.
startPosition = (startPoint.x / 1.5) + scrollView.contentOffset.x;

if (isSingleTap)
isDoubleTap = YES;

isSingleTap = ([touches count] == 1);
}

Expand Down Expand Up @@ -354,15 +365,15 @@ - (void)setSelectedCover:(int)newSelectedCover {
[cover removeFromSuperview];
[onscreenCovers removeObjectForKey:[NSNumber numberWithInt:cover.number]];
}

// Move all available covers to new location.
for (int i=newLowerBound; i <= newUpperBound; i++) {
cover = [self coverForIndex:i];
[onscreenCovers setObject:cover forKey:[NSNumber numberWithInt:i]];
[self updateCoverImage:cover];
[scrollView.layer addSublayer:cover.layer];
}

lowerVisibleCover = newLowerBound;
upperVisibleCover = newUpperBound;
selectedCoverView = (AFItemView *)[onscreenCovers objectForKey:[NSNumber numberWithInt:newSelectedCover]];
Expand Down Expand Up @@ -431,7 +442,7 @@ - (void)setSelectedCover:(int)newSelectedCover {
}
lowerVisibleCover = newLowerBound;
}

if (selectedCoverView.number > newSelectedCover)
[self layoutCovers:newSelectedCover fromCover:newSelectedCover toCover:selectedCoverView.number];
else if (newSelectedCover > selectedCoverView.number)
Expand Down