Merge pull request #60 from r-ralph/fix_invalidate

r-ralph · web-flow · commit b45d0ce462c1 · 2019-09-10T14:20:11.000+09:00
Fix invalidating logic
diff --git a/apng-drawable/src/main/kotlin/com/linecorp/apng/ApngDrawable.kt b/apng-drawable/src/main/kotlin/com/linecorp/apng/ApngDrawable.kt
@@ -170,19 +170,15 @@ class ApngDrawable @VisibleForTesting internal constructor(
         if (isStarted) {
             progressAnimationElapsedTime()
         }
-        val drawingFrameIndex = currentFrameIndex
         apngState.apng.drawWithIndex(
-            drawingFrameIndex,
+            currentFrameIndex,
             canvas,
             null,
             bounds,
             paint
         )
         if (isStarted) {
-            scheduleSelf(
-                { invalidateSelf() },
-                apngState.apng.frameDurations[drawingFrameIndex].toLong()
-            )
+            invalidateSelf()
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -170,19 +170,15 @@ class ApngDrawable @VisibleForTesting internal constructor(`
`170`	`170`	`if (isStarted) {`
`171`	`171`	`progressAnimationElapsedTime()`
`172`	`172`	`}`
`173`		`- val drawingFrameIndex = currentFrameIndex`
`174`	`173`	`apngState.apng.drawWithIndex(`
`175`		`- drawingFrameIndex,`
	`174`	`+ currentFrameIndex,`
`176`	`175`	`canvas,`
`177`	`176`	`null,`
`178`	`177`	`bounds,`
`179`	`178`	`paint`
`180`	`179`	`)`
`181`	`180`	`if (isStarted) {`
`182`		`- scheduleSelf(`
`183`		`- { invalidateSelf() },`
`184`		`- apngState.apng.frameDurations[drawingFrameIndex].toLong()`
`185`		`- )`
	`181`	`+ invalidateSelf()`
`186`	`182`	`}`
`187`	`183`	`}`
`188`	`184`