diff --git a/AwesomeMenu.xcodeproj/project.xcworkspace/xcuserdata/Levey.xcuserdatad/UserInterfaceState.xcuserstate b/AwesomeMenu.xcodeproj/project.xcworkspace/xcuserdata/Levey.xcuserdatad/UserInterfaceState.xcuserstate index c9eef50..da5a2b9 100644 Binary files a/AwesomeMenu.xcodeproj/project.xcworkspace/xcuserdata/Levey.xcuserdatad/UserInterfaceState.xcuserstate and b/AwesomeMenu.xcodeproj/project.xcworkspace/xcuserdata/Levey.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AwesomeMenu/AwesomeMenu/AwesomeMenu.h b/AwesomeMenu/AwesomeMenu/AwesomeMenu.h index ed5ef7d..87a077e 100644 --- a/AwesomeMenu/AwesomeMenu/AwesomeMenu.h +++ b/AwesomeMenu/AwesomeMenu/AwesomeMenu.h @@ -42,7 +42,7 @@ - (AwesomeMenuItem *)menuItemAtIndex:(NSUInteger)index; -- (void)expand; +- (void)open; - (void)close; diff --git a/AwesomeMenu/AwesomeMenu/AwesomeMenu.m b/AwesomeMenu/AwesomeMenu/AwesomeMenu.m index d88f2fe..c2417e4 100644 --- a/AwesomeMenu/AwesomeMenu/AwesomeMenu.m +++ b/AwesomeMenu/AwesomeMenu/AwesomeMenu.m @@ -31,8 +31,8 @@ static CGPoint RotateCGPointAroundCenter(CGPoint point, CGPoint center, float an } @interface AwesomeMenu () -- (void)_expand; -- (void)_close; +- (void)_expandAnimation; +- (void)_closeAnimation; - (void)_setMenu; - (CAAnimationGroup *)_blowupAnimationAtPoint:(CGPoint)p; - (CAAnimationGroup *)_shrinkAnimationAtPoint:(CGPoint)p; @@ -229,7 +229,7 @@ - (AwesomeMenuItem *)menuItemAtIndex:(NSUInteger)index return self.menuItems[index]; } -- (void)expand +- (void)open { if (_isAnimating || [self isExpanded]) { return; @@ -299,7 +299,7 @@ - (void)setExpanded:(BOOL)expanded if (!_timer) { _flag = [self isExpanded] ? 0 : ([self.menuItems count] - 1); - SEL selector = [self isExpanded] ? @selector(_expand) : @selector(_close); + SEL selector = [self isExpanded] ? @selector(_expandAnimation) : @selector(_closeAnimation); // Adding timer to runloop to make sure UI event won't block the timer from firing _timer = [NSTimer timerWithTimeInterval:timeOffset target:self selector:selector userInfo:nil repeats:YES]; @@ -310,7 +310,7 @@ - (void)setExpanded:(BOOL)expanded #pragma mark - Private methods -- (void)_expand +- (void)_expandAnimation { if (_flag == [self.menuItems count]) @@ -358,7 +358,7 @@ - (void)_expand } -- (void)_close +- (void)_closeAnimation { if (_flag == -1) {