Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ZCAnimatedLabel/ZCAnimatedLabel/ZCAnimatedLabel.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,12 @@ typedef NS_ENUM(NSInteger, ZCAnimatedLabelAppearDirection)

- (void) startAppearAnimation;

- (void) startAppearAnimationWithCompletion:(void (^)(void))completion;

- (void) startDisappearAnimation;

- (void) startDisappearAnimationWithCompletion:(void (^)(void))completion;

- (void) stopAnimation;

/**
Expand Down
22 changes: 20 additions & 2 deletions ZCAnimatedLabel/ZCAnimatedLabel/ZCAnimatedLabel.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ @interface ZCAnimatedLabel ()
@property (nonatomic, assign) BOOL animatingAppear; //we are during appear stage or not
@property (nonatomic, strong) ZCCoreTextLayout *layoutTool;
@property (nonatomic, assign) NSTimeInterval animationStarTime;
@property (nonatomic, copy) void (^appearAnimationCompleted)(void);
@property (nonatomic, copy) void (^disappearAnimationCompleted)(void);

@end

Expand Down Expand Up @@ -84,6 +86,11 @@ - (void) timerTick: (id) sender
if (self.animationTime > self.animationDurationTotal) {
self.displayLink.paused = YES;
self.useDefaultDrawing = YES;
if (self.animatingAppear && self.appearAnimationCompleted != nil) {
self.appearAnimationCompleted();
} else if (!self.animatingAppear && self.disappearAnimationCompleted != nil) {
self.disappearAnimationCompleted();
}
}
else { //update text attributeds array

Expand Down Expand Up @@ -262,9 +269,9 @@ - (void) setUseDefaultDrawing:(BOOL)useDefaultDrawing
[self setNeedsDisplay];
}


- (void) startAppearAnimation
- (void) startAppearAnimationWithCompletion:(void (^)(void))completion
{
self.appearAnimationCompleted = completion;
self.animatingAppear = YES;
self.animationTime = 0;
self.useDefaultDrawing = NO;
Expand All @@ -273,8 +280,19 @@ - (void) startAppearAnimation
[self setNeedsDisplay];
}

- (void) startAppearAnimation
{
[self startAppearAnimationWithCompletion:nil];
}

- (void) startDisappearAnimation
{
[self startDisppearAnimationWithCompletion:nil];
}

- (void) startDisppearAnimationWithCompletion:(void (^)(void))completion
{
self.disappearAnimationCompleted = completion;
self.animatingAppear = NO;
self.animationTime = 0;
self.useDefaultDrawing = NO;
Expand Down