Skip to content

Adds user interaction option to shake animation. #2

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

Adds user interaction option to shake animation. #2

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion UIView+Shake.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ typedef enum : NSUInteger {
SCShakeOptionsAtEndRestart = 256,
SCShakeOptionsAtEndComplete = 512,
SCShakeOptionsAtEndContinue = 1024,
SCShakeOptionsAutoreverse = 2048
SCShakeOptionsAutoreverse = 2048,
SCShakeOptionAllowsUserInteraction = 4096

} SCShakeOptions;

Expand Down
3 changes: 2 additions & 1 deletion UIView+Shake.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ - (void)_doAnimation:(CGFloat)direction {
CGFloat force = shakeInfo.force * interpolationRatio * direction;
CGFloat iterationDuration = shakeInfo.iterationDuration;

[UIView animateWithDuration:iterationDuration animations:^{
UIViewAnimationOptions animationOptions = HAS_OPT(options, SCShakeOptionAllowsUserInteraction) ? UIViewAnimationOptionAllowUserInteraction : 0;
[UIView animateWithDuration:iterationDuration delay:0 options:animationOptions animations:^{
[self _animate:force shakeInfo:shakeInfo];
} completion:^(BOOL finished) {
if (shakeInfo.shaking) {
Expand Down