oupson
/
Kapng-Android
mirror of https://github.com/oupson/Kapng-Android.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better animator

This commit is contained in:
oupson 2018-10-29 16:12:44 +01:00
parent 9bd8d79c96
commit 323c71b01c
5 changed files with 64 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser
View File

Binary file not shown.

2
apng_library/build.gradle
View File

@ -7,7 +7,7 @@ android {
minSdkVersion 21
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionName "1.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

4
apng_library/src/main/java/oupson/apng/APNGDisassembler.kt
View File

@ -45,7 +45,7 @@ class APNGDisassembler(val byteArray: ByteArray) {
cover!!.addAll(to4Bytes(crC32.value.toInt()).toList())
}
png = ArrayList()
val fcTL = fcTL(byteArray.copyOfRange(i - 4, i + 32))
val fcTL = fcTL(byteArray.copyOfRange(i - 4, i + 36))
delay = fcTL.delay
yOffset = fcTL.y_offset
xOffset = fcTL.x_offset
@ -77,7 +77,7 @@ class APNGDisassembler(val byteArray: ByteArray) {
png = ArrayList()
val fcTL = fcTL(byteArray.copyOfRange(i - 4, i + 32))
val fcTL = fcTL(byteArray.copyOfRange(i - 4, i + 36))
delay = fcTL.delay
yOffset = fcTL.y_offset

91
apng_library/src/main/java/oupson/apng/ApngAnimator.kt
View File

@ -9,6 +9,8 @@ import org.jetbrains.anko.doAsync
import org.jetbrains.anko.uiThread
import java.io.File
import java.net.URL
import android.graphics.drawable.Drawable
/**
@ -35,6 +37,10 @@ class ApngAnimator(val context: Context) {
var imageView : ImageView? = null
var anim : AnimationDrawable? = null
var activeAnimation : AnimationDrawable? = null
var currentDrawable = 0
/**
* Load into an imageview
* @param imageView Image view selected.
@ -50,10 +56,18 @@ class ApngAnimator(val context: Context) {
* @throws NotApngException
*/
fun load(file: File) {
// Download PNG
val extractedFrame = APNGDisassembler(file.readBytes()).pngList
draw(extractedFrame)
nextFrame()
doAsync {
// Download PNG
val extractedFrame = APNGDisassembler(file.readBytes()).pngList
draw(extractedFrame)
anim = toAnimationDrawable()
uiThread {
imageView?.setImageBitmap(generatedFrame[0])
imageView?.setImageDrawable(anim)
activeAnimation = anim
activeAnimation?.start()
}
}
}
/**
@ -109,8 +123,11 @@ class ApngAnimator(val context: Context) {
// Download PNG
val extractedFrame = APNGDisassembler(Loader().load(context, url)).pngList
draw(extractedFrame)
anim = toAnimationDrawable()
uiThread {
nextFrame()
imageView?.setImageDrawable(anim)
activeAnimation = anim
activeAnimation?.start()
}
}
}
@ -121,10 +138,18 @@ class ApngAnimator(val context: Context) {
* @throws NotApngException
*/
fun load(byteArray: ByteArray) {
// Download PNG
val extractedFrame = APNGDisassembler(byteArray).pngList
draw(extractedFrame)
nextFrame()
doAsync {
// Download PNG
val extractedFrame = APNGDisassembler(byteArray).pngList
draw(extractedFrame)
anim = toAnimationDrawable()
uiThread {
imageView?.setImageBitmap(generatedFrame[0])
imageView?.setImageDrawable(anim)
anim?.start()
}
}
}
/**
@ -141,36 +166,38 @@ class ApngAnimator(val context: Context) {
}
}
private fun nextFrame() {
if (imageView != null) {
if (counter == Frames.size) {
counter = 0
}
val delay = Frames[counter].delay
imageView?.setImageBitmap(generatedFrame[counter])
counter++
myHandler.postDelayed({
ifmustPlay()
}, delay.toLong() * speed)
}
}
fun pause() {
isPlaying = false
val animResume = AnimationDrawable()
activeAnimation?.stop()
val currentFrame = activeAnimation!!.current
frameLoop@ for (i in 0 until anim?.numberOfFrames!!) {
val checkFrame = activeAnimation!!.getFrame(i)
if (checkFrame === currentFrame) {
val frameIndex = i
for (k in frameIndex until activeAnimation!!.numberOfFrames) {
val frame = activeAnimation!!.getFrame(k)
animResume.addFrame(frame, activeAnimation?.getDuration(k)!!)
}
for (k in 0 until frameIndex) {
val frame = activeAnimation!!.getFrame(k)
animResume.addFrame(frame, activeAnimation?.getDuration(k)!!)
}
activeAnimation = animResume
imageView?.setImageDrawable(activeAnimation)
imageView?.invalidate()
break@frameLoop
}
}
}
fun play() {
if (!isPlaying) {
isPlaying = true
ifmustPlay()
}
isPlaying = true
activeAnimation?.start();
}
private fun ifmustPlay() {
if (isPlaying) {
nextFrame()
}
}
/**
* Return animation drawable of the APNG

4
app-test/src/main/res/layout/activity_main2.xml
View File

@ -10,8 +10,8 @@
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"