Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.

Commit cd31b1b

Browse files
committed
fix: Remove unnecessary code.
1 parent 957323d commit cd31b1b

File tree

1 file changed

+7
-17
lines changed

1 file changed

+7
-17
lines changed

library/src/main/java/com/opensource/svgaplayer/SVGAImageView.kt

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,27 +63,13 @@ open class SVGAImageView : ImageView {
6363
}
6464
}
6565

66-
private var detachedDrawable: WeakReference<Drawable>? = null
67-
6866
override fun onDetachedFromWindow() {
6967
super.onDetachedFromWindow()
70-
this.drawable?.let {
71-
this.detachedDrawable = WeakReference(it)
72-
}
73-
this.setImageDrawable(null)
7468
animator?.cancel()
7569
animator?.removeAllListeners()
7670
animator?.removeAllUpdateListeners()
7771
}
7872

79-
override fun onAttachedToWindow() {
80-
super.onAttachedToWindow()
81-
this.detachedDrawable?.get()?.let {
82-
this.setImageDrawable(it)
83-
this.detachedDrawable = null
84-
}
85-
}
86-
8773
private fun loadAttrs(attrs: AttributeSet) {
8874
val typedArray = context.theme.obtainStyledAttributes(attrs, R.styleable.SVGAImageView, 0, 0)
8975
loops = typedArray.getInt(R.styleable.SVGAImageView_loopCount, 0)
@@ -213,12 +199,16 @@ open class SVGAImageView : ImageView {
213199
}
214200
}
215201

216-
fun setVideoItem(videoItem: SVGAVideoEntity) {
202+
fun setVideoItem(videoItem: SVGAVideoEntity?) {
217203
setVideoItem(videoItem, SVGADynamicEntity())
218204
}
219205

220-
fun setVideoItem(videoItem: SVGAVideoEntity, dynamicItem: SVGADynamicEntity) {
221-
val drawable = SVGADrawable(videoItem, dynamicItem)
206+
fun setVideoItem(videoItem: SVGAVideoEntity?, dynamicItem: SVGADynamicEntity?) {
207+
if (videoItem == null) {
208+
setImageDrawable(null)
209+
return
210+
}
211+
val drawable = SVGADrawable(videoItem, dynamicItem ?: SVGADynamicEntity())
222212
drawable.cleared = clearsAfterStop
223213
setImageDrawable(drawable)
224214
}

0 commit comments

Comments
 (0)