diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 4a880bd..23308a5 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/apng_library/build.gradle b/apng_library/build.gradle index 9e174f7..ece21ed 100644 --- a/apng_library/build.gradle +++ b/apng_library/build.gradle @@ -26,11 +26,11 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation "org.jetbrains.anko:anko:$anko_version" diff --git a/app-test/build.gradle b/app-test/build.gradle index 1784ea4..6fd4c02 100644 --- a/app-test/build.gradle +++ b/app-test/build.gradle @@ -38,8 +38,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' implementation "org.jetbrains.anko:anko:$anko_version" implementation 'com.squareup.picasso:picasso:2.71828' implementation project(":apng_library") diff --git a/app-test/src/main/java/oupson/apngcreator/CreatorActivity.kt b/app-test/src/main/java/oupson/apngcreator/CreatorActivity.kt index 37e840a..b1975e0 100644 --- a/app-test/src/main/java/oupson/apngcreator/CreatorActivity.kt +++ b/app-test/src/main/java/oupson/apngcreator/CreatorActivity.kt @@ -53,7 +53,7 @@ class CreatorActivity : AppCompatActivity() { File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "apn0.png").writeBytes(apngCreated.toByteArray()) apngCreated.apply { - optimiseFrame() + //optimiseFrame() } val a = ApngAnimator(applicationContext) File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS), "apn.png").writeBytes(apngCreated.toByteArray()) diff --git a/app-test/src/main/java/oupson/apngcreator/MainActivity.kt b/app-test/src/main/java/oupson/apngcreator/MainActivity.kt index d72faeb..9bf6098 100644 --- a/app-test/src/main/java/oupson/apngcreator/MainActivity.kt +++ b/app-test/src/main/java/oupson/apngcreator/MainActivity.kt @@ -28,6 +28,7 @@ class MainActivity : AppCompatActivity() { private val imageUrl = "https://metagif.files.wordpress.com/2015/01/bugbuckbunny.png" // val imageUrl = "http://orig06.deviantart.net/7812/f/2012/233/7/5/twilight_rapidash_shaded_and_animated_by_tamalesyatole-d5bz7hd.png" // val imageUrl = "https://raw.githubusercontent.com/tinify/iMessage-Panda-sticker/master/StickerPackExtension/Stickers.xcstickers/Sticker%20Pack.stickerpack/panda.sticker/panda.png" + // val imageUrl = "file:///android_asset/image.png" override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) val buttonDrawable = GradientDrawable().apply { @@ -112,7 +113,7 @@ class MainActivity : AppCompatActivity() { ) val imageView = imageView { id = View.generateViewId() - animator = this.loadApng("file:///android_asset/image.png").apply { + animator = this.loadApng(imageUrl).apply { onLoaded { setOnAnimationLoopListener { // Log.e("app-test", "onLoop")