Fix for example apps

airbnb · Aug 3, 2017 · 820b788 · 820b788
1 parent cf001de
commit 820b788
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Example/Example for lottie-macos/LAMainView.m b/Example/Example for lottie-macos/LAMainView.m
@@ -99,11 +99,11 @@ - (void)_openAnimationFile:(NSString *)file {
  self.lottieLogo = nil;
 
  self.lottieLogo = [LOTAnimationView animationWithFilePath:file];
- self.lottieLogo.contentMode = LOTViewContentModeScaleAspectFill;
+ self.lottieLogo.contentMode = LOTViewContentModeScaleAspectFit;
  self.lottieLogo.frame = self.bounds;
  self.lottieLogo.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
 
- [self addSubview:self.lottieLogo];
+ [self addSubview:self.lottieLogo positioned:NSWindowBelow relativeTo:nil];
  [self.lottieLogo play];
 }
 

diff --git a/Example/lottie-ios/AnimationExplorerViewController.m b/Example/lottie-ios/AnimationExplorerViewController.m
@@ -212,7 +212,6 @@ - (void)_loadAnimationNamed:(NSString *)named {
  self.laAnimation = [LOTAnimationView animationNamed:named];
  self.laAnimation.contentMode = UIViewContentModeScaleAspectFit;
  [self.view addSubview:self.laAnimation];
- [self.laAnimation setProgressWithFrame:@16];
  [self.view setNeedsLayout];
 }
 

diff --git a/lottie-ios/Classes/Private/LOTAnimationView.m b/lottie-ios/Classes/Private/LOTAnimationView.m
@@ -190,6 +190,9 @@ - (void)playFromFrame:(nonnull NSNumber *)fromStartFrame
  if (_isAnimationPlaying) {
  return;
  }
+ if (_animationProgress == 1) {
+ self.animationProgress = 0;
+ }
  NSTimeInterval offset = MAX(0, (_animationProgress * (_sceneModel.endFrame.floatValue - _sceneModel.startFrame.floatValue)) - fromStartFrame.floatValue) / _sceneModel.framerate.floatValue;
  NSTimeInterval duration = ((toEndFrame.floatValue - fromStartFrame.floatValue) / _sceneModel.framerate.floatValue);
  CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"currentFrame"];