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

Fix loading assets

This commit is contained in:
oupson 2019-06-11 20:35:56 +02:00
parent 2b41e938c1
commit 6fe4225380
4 changed files with 17 additions and 2 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.

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

@ -4,6 +4,7 @@ import android.content.Context
import android.content.SharedPreferences
import android.graphics.*
import android.net.Uri
import android.util.Log
import android.widget.ImageView
import androidx.annotation.RawRes
import org.jetbrains.anko.doAsync
@ -256,7 +257,7 @@ class ApngAnimator(private val context: Context?) {
* @throws NotApngException
*/
fun load(string: String, speed : Float? = null, apngAnimatorOptions: ApngAnimatorOptions? = null) : ApngAnimator {
doAsync {
doAsync ({throwable -> Log.e("APNG", "Error", throwable)}) {
this@ApngAnimator.speed = speed
if (string.contains("http") || string.contains("https")) {
val url = URL(string)
@ -277,6 +278,20 @@ class ApngAnimator(private val context: Context?) {
throw NotApngException()
}
}
} else if (string.startsWith("file:///android_asset/")) {
val bytes = this@ApngAnimator.context?.assets?.open(string.replace("file:///android_asset/", ""))?.readBytes()
bytes ?: throw Exception("File are empty")
if (isApng(bytes)) {
load(bytes, speed, apngAnimatorOptions)
} else {
if (loadNotApng) {
context?.runOnUiThread {
imageView?.setImageBitmap(BitmapFactory.decodeByteArray(bytes, 0, bytes.size))
}
} else {
throw NotApngException()
}
}
}
}
return this

BIN
app-test/src/main/assets/image.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 KiB

2
app-test/src/main/java/oupson/apngcreator/MainActivity.kt
View File

@ -112,7 +112,7 @@ class MainActivity : AppCompatActivity() {
)
val imageView = imageView {
id = View.generateViewId()
animator = this.loadApng(imageUrl).apply {
animator = this.loadApng("file:///android_asset/image.png").apply {
onLoaded {
setOnAnimationLoopListener {
// Log.e("app-test", "onLoop")