fix: Remove unnecessary code.

svga · Jan 16, 2019 · cd31b1b · cd31b1b
1 parent 957323d
commit cd31b1b
Showing 1 changed file with 7 additions and 17 deletions.
diff --git a/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt b/library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt
@@ -63,27 +63,13 @@ open class SVGAImageView : ImageView {
         }
     }
 
-    private var detachedDrawable: WeakReference<Drawable>? = null
-
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
-        this.drawable?.let {
-            this.detachedDrawable = WeakReference(it)
-        }
-        this.setImageDrawable(null)
         animator?.cancel()
         animator?.removeAllListeners()
         animator?.removeAllUpdateListeners()
     }
 
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        this.detachedDrawable?.get()?.let {
-            this.setImageDrawable(it)
-            this.detachedDrawable = null
-        }
-    }
-
     private fun loadAttrs(attrs: AttributeSet) {
         val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0)
         loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0)
@@ -213,12 +199,16 @@ open class SVGAImageView : ImageView {
         }
     }
 
-    fun setVideoItem(videoItem: SVGAVideoEntity) {
+    fun setVideoItem(videoItem: SVGAVideoEntity?) {
         setVideoItem(videoItem, SVGADynamicEntity())
     }
 
-    fun setVideoItem(videoItem: SVGAVideoEntity, dynamicItem: SVGADynamicEntity) {
-        val drawable = SVGADrawable(videoItem, dynamicItem)
+    fun setVideoItem(videoItem: SVGAVideoEntity?, dynamicItem: SVGADynamicEntity?) {
+        if (videoItem == null) {
+            setImageDrawable(null)
+            return
+        }
+        val drawable = SVGADrawable(videoItem, dynamicItem ?: SVGADynamicEntity())
         drawable.cleared = clearsAfterStop
         setImageDrawable(drawable)
     }