diff options
| author | Bo Duan <boduan402@gmail.com> | 2019-11-18 10:21:22 -0800 |
|---|---|---|
| committer | Gabriel Peal <gpeal@users.noreply.github.com> | 2019-11-18 10:21:22 -0800 |
| commit | c0f723b4b540aeb28fac00c484bd2d43871fc259 (patch) | |
| tree | 70d825dfed18246333e3e7525a9e1896e0a08a62 | |
| parent | da96f5c8d8d1ef530d6632e94a42933a739786a7 (diff) | |
| download | lottie-c0f723b4b540aeb28fac00c484bd2d43871fc259.tar.gz | |
Fix NPE when set ScaleType in xml. (#1433)
Fixes #1432
| -rw-r--r-- | lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java index a8113d5d..44b58bb0 100644 --- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java +++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java @@ -204,6 +204,9 @@ import static com.airbnb.lottie.RenderMode.HARDWARE; setRenderMode(RenderMode.values()[renderModeOrdinal]); } + if (getScaleType() != null) { + lottieDrawable.setScaleType(getScaleType()); + } ta.recycle(); lottieDrawable.setSystemAnimationsAreEnabled(Utils.getAnimationScale(getContext()) != 0f); @@ -844,7 +847,9 @@ import static com.airbnb.lottie.RenderMode.HARDWARE; @Override public void setScaleType(ScaleType scaleType) { super.setScaleType(scaleType); - lottieDrawable.setScaleType(scaleType); + if (lottieDrawable != null) { + lottieDrawable.setScaleType(scaleType); + } } @MainThread |