Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.
Merged
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: 2 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DEPENDENCIES:
- Yoga

SPEC REPOS:
https://github.com/cocoapods/specs.git:
https://github.com/CocoaPods/Specs.git:
- Protobuf
- SSZipArchive
- Yoga
Expand All @@ -64,4 +64,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 7f6714245d47e69d2933463289e4c4d6de65b831

COCOAPODS: 1.7.4
COCOAPODS: 1.10.1
6 changes: 3 additions & 3 deletions SVGAPlayer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
TargetAttributes = {
90A676DC1D13A6DF008A69F3 = {
CreatedOnToolsVersion = 7.3;
DevelopmentTeam = TD97KS79S9;
DevelopmentTeam = S2RM275849;
};
90CB64C91EF290F400DAA382 = {
DevelopmentTeam = 8M2FQ87SLP;
Expand Down Expand Up @@ -590,7 +590,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = TD97KS79S9;
DEVELOPMENT_TEAM = S2RM275849;
INFOPLIST_FILE = SVGAPlayer/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand All @@ -607,7 +607,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = TD97KS79S9;
DEVELOPMENT_TEAM = S2RM275849;
INFOPLIST_FILE = SVGAPlayer/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
Expand Down
10 changes: 7 additions & 3 deletions Source/SVGAPlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@
@protocol SVGAPlayerDelegate <NSObject>

@optional
- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player;
- (void)svgaPlayerDidAnimatedToFrame:(NSInteger)frame;
- (void)svgaPlayerDidAnimatedToPercentage:(CGFloat)percentage;
- (void)svgaPlayerDidFinishedAnimation:(SVGAPlayer *)player ;

- (void)svgaPlayer:(SVGAPlayer *)player didAnimatedToFrame:(NSInteger)frame;
- (void)svgaPlayer:(SVGAPlayer *)player didAnimatedToPercentage:(CGFloat)percentage;

- (void)svgaPlayerDidAnimatedToFrame:(NSInteger)frame API_DEPRECATED("Use svgaPlayer:didAnimatedToFrame: instead", ios(7.0, API_TO_BE_DEPRECATED));
- (void)svgaPlayerDidAnimatedToPercentage:(CGFloat)percentage API_DEPRECATED("Use svgaPlayer:didAnimatedToPercentage: instead", ios(7.0, API_TO_BE_DEPRECATED));

@end

Expand Down
19 changes: 14 additions & 5 deletions Source/SVGAPlayer.m
Original file line number Diff line number Diff line change
Expand Up @@ -390,11 +390,20 @@ - (void)next {
}
[self update];
id delegate = self.delegate;
if (delegate != nil && [delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToFrame:)]) {
[delegate svgaPlayerDidAnimatedToFrame:self.currentFrame];
}
if (delegate != nil && [delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToPercentage:)] && self.videoItem.frames > 0) {
[delegate svgaPlayerDidAnimatedToPercentage:(CGFloat)(self.currentFrame + 1) / (CGFloat)self.videoItem.frames];
if (delegate != nil) {
if ([delegate respondsToSelector:@selector(svgaPlayer:didAnimatedToFrame:)]) {
[delegate svgaPlayer:self didAnimatedToFrame:self.currentFrame];
} else if ([delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToFrame:)]){
[delegate svgaPlayerDidAnimatedToFrame:self.currentFrame];
}

if (self.videoItem.frames > 0) {
if ([delegate respondsToSelector:@selector(svgaPlayer:didAnimatedToPercentage:)]) {
[delegate svgaPlayer:self didAnimatedToPercentage:(CGFloat)(self.currentFrame + 1) / (CGFloat)self.videoItem.frames];
} else if ([delegate respondsToSelector:@selector(svgaPlayerDidAnimatedToPercentage:)]) {
[delegate svgaPlayerDidAnimatedToPercentage:(CGFloat)(self.currentFrame + 1) / (CGFloat)self.videoItem.frames];
}
}
}
}

Expand Down