update drawable immediately after copy is created

LarsWerkman · Apr 23, 2020 · d8af425 · d8af425
1 parent 692d001
commit d8af425
Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/skeletonloading/src/main/java/com/larswerkman/skeletonloading/SkeletonBinder.kt b/skeletonloading/src/main/java/com/larswerkman/skeletonloading/SkeletonBinder.kt
@@ -3,7 +3,7 @@ package com.larswerkman.skeletonloading
 import android.graphics.drawable.Drawable
 
 class SkeletonBinder internal constructor(
-    private val style: Drawable,
+    private val drawable: () -> Drawable,
     private val views: MutableList<ISkeletonView>
 ) {
 
@@ -15,7 +15,7 @@ class SkeletonBinder internal constructor(
 
     init {
         views.forEach {
-            it.setup(style.constantState?.newDrawable() ?: style)
+            it.setup(drawable())
         }
     }
 

diff --git a/skeletonloading/src/main/java/com/larswerkman/skeletonloading/SkeletonLoading.kt b/skeletonloading/src/main/java/com/larswerkman/skeletonloading/SkeletonLoading.kt
@@ -24,18 +24,15 @@ class SkeletonLoading(
 
     private val binders = CopyOnWriteArrayList<SkeletonBinder>()
 
-    init {
-        animation?.progress?.update(drawable)
-    }
-
     fun create(block: SkeletonBinder.Builder.() -> Unit): SkeletonBinder {
         val builder = SkeletonBinder.Builder()
         block(builder)
 
-        val binder = SkeletonBinder(drawable, builder.views)
-        binders += binder
-
-        return binder
+        return SkeletonBinder({
+            drawable.constantState?.newDrawable()?.also {
+                animation?.progress?.update(it)
+            } ?: drawable
+        }, builder.views).also { binders += it }
     }
 
     fun register(owner: LifecycleOwner) {