Skip to content

clear animation when flag is false #1

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

clear animation when flag is false #1

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
48942ba
clear animation when flag is false
smolskyaleksey Jul 24, 2018
b5b609d
fix crash [UIPageViewController _flushViewController:animated:]
smolskyaleksey Oct 29, 2018
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
10 changes: 6 additions & 4 deletions MaterialControls/MaterialControls/MDRippleLayer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@ - (void)removeFromSuperlayer {
}

- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
if (anim == [self animationForKey:@"opacityAnim"]) {
self.opacity = 0;
} else if (flag) {
if([[anim valueForKey:@"opacityAnim"] isEqual:@"opacity"]) {
self.opacity = 0;
} else if (flag) {
if (_userIsHolding) {
_effectIsRunning = false;
if ([self.layerDelegate respondsToSelector:@selector(mdLayer:didFinishEffect:)]) {
Expand All @@ -144,6 +144,8 @@ - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
} else {
[self clearEffects];
}
} else {
[self clearEffects];
}
}

Expand Down Expand Up @@ -324,7 +326,7 @@ - (void)clearEffects {
opacityAnim.removedOnCompletion = false;
opacityAnim.fillMode = kCAFillModeForwards;
opacityAnim.delegate = self;

[opacityAnim setValue:@"opacity" forKey:@"opacityAnim"];
[self addAnimation:opacityAnim forKey:@"opacityAnim"];
}

Expand Down
34 changes: 18 additions & 16 deletions MaterialControls/MaterialControls/MDTabBarViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,22 +222,24 @@ - (void)moveToPage:(NSUInteger)selectedIndex {
__unsafe_unretained typeof(self) weakSelf = self;
disableDragging = YES;
pageController.view.userInteractionEnabled = NO;
[pageController
setViewControllers:@[ viewController ]
direction:animateDirection
animated:YES
completion:^(BOOL finished) {
weakSelf->disableDragging = NO;
weakSelf->pageController.view.userInteractionEnabled = YES;
weakSelf->lastIndex = selectedIndex;

if ([weakSelf->_delegate
respondsToSelector:@selector(tabBarViewController:
didMoveToIndex:)]) {
[weakSelf->_delegate tabBarViewController:weakSelf
didMoveToIndex:selectedIndex];
}
}];
dispatch_async(dispatch_get_main_queue(), ^{
[pageController
setViewControllers:@[ viewController ]
direction:animateDirection
animated:NO
completion:^(BOOL finished) {
weakSelf->disableDragging = NO;
weakSelf->pageController.view.userInteractionEnabled = YES;
weakSelf->lastIndex = selectedIndex;

if ([weakSelf->_delegate
respondsToSelector:@selector(tabBarViewController:
didMoveToIndex:)]) {
[weakSelf->_delegate tabBarViewController:weakSelf
didMoveToIndex:selectedIndex];
}
}];
});
}

#pragma mark - PageViewController Delegate
Expand Down