Merge pull request #796 from airbnb/btw/designable

Fix for storyboard crash
airbnb · Mar 18, 2019 · a7dcc36 · a7dcc36
2 parents 883239a + 7cf5ad5
commit a7dcc36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Example/lottie-swift/Base.lproj/Main.storyboard b/Example/lottie-swift/Base.lproj/Main.storyboard
@@ -12,7 +12,7 @@
  <!--View Controller-->
  <scene sceneID="ufC-wZ-h7g">
  <objects>
- <viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="lottie_swift_Example" customModuleProvider="target" sceneMemberID="viewController">
+ <viewController id="vXZ-lx-hvc" customClass="ViewController" sceneMemberID="viewController">
  <layoutGuides>
  <viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
  <viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>

diff --git a/lottie-swift/src/Public/Animation/AnimationView.swift b/lottie-swift/src/Public/Animation/AnimationView.swift
@@ -522,6 +522,13 @@ final public class AnimationView: LottieView {
  commonInit()
  }
 
+ public override init(frame: CGRect) {
+ self.animation = nil
+ self.imageProvider = BundleImageProvider(bundle: Bundle.main, searchPath: nil)
+ super.init(frame: .zero)
+ commonInit()
+ }
+
  required init?(coder aDecoder: NSCoder) {
  self.imageProvider = BundleImageProvider(bundle: Bundle.main, searchPath: nil)
  super.init(coder: aDecoder)