Initial commit

2018-09-27 22:05:08 +02:00 · 2018-09-27 22:05:08 +02:00 · 498f336466
commit 498f336466
58 changed files with 1951 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@ -0,0 +1,29 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
+      <extensions>
+        <pair source="cpp" header="h" fileNamingConvention="NONE" />
+        <pair source="c" header="h" fileNamingConvention="NONE" />
+      </extensions>
+    </Objective-C-extensions>
+  </code_scheme>
+</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/apng_library" />
+            <option value="$PROJECT_DIR$/app-test" />
+          </set>
+        </option>
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="5">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
--- a/apng_library/.gitignore
+++ b/apng_library/.gitignore
@ -0,0 +1 @@
+/build
--- a/apng_library/build.gradle
+++ b/apng_library/build.gradle
@ -0,0 +1,38 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    productFlavors {
+    }
+}
+
+dependencies {
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
+}
--- a/apng_library/proguard-rules.pro
+++ b/apng_library/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/apng_library/src/androidTest/java/oupson/apng/ExampleInstrumentedTest.java
+++ b/apng_library/src/androidTest/java/oupson/apng/ExampleInstrumentedTest.java
@ -0,0 +1,26 @@
+package oupson.apng;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("oupson.apng.test", appContext.getPackageName());
+    }
+}
--- a/apng_library/src/main/AndroidManifest.xml
+++ b/apng_library/src/main/AndroidManifest.xml
@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="oupson.apng" />
--- a/apng_library/src/main/java/oupson/apng/APNG.kt
+++ b/apng_library/src/main/java/oupson/apng/APNG.kt
@ -0,0 +1,306 @@
+package oupson.apng
+
+import java.util.zip.CRC32
+
+
+/**
+ *  APNG is a class for create apng
+ *
+ *  Call .addFrame() to add a Frame
+ *  Call .create to get the generated file
+ *
+ *  @author oupson
+ *
+ *  @throws NotPngException
+ *  @throws NoFrameException
+ *
+ */
+class APNG {
+
+    private var seq = 0
+
+    var frames = ArrayList<Frame>()
+
+    /**
+     * @return a byte array of the generated png
+     *
+     * @throws NoFrameException
+     */
+    fun create() : ByteArray {
+
+        if (frames.isNotEmpty()) {
+            val res = ArrayList<Byte>()
+
+            // Add PNG signature
+            res.addAll(pngSignature.toList())
+
+            // Add Image Header
+            res.addAll(generate_ihdr().toList())
+
+            // Add Animation Controller
+            res.addAll(generateACTL())
+
+            // Get max height and max width
+            val maxHeight = frames.sortedByDescending { it.height }[0].height
+            val maxWitdh = frames.sortedByDescending { it.width }[0].width
+
+            for (i in 0 until frames.size) {
+
+                // If it's the first frame
+                if (i == 0) {
+                    val framesByte = ArrayList<Byte>()
+                    // region fcTL
+                    // Create the fcTL
+                    val fcTL = ArrayList<Byte>()
+                    // Add the length of the chunk body
+                    framesByte.addAll(byteArrayOf(0x00, 0x00, 0x00, 0x1A).toList())
+
+                    // Add acTL
+                    fcTL.addAll(byteArrayOf(0x66, 0x63, 0x54, 0x4c).toList())
+
+                    // Add the frame number
+                    fcTL.addAll(to4Bytes(seq).toList())
+                    seq++
+
+                    // Add width and height
+                    fcTL.addAll(to4Bytes(frames[i].width).toList())
+                    fcTL.addAll(to4Bytes(frames[i].height).toList())
+
+                    // Calculate offset
+                    if (frames[i].width < maxWitdh) {
+                        val xOffset = (maxWitdh / 2) - (frames[i].width / 2)
+                        fcTL.addAll(to4Bytes(xOffset).toList())
+                    } else {
+                        fcTL.addAll(to4Bytes(0).toList())
+                    }
+                    if (frames[i].height < maxHeight) {
+                        val xOffset = (maxHeight / 2) - (frames[i].height / 2)
+                        fcTL.addAll(to4Bytes(xOffset).toList())
+                    } else {
+                        fcTL.addAll(to4Bytes(0).toList())
+                    }
+
+                    // Set frame delay
+                    fcTL.addAll(to2Bytes(frames[i].delay.toInt()).toList())
+                    fcTL.addAll(to2Bytes(1000).toList())
+
+                    fcTL.add(0x01)
+                    fcTL.add(0x00)
+
+                    val crc = CRC32()
+                    crc.update(fcTL.toByteArray(), 0, fcTL.size)
+                    framesByte.addAll(fcTL)
+                    framesByte.addAll(to4Bytes(crc.value.toInt()).toList())
+                    // endregion
+
+                    // region idat
+                    frames[i].idat.IDATBody.forEach {
+                        val fdat = ArrayList<Byte>()
+                        // Add the chunk body length
+                        framesByte.addAll(to4Bytes(it.size).toList())
+                        // Add IDAT
+                        fdat.addAll(byteArrayOf(0x49, 0x44, 0x41, 0x54).toList())
+                        // Add chunk body
+                        fdat.addAll(it.toList())
+                        // Generate CRC
+                        val crc1 = CRC32()
+                        crc1.update(fdat.toByteArray(), 0, fdat.size)
+                        framesByte.addAll(fdat)
+                        framesByte.addAll(to4Bytes(crc1.value.toInt()).toList())
+                    }
+                    // endregion
+                    res.addAll(framesByte)
+                } else {
+                    val framesByte = ArrayList<Byte>()
+                    val fcTL = ArrayList<Byte>()
+                    // region fcTL
+                    framesByte.addAll(byteArrayOf(0x00, 0x00, 0x00, 0x1A).toList())
+
+                    fcTL.addAll(byteArrayOf(0x66, 0x63, 0x54, 0x4c).toList())
+
+                    // Frame number
+                    fcTL.addAll(to4Bytes(seq).toList())
+                    seq++
+                    // width and height
+                    fcTL.addAll(to4Bytes(frames[i].width).toList())
+                    fcTL.addAll(to4Bytes(frames[i].height).toList())
+
+                    if (frames[i].width < maxWitdh) {
+                        val xOffset = (maxWitdh / 2) - (frames[i].width / 2)
+                        fcTL.addAll(to4Bytes(xOffset).toList())
+                    } else {
+                        fcTL.addAll(to4Bytes(0).toList())
+                    }
+                    if (frames[i].height < maxHeight) {
+                        val xOffset = (maxHeight / 2) - (frames[i].height / 2)
+                        fcTL.addAll(to4Bytes(xOffset).toList())
+                    } else {
+                        fcTL.addAll(to4Bytes(0).toList())
+                    }
+
+                    // Set frame delay
+                    fcTL.addAll(to2Bytes(frames[i].delay.toInt()).toList())
+                    fcTL.addAll(to2Bytes(1000).toList())
+
+                    fcTL.add(0x01)
+                    fcTL.add(0x00)
+
+                    val crc = CRC32()
+                    crc.update(fcTL.toByteArray(), 0, fcTL.size)
+                    framesByte.addAll(fcTL)
+                    framesByte.addAll(to4Bytes(crc.value.toInt()).toList())
+                    // endregion
+
+                    // region fdAT
+                    // Write fdAT
+                    frames[i].idat.IDATBody.forEach {
+                        val fdat = ArrayList<Byte>()
+                        // Add IDAT size of frame + 4 byte of the seq
+                        framesByte.addAll(to4Bytes(it.size + 4).toList())
+                        // Add fdAT
+                        fdat.addAll(byteArrayOf(0x66, 0x64, 0x41, 0x54).toList())
+                        // Add Sequence number
+                        // ! THIS IS NOT FRAME NUMBER
+                        fdat.addAll(to4Bytes(seq).toList())
+                        // Increase seq
+                        seq++
+                        fdat.addAll(it.toList())
+                        // Generate CRC
+                        val crc1 = CRC32()
+                        crc1.update(fdat.toByteArray(), 0, fdat.size)
+                        framesByte.addAll(fdat)
+                        framesByte.addAll(to4Bytes(crc1.value.toInt()).toList())
+                    }
+                    // endregion
+                    res.addAll(framesByte)
+                }
+            }
+            // Add IEND body length : 0
+            res.addAll(to4Bytes(0).toList())
+            // Add IEND
+            val iend = byteArrayOf(0x49, 0x45, 0x4E, 0x44)
+            // Generate crc for IEND
+            val crC32 = CRC32()
+            crC32.update(iend, 0, iend.size)
+            res.addAll(iend.toList())
+            res.addAll(to4Bytes(crC32.value.toInt()).toList())
+            return res.toByteArray()
+        } else {
+            throw NoFrameException()
+        }
+    }
+
+    // Animation Control chunk
+    private fun generateACTL() : ArrayList<Byte> {
+        val res = ArrayList<Byte>()
+        val actl = ArrayList<Byte>()
+
+        // Add length bytes
+        res.addAll(to4Bytes(8).toList())
+
+        // Add acTL
+        actl.addAll(byteArrayOf(0x61, 0x63, 0x54, 0x4c).toList())
+
+        // Add number of frames
+        actl.addAll(to4Bytes(frames.size).toList())
+
+        // Number of repeat, 0 to infinite
+        actl.addAll(to4Bytes(0).toList())
+        res.addAll(actl)
+
+        // generate crc
+        val crc = CRC32()
+        crc.update(actl.toByteArray(), 0, actl.size)
+        res.addAll(to4Bytes(crc.value.toInt()).toList())
+        return res
+    }
+
+
+    /**
+     * Generate a 4 bytes array from an Int
+     * @param i The int
+     */
+    fun to4Bytes(i: Int): ByteArray {
+        val result = ByteArray(4)
+        result[0] = (i shr 24).toByte()
+        result[1] = (i shr 16).toByte()
+        result[2] = (i shr 8).toByte()
+        result[3] = i /*>> 0*/.toByte()
+        return result
+    }
+
+    /**
+     * Generate a 2 bytes array from an Int
+     * @param i The int
+     */
+    fun to2Bytes(i: Int): ByteArray {
+        val result = ByteArray(2)
+        result[0] = (i shr 8).toByte()
+        result[1] = i /*>> 0*/.toByte()
+        return result
+    }
+
+    companion object {
+        // Return true if png
+        fun isPng(byteArray: ByteArray) : Boolean {
+            return byteArray.copyOfRange(0, 8).contentToString() == pngSignature.contentToString()
+        }
+
+        fun isApng(byteArray: ByteArray) : Boolean {
+            for (i in 0 until byteArray.size) {
+                // if byteArray contain acTL
+                if (byteArray[i] == 0x66.toByte() && byteArray[i + 1] == 0x63.toByte() && byteArray[ i + 2] == 0x54.toByte() && byteArray[ i + 3] == 0x4c.toByte()) {
+                    // It's an apng
+                    return true
+                }
+            }
+            // Else it's not an apng
+            return false
+        }
+
+        // Signature for png
+        val pngSignature : ByteArray = byteArrayOf(0x89.toByte(), 0x50.toByte(), 0x4E.toByte(), 0x47.toByte(), 0x0D.toByte(), 0x0A.toByte(), 0x1A.toByte(), 0x0A.toByte())
+    }
+
+    /**
+     * Add a frame to the Animated PNG
+     *
+     * @param byteArray It's the byteArray of a png
+     * @param delay Delay in MS between this frame and the next
+     */
+    fun addFrame(byteArray: ByteArray, delay: Float = 1000f) {
+        frames.add(Frame(byteArray, delay))
+    }
+
+    // Generate Image Header chunk
+    private fun generate_ihdr() : ByteArray {
+        val ihdr = ArrayList<Byte>()
+
+        // We need a body var to know body length and generate crc
+        val ihdr_body = ArrayList<Byte>()
+
+        // Get max height and max width of all the frames
+        val maxHeight = frames.sortedByDescending { it.height }[0].height
+        val maxWitdh = frames.sortedByDescending { it.width }[0].width
+
+        // Add chunk body length
+        ihdr.addAll(to4Bytes(frames[0].ihdr.ihdrCorps.size).toList())
+        // Add IHDR
+        ihdr_body.addAll(byteArrayOf(0x49.toByte(), 0x48.toByte(), 0x44.toByte(), 0x52.toByte()).toList())
+
+        // Add the max width and height
+        ihdr_body.addAll(to4Bytes(maxWitdh).toList())
+        ihdr_body.addAll(to4Bytes(maxHeight).toList())
+
+        // Add complicated stuff like depth color ...
+        // If you want correct png you need same parameters. Good solution is to create new png.
+        ihdr_body.addAll(frames[0].ihdr.ihdrCorps.copyOfRange(8, 13).toList())
+
+        // Generate CRC
+        val crC32 = CRC32()
+        crC32.update(ihdr_body.toByteArray(), 0, ihdr_body.size)
+        ihdr.addAll(ihdr_body)
+        ihdr.addAll(to4Bytes(crC32.value.toInt()).toList())
+        return ihdr.toByteArray()
+    }
+}
--- a/apng_library/src/main/java/oupson/apng/APNGDisassembler.kt
+++ b/apng_library/src/main/java/oupson/apng/APNGDisassembler.kt
@ -0,0 +1,184 @@
+package oupson.apng
+
+import android.graphics.Bitmap
+import oupson.apng.APNG.Companion.isApng
+import java.util.zip.CRC32
+import android.graphics.BitmapFactory
+import android.util.Log
+
+
+class APNGDisassembler(val byteArray: ByteArray) {
+    val pngList = ArrayList<ByteArray>()
+    var png : ArrayList<Byte>? = null
+
+    var delayList = ArrayList<Float>()
+
+    var yOffset= ArrayList<Int>()
+
+    var xOffset = ArrayList<Int>()
+
+    var maxWidth = 0
+    var maxHeight = 0
+    init {
+        if (isApng(byteArray)) {
+            val ihdr = IHDR()
+            ihdr.parseIHDR(byteArray)
+            maxWidth = ihdr.pngWidth
+            maxHeight = ihdr.pngHeight
+            for(i in 0 until byteArray.size) {
+                // find new Frame with fcTL
+                if (byteArray[i] == 0x66.toByte() && byteArray[i + 1] == 0x63.toByte() && byteArray[ i + 2 ] == 0x54.toByte() && byteArray[ i + 3 ] == 0x4C.toByte() || i == byteArray.size - 1) {
+                    if (png == null) {
+                        png = ArrayList()
+
+                        val fcTL = fcTL(byteArray.copyOfRange(i-4, i + 28))
+                        delayList.add(fcTL.delay)
+
+                        yOffset.add(fcTL.y_offset)
+                        xOffset.add(fcTL.x_offset)
+                        Log.e("APNG", "delay : + ${fcTL.delay}")
+                        val width = fcTL.pngWidth
+                        val height = fcTL.pngHeight
+                        png!!.addAll(APNG.pngSignature.toList())
+                        png!!.addAll(generate_ihdr(ihdr, width, height).toList())
+                    } else {
+                        // Add IEND body length : 0
+                        png!!.addAll(to4Bytes(0).toList())
+                        // Add IEND
+                        val iend = byteArrayOf(0x49, 0x45, 0x4E, 0x44)
+                        // Generate crc for IEND
+                        val crC32 = CRC32()
+                        crC32.update(iend, 0, iend.size)
+                        png!!.addAll(iend.toList())
+                        png!!.addAll(to4Bytes(crC32.value.toInt()).toList())
+
+                        pngList.add(png!!.toByteArray())
+
+                        png = ArrayList()
+
+                        val fcTL = fcTL(byteArray.copyOfRange(i-4, i + 28))
+                        delayList.add(fcTL.delay)
+
+                        yOffset.add(fcTL.y_offset)
+                        xOffset.add(fcTL.x_offset)
+
+                        val width = fcTL.pngWidth
+                        val height = fcTL.pngHeight
+                        png!!.addAll(APNG.pngSignature.toList())
+                        png!!.addAll(generate_ihdr(ihdr, width, height).toList())
+                    }
+                } else if (byteArray[i] == 0x49.toByte() && byteArray[i + 1] == 0x44.toByte() && byteArray[ i + 2 ] == 0x41.toByte() && byteArray[ i + 3 ] == 0x54.toByte()) {
+                    // Find the chunk length
+                    var lengthString = ""
+                    byteArray.copyOfRange( i - 4, i).forEach {
+                        lengthString += String.format("%02x", it)
+                    }
+
+
+                    var bodySize = lengthString.toLong(16).toInt()
+                    png!!.addAll(byteArray.copyOfRange(i-4, i).toList())
+                    val body = ArrayList<Byte>()
+                    body.addAll(byteArrayOf(0x49, 0x44, 0x41, 0x54).toList())
+                    // Get image bytes
+
+                    for (j in i +4 until i + 4 + bodySize) {
+                        body.add(byteArray[j])
+                    }
+
+                    val crC32 = CRC32()
+                    crC32.update(body.toByteArray(), 0, body.size)
+                    png!!.addAll(body)
+                    png!!.addAll(to4Bytes(crC32.value.toInt()).toList())
+                } else if (byteArray[i] == 0x66.toByte() && byteArray[i + 1] == 0x64.toByte() && byteArray[ i + 2 ] == 0x41.toByte() && byteArray[ i + 3 ] == 0x54.toByte()) {
+                    // Find the chunk length
+                    var lengthString = ""
+                    byteArray.copyOfRange( i - 4, i).forEach {
+                        lengthString += String.format("%02x", it)
+                    }
+
+
+                    var bodySize = lengthString.toLong(16).toInt()
+                    png!!.addAll(to4Bytes(bodySize - 4).toList())
+                    val body = ArrayList<Byte>()
+                    body.addAll(byteArrayOf(0x49, 0x44, 0x41, 0x54).toList())
+                    // Get image bytes
+
+                    for (j in i + 8 until i + 4 + bodySize) {
+                        body.add(byteArray[j])
+                    }
+
+                    val crC32 = CRC32()
+                    crC32.update(body.toByteArray(), 0, body.size)
+                    png!!.addAll(body)
+                    png!!.addAll(to4Bytes(crC32.value.toInt()).toList())
+                }
+            }
+        } else {
+            throw NotApngException()
+        }
+    }
+
+    fun getbitmapList() : ArrayList<Frame>
+    {
+        var res = ArrayList<Frame>()
+        Log.e("APNG", "pngList : ${pngList.size}, delayList : ${delayList.size}")
+        for (i in 0 until pngList.size) {
+            res.add(Frame(pngList[i], delayList[i], xOffset[i], yOffset[i], maxWidth, maxHeight))
+        }
+        return res
+    }
+
+    private fun generate_ihdr(ihdrOfApng: IHDR, width : Int, height : Int) : ByteArray {
+        val ihdr = ArrayList<Byte>()
+
+        // We need a body var to know body length and generate crc
+        val ihdr_body = ArrayList<Byte>()
+
+        // Get max height and max width of all the frames
+
+        // Add chunk body length
+        ihdr.addAll(to4Bytes(ihdrOfApng.ihdrCorps.size).toList())
+        // Add IHDR
+        ihdr_body.addAll(byteArrayOf(0x49.toByte(), 0x48.toByte(), 0x44.toByte(), 0x52.toByte()).toList())
+
+        // Add the max width and height
+        ihdr_body.addAll(to4Bytes(width).toList())
+        ihdr_body.addAll(to4Bytes(height).toList())
+
+        // Add complicated stuff like depth color ...
+        // If you want correct png you need same parameters. Good solution is to create new png.
+        ihdr_body.addAll(ihdrOfApng.ihdrCorps.copyOfRange(8, 13).toList())
+
+        // Generate CRC
+        val crC32 = CRC32()
+        crC32.update(ihdr_body.toByteArray(), 0, ihdr_body.size)
+        ihdr.addAll(ihdr_body)
+        ihdr.addAll(to4Bytes(crC32.value.toInt()).toList())
+        return ihdr.toByteArray()
+    }
+
+    fun to4Bytes(i: Int): ByteArray {
+        val result = ByteArray(4)
+        result[0] = (i shr 24).toByte()
+        result[1] = (i shr 16).toByte()
+        result[2] = (i shr 8).toByte()
+        result[3] = i /*>> 0*/.toByte()
+        return result
+    }
+
+    /**
+     * Generate a 2 bytes array from an Int
+     * @param i The int
+     */
+    fun to2Bytes(i: Int): ByteArray {
+        val result = ByteArray(2)
+        result[0] = (i shr 8).toByte()
+        result[1] = i /*>> 0*/.toByte()
+        return result
+    }
+
+
+
+}
+class extractedFrame(val bitmap: Bitmap, val delay : Float, val xoffset : Int, val yoffset : Int, val maxWidth : Int, val maxHeight : Int) {
+}
--- a/apng_library/src/main/java/oupson/apng/ApngAnimator.kt
+++ b/apng_library/src/main/java/oupson/apng/ApngAnimator.kt
@ -0,0 +1,67 @@
+package oupson.apng
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Canvas
+import android.os.Environment
+import android.os.Handler
+import android.widget.ImageView
+import java.io.File
+
+class ApngAnimator(val imageView : ImageView) {
+    var play = true
+    var Frames = ArrayList<Frame>()
+    var myHandler: Handler
+    var counter = 0
+
+    val generatedFrame = ArrayList<Bitmap>()
+
+    init {
+        myHandler = Handler()
+
+
+    }
+
+    fun load(file: File) {
+        val extractedFrame = APNGDisassembler(file.readBytes()).getbitmapList()
+        Frames = extractedFrame
+
+        Frames.forEach {
+            val btm = Bitmap.createBitmap(Frames[0].maxWidth, Frames[0].maxHeight, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(btm)
+            canvas.drawBitmap(BitmapFactory.decodeByteArray(it.byteArray, 0, it.byteArray.size), it.x_offsets.toFloat(), it.y_offsets.toFloat(), null)
+            generatedFrame.add(btm)
+        }
+
+        nextFrame()
+    }
+
+    fun nextFrame() {
+        if (counter == Frames.size) {
+            counter = 0
+        }
+        val delay = Frames[counter].delay
+        imageView.setImageBitmap(generatedFrame[counter])
+        counter++
+        myHandler.postDelayed({
+            mustPlay()
+        }, delay.toLong())
+    }
+
+    fun pause() {
+        play = false
+
+    }
+    fun play() {
+        play = true
+        mustPlay()
+    }
+
+    private fun mustPlay() {
+        if (play) {
+            nextFrame()
+        }
+    }
+
+
+}
--- a/apng_library/src/main/java/oupson/apng/Frame.kt
+++ b/apng_library/src/main/java/oupson/apng/Frame.kt
@ -0,0 +1,108 @@
+package oupson.apng
+
+import oupson.apng.APNG.Companion.isPng
+
+/**
+ * A frame for an animated png
+ * @author oupson
+ * @param byteArray The byte Array of the png
+ * @param delay The delay in ms, default is 1000
+ * @throws NotPngException
+ */
+
+class Frame {
+
+    val byteArray : ByteArray
+
+    val width : Int
+    val height : Int
+
+    val ihdr : IHDR
+
+    var idat : IDAT
+
+    val delay : Float
+
+    val x_offsets : Int
+    val y_offsets : Int
+
+    val maxWidth : Int
+    val maxHeight : Int
+
+    constructor(byteArray: ByteArray) {
+        if (isPng(byteArray)) {
+            this.byteArray = byteArray
+            // Get width and height for image
+            ihdr = IHDR()
+            ihdr.parseIHDR(byteArray)
+
+            width = ihdr.pngWidth
+            height = ihdr.pngHeight
+
+            // Get image bytes
+            idat = IDAT()
+            idat.parseIDAT(byteArray)
+
+            delay = 1000f
+
+            x_offsets = 0
+            y_offsets = 0
+
+            maxHeight = -1
+            maxWidth = -1
+        } else {
+            throw NotPngException()
+        }
+    }
+    constructor(byteArray: ByteArray, delay : Float) {
+        if (isPng(byteArray)) {
+            this.byteArray = byteArray
+            // Get width and height for image
+            ihdr = IHDR()
+            ihdr.parseIHDR(byteArray)
+
+            width = ihdr.pngWidth
+            height = ihdr.pngHeight
+
+            // Get image bytes
+            idat = IDAT()
+            idat.parseIDAT(byteArray)
+
+            this.delay = delay
+
+            x_offsets = 0
+            y_offsets = 0
+
+            maxHeight = -1
+            maxWidth = -1
+        } else {
+            throw NotPngException()
+        }
+    }
+
+    constructor(byteArray: ByteArray, delay : Float, xOffsets : Int, yOffsets : Int, maxWidth : Int, maxHeight : Int) {
+        if (isPng(byteArray)) {
+            this.byteArray = byteArray
+            // Get width and height for image
+            ihdr = IHDR()
+            ihdr.parseIHDR(byteArray)
+
+            width = ihdr.pngWidth
+            height = ihdr.pngHeight
+
+            // Get image bytes
+            idat = IDAT()
+            idat.parseIDAT(byteArray)
+
+            this.delay = delay
+
+            x_offsets = xOffsets
+            y_offsets = yOffsets
+
+            this.maxWidth = maxWidth
+            this.maxHeight = maxHeight
+        } else {
+            throw NotPngException()
+        }
+    }
+}
--- a/apng_library/src/main/java/oupson/apng/IDAT.kt
+++ b/apng_library/src/main/java/oupson/apng/IDAT.kt
@ -0,0 +1,30 @@
+package oupson.apng
+
+class IDAT {
+    private var bodySize = -1
+    var IDATBody: ArrayList<ByteArray> = ArrayList()
+
+    fun parseIDAT(byteArray: ByteArray) {
+        for (i in 0 until byteArray.size) {
+            // Find IDAT chunk
+            if (byteArray[i] == 0x49.toByte() && byteArray[i + 1] == 0x44.toByte() && byteArray[ i + 2 ] == 0x41.toByte() && byteArray[ i + 3 ] == 0x54.toByte()) {
+
+                // Find the chunk length
+                var lengthString = ""
+                byteArray.copyOfRange( i - 4, i).forEach {
+                    lengthString += String.format("%02x", it)
+                }
+                bodySize = lengthString.toLong(16).toInt()
+
+                // Get image bytes
+                val _IDATbody = ArrayList<Byte>()
+                for (j in i +4 until i + 4 + bodySize) {
+                    _IDATbody.add(byteArray[j])
+                }
+                IDATBody.add(_IDATbody.toByteArray())
+            }
+        }
+
+    }
+
+}
--- a/apng_library/src/main/java/oupson/apng/IHDR.kt
+++ b/apng_library/src/main/java/oupson/apng/IHDR.kt
@ -0,0 +1,45 @@
+package oupson.apng
+
+class IHDR {
+    private var corpsSize = -1
+
+    var ihdrCorps = byteArrayOf()
+
+    var pngWidth = -1
+    var pngHeight = -1
+
+    fun parseIHDR(byteArray: ByteArray) {
+        for (i in 0 until byteArray.size) {
+            // Find IHDR chunk
+            if (byteArray[i] == 0x49.toByte() && byteArray[i + 1] == 0x48.toByte() && byteArray[ i + 2 ] == 0x44.toByte() && byteArray[ i + 3 ] == 0x52.toByte()) {
+                // Get length of the corps of the chunk
+                var lengthString = ""
+                byteArray.copyOfRange(i - 4, i).forEach {
+                    lengthString += String.format("%02x", it)
+                }
+                corpsSize = lengthString.toLong(16).toInt()
+
+                // Get the width of the png
+                var pngwidth = ""
+                byteArray.copyOfRange(i + 4, i + 8).forEach {
+                    pngwidth += String.format("%02x", it)
+                }
+                pngWidth = pngwidth.toLong(16).toInt()
+
+                // Get the height of the png
+                var pngheight = ""
+                byteArray.copyOfRange(i + 8, i + 12).forEach {
+                    pngheight += String.format("%02x", it)
+                }
+                pngHeight = pngheight.toLong(16).toInt()
+
+                val _ihdrCorps = ArrayList<Byte>()
+                byteArray.copyOfRange(i + 4, i + corpsSize + 4).forEach {
+                    _ihdrCorps.add(it)
+                }
+                ihdrCorps = _ihdrCorps.toByteArray()
+
+            }
+        }
+    }
+}
--- a/apng_library/src/main/java/oupson/apng/customException.kt
+++ b/apng_library/src/main/java/oupson/apng/customException.kt
@ -0,0 +1,6 @@
+package oupson.apng
+
+class NoFrameException() : Exception()
+class NotPngException() : Exception()
+class NotApngException() : Exception()
+class NoFcTL() : Exception()
--- a/apng_library/src/main/java/oupson/apng/customView/ApngImageView.kt
+++ b/apng_library/src/main/java/oupson/apng/customView/ApngImageView.kt
@ -0,0 +1,46 @@
+package oupson.apng.customView
+
+import android.content.Context
+import android.widget.ImageView
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.os.Handler
+import android.util.AttributeSet
+import oupson.apng.extractedFrame
+
+
+class ApngImageView(context: Context, attrs: AttributeSet) : ImageView(context, attrs) {
+    var Frames = ArrayList<extractedFrame>()
+    var myHandler: Handler
+    var counter = 0
+
+    val generatedFrame = ArrayList<Bitmap>()
+
+    init {
+        myHandler = Handler()
+    }
+    fun load(frames : ArrayList<extractedFrame>) {
+        Frames = frames
+
+        Frames.forEach {
+            val btm = Bitmap.createBitmap(Frames[0].maxWidth, Frames[0].maxHeight, Bitmap.Config.ARGB_8888)
+            val canvas = Canvas(btm)
+            canvas.drawBitmap(it.bitmap, it.xoffset.toFloat(), it.yoffset.toFloat(), null)
+            generatedFrame.add(btm)
+        }
+
+        nextFrame()
+    }
+
+    fun nextFrame() {
+        if (counter == Frames.size) {
+            counter = 0
+        }
+        val delay = Frames[counter].delay
+        this.setImageBitmap(generatedFrame[counter])
+        counter++
+        myHandler.postDelayed({
+            nextFrame()
+        }, delay.toLong())
+    }
+}
--- a/apng_library/src/main/java/oupson/apng/fcTL.kt
+++ b/apng_library/src/main/java/oupson/apng/fcTL.kt
@ -0,0 +1,99 @@
+package oupson.apng
+
+import android.util.Log
+
+class fcTL(byteArray: ByteArray) {
+
+    private var corpsSize = -1
+    var fcTLBody = byteArrayOf()
+
+    // Height and width of frame
+    var pngWidth = -1
+    var pngHeight = -1
+
+    // Delay to wait after the frame
+    var delay : Float = -1f
+
+    // x and y offsets
+    var x_offset : Int = 0
+    var y_offset : Int = 0
+
+    init {
+        for (i in 0 until byteArray.size) {
+            // Find fcTL chunk
+            if (byteArray[i] == 0x66.toByte() && byteArray[i + 1] == 0x63.toByte() && byteArray[ i + 2 ] == 0x54.toByte() && byteArray[ i + 3 ] == 0x4C.toByte()) {
+                // Get length of the body of the chunk
+                var lengthString = ""
+                byteArray.copyOfRange(i - 4, i).forEach {
+                    lengthString += String.format("%02x", it)
+                }
+                corpsSize = lengthString.toLong(16).toInt()
+
+                // Get the width of the png
+                var pngwidth = ""
+                byteArray.copyOfRange(i + 8, i + 12).forEach {
+                    pngwidth += String.format("%02x", it)
+                }
+                pngWidth = pngwidth.toLong(16).toInt()
+
+                // Get the height of the png
+                var pngheight = ""
+                byteArray.copyOfRange(i + 12, i + 16).forEach {
+                    pngheight += String.format("%02x", it)
+                }
+                pngHeight = pngheight.toLong(16).toInt()
+
+                /**
+                 * The `delay_num` and `delay_den` parameters together specify a fraction indicating the time to display the current frame, in seconds.
+                 * If the the value of the numerator is 0 the decoder should render the next frame as quickly as possible, though viewers may impose a reasonable lower bound.
+                 */
+
+                // Get delay numerator
+                var delayNum = ""
+                byteArray.copyOfRange(i + 24, i+ 26).forEach {
+                    delayNum += String.format("%02x", it)
+                }
+                val delay_num = delayNum.toLong(16).toFloat()
+
+                // Get delay denominator
+                var delayDen = ""
+                byteArray.copyOfRange(i + 26, i+ 28).forEach {
+                    delayDen += String.format("%02x", it)
+                }
+                var delay_den = delayDen.toLong(16).toFloat()
+
+                /**
+                 * If the denominator is 0, it is to be treated as if it were 100 (that is, `delay_num` then specifies 1/100ths of a second).
+                 */
+                if (delay_den == 0f) {
+                    delay_den = 100f
+                }
+
+                delay = (delay_num / delay_den * 1000)
+
+
+                // Get x and y offsets
+                var xOffset = ""
+                byteArray.copyOfRange(i + 16, i+ 20).forEach {
+                    xOffset += String.format("%02x", it)
+                }
+
+                x_offset = xOffset.toLong(16).toInt()
+
+                var yOffset = ""
+                byteArray.copyOfRange(i + 20, i+ 24).forEach {
+                    yOffset += String.format("%02x", it)
+                }
+
+                y_offset = yOffset.toLong(16).toInt()
+
+                val _fcTLBody = ArrayList<Byte>()
+                byteArray.copyOfRange(i + 4, i + corpsSize + 4).forEach {
+                    _fcTLBody.add(it)
+                }
+                fcTLBody= _fcTLBody.toByteArray()
+
+            }
+        }
+    }
+}
--- a/apng_library/src/main/java/oupson/apng/fdAT.kt
+++ b/apng_library/src/main/java/oupson/apng/fdAT.kt
@ -0,0 +1,45 @@
+package oupson.apng
+
+class fdAT {
+    private var bodySize = -1
+    var fdATBody: ArrayList<ByteArray> = ArrayList()
+
+    fun parsefdAT(byteArray: ByteArray, position: Int) {
+        for (i in position until byteArray.size) {
+            // Find fdAT chunk
+            if (byteArray[i] == 0x66.toByte() && byteArray[i + 1] == 0x64.toByte() && byteArray[ i + 2 ] == 0x41.toByte() && byteArray[ i + 3 ] == 0x54.toByte()) {
+
+                // Find the chunk length
+                var lengthString = ""
+                byteArray.copyOfRange( i - 4, i).forEach {
+                    lengthString += String.format("%02x", it)
+                }
+                bodySize = lengthString.toLong(16).toInt()
+
+                // Get image bytes
+                val _fdATbody = ArrayList<Byte>()
+                for (j in i +4 until i + 4 + bodySize) {
+                    _fdATbody.add(byteArray[j])
+                }
+                fdATBody.add(_fdATbody.toByteArray())
+            }
+            // Find idat chunk
+            else if (byteArray[i] == 0x49.toByte() && byteArray[i + 1] == 0x44.toByte() && byteArray[ i + 2 ] == 0x41.toByte() && byteArray[ i + 3 ] == 0x54.toByte()) {
+                // Find the chunk length
+                var lengthString = ""
+                byteArray.copyOfRange( i - 4, i).forEach {
+                    lengthString += String.format("%02x", it)
+                }
+                bodySize = lengthString.toLong(16).toInt()
+
+                // Get image bytes
+                val _fdATbody = ArrayList<Byte>()
+                for (j in i +4 until i + 4 + bodySize) {
+                    _fdATbody.add(byteArray[j])
+                }
+                fdATBody.add(_fdATbody.toByteArray())
+            }
+        }
+
+    }
+}
--- a/apng_library/src/main/res/values/strings.xml
+++ b/apng_library/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">apng</string>
+</resources>
--- a/apng_library/src/test/java/oupson/apng/ExampleUnitTest.java
+++ b/apng_library/src/test/java/oupson/apng/ExampleUnitTest.java
@ -0,0 +1,17 @@
+package oupson.apng;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
--- a/app-test/.gitignore
+++ b/app-test/.gitignore
@ -0,0 +1 @@
+/build
--- a/app-test/build.gradle
+++ b/app-test/build.gradle
@ -0,0 +1,42 @@
+apply plugin: 'com.android.application'
+
+apply plugin: 'kotlin-android'
+
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 27
+    defaultConfig {
+        applicationId "oupson.apngcreator"
+        minSdkVersion 25
+        targetSdkVersion 26
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    // Configure only for each module that uses Java 8
+    // language features (either in its source code or
+    // through dependencies).
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    productFlavors {
+    }
+}
+
+dependencies {
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation project(':apng_library')
+}
--- a/app-test/libs/KApng-0.0.3.jar
+++ b/app-test/libs/KApng-0.0.3.jar
--- a/app-test/proguard-rules.pro
+++ b/app-test/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/app-test/src/androidTest/java/oupson/apngcreator/ExampleInstrumentedTest.kt
+++ b/app-test/src/androidTest/java/oupson/apngcreator/ExampleInstrumentedTest.kt
@ -0,0 +1,24 @@
+package oupson.apngcreator
+
+import android.support.test.InstrumentationRegistry
+import android.support.test.runner.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getTargetContext()
+        assertEquals("oupson.apngcreator", appContext.packageName)
+    }
+}
--- a/app-test/src/main/AndroidManifest.xml
+++ b/app-test/src/main/AndroidManifest.xml
@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="oupson.apngcreator">
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
--- a/app-test/src/main/java/oupson/apngcreator/BitmapDrawable.java
+++ b/app-test/src/main/java/oupson/apngcreator/BitmapDrawable.java
@ -0,0 +1,57 @@
+package oupson.apngcreator;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
+import android.graphics.drawable.Drawable;
+
+public class BitmapDrawable extends Drawable {
+    private Bitmap mBitmap;
+
+    BitmapDrawable(Bitmap b) {
+        mBitmap = b;
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        canvas.drawBitmap(mBitmap, 0.0f, 0.0f, null);
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return mBitmap.getWidth();
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return mBitmap.getHeight();
+    }
+
+    @Override
+    public int getMinimumWidth() {
+        return mBitmap.getWidth();
+    }
+
+    @Override
+    public int getMinimumHeight() {
+        return mBitmap.getHeight();
+    }
+
+    public Bitmap getBitmap() {
+        return mBitmap;
+    }
+}
--- a/app-test/src/main/java/oupson/apngcreator/MainActivity.kt
+++ b/app-test/src/main/java/oupson/apngcreator/MainActivity.kt
@ -0,0 +1,34 @@
+package oupson.apngcreator
+
+import android.support.v7.app.AppCompatActivity
+import android.os.Bundle
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.AnimationDrawable
+import android.os.Environment
+import android.system.Os
+import oupson.apng.APNGDisassembler
+import java.io.File
+import android.os.Environment.getExternalStorageDirectory
+import kotlinx.android.synthetic.main.activity_main.*
+import oupson.apng.ApngAnimator
+
+
+class MainActivity : AppCompatActivity() {
+    lateinit var animator : ApngAnimator
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        animator = ApngAnimator(imageView)
+        animator.load(File(File(Environment.getExternalStorageDirectory(), "documents"), "image_3.png"))
+
+        play.setOnClickListener {
+            animator.play()
+        }
+
+        pause.setOnClickListener {
+            animator.pause()
+        }
+    }
+}
--- a/app-test/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/app-test/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -0,0 +1,34 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillType="evenOdd"
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="78.5885"
+                android:endY="90.9159"
+                android:startX="48.7653"
+                android:startY="61.0927"
+                android:type="linear">
+                <item
+                    android:color="#44000000"
+                    android:offset="0.0" />
+                <item
+                    android:color="#00000000"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:strokeColor="#00000000"
+        android:strokeWidth="1" />
+</vector>
--- a/app-test/src/main/res/drawable/ic_launcher_background.xml
+++ b/app-test/src/main/res/drawable/ic_launcher_background.xml
@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportHeight="108"
+    android:viewportWidth="108">
+    <path
+        android:fillColor="#26A69A"
+        android:pathData="M0,0h108v108h-108z" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M9,0L9,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,0L19,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,0L29,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,0L39,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,0L49,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,0L59,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,0L69,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,0L79,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M89,0L89,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M99,0L99,108"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,9L108,9"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,19L108,19"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,29L108,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,39L108,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,49L108,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,59L108,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,69L108,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,79L108,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,89L108,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M0,99L108,99"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,29L89,29"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,39L89,39"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,49L89,49"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,59L89,59"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,69L89,69"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M19,79L89,79"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M29,19L29,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M39,19L39,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M49,19L49,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M59,19L59,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M69,19L69,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+    <path
+        android:fillColor="#00000000"
+        android:pathData="M79,19L79,89"
+        android:strokeColor="#33FFFFFF"
+        android:strokeWidth="0.8" />
+</vector>
--- a/app-test/src/main/res/layout/activity_main.xml
+++ b/app-test/src/main/res/layout/activity_main.xml
@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".MainActivity">
+
+    <Button
+        android:id="@+id/pause"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="pause"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
+    <Button
+        android:id="@+id/play"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:text="play"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/play"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:color/transparent" />
+</android.support.constraint.ConstraintLayout>
--- a/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
--- a/app-test/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/app-test/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/app-test/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/app-test/src/main/res/mipmap-hdpi/ic_launcher_round.png
--- a/app-test/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/app-test/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/app-test/src/main/res/mipmap-mdpi/ic_launcher_round.png
+++ b/app-test/src/main/res/mipmap-mdpi/ic_launcher_round.png
--- a/app-test/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/app-test/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/app-test/src/main/res/mipmap-xhdpi/ic_launcher_round.png
+++ b/app-test/src/main/res/mipmap-xhdpi/ic_launcher_round.png
--- a/app-test/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/app-test/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/app-test/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
+++ b/app-test/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
--- a/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
+++ b/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
--- a/app-test/src/main/res/values/colors.xml
+++ b/app-test/src/main/res/values/colors.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">#3F51B5</color>
+    <color name="colorPrimaryDark">#303F9F</color>
+    <color name="colorAccent">#FF4081</color>
+</resources>
--- a/app-test/src/main/res/values/strings.xml
+++ b/app-test/src/main/res/values/strings.xml
@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">APNGCreator</string>
+</resources>
--- a/app-test/src/main/res/values/styles.xml
+++ b/app-test/src/main/res/values/styles.xml
@ -0,0 +1,11 @@
+<resources>
+
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">#ff00</item>
+        <item name="colorPrimaryDark">#0000ff</item>
+        <item name="colorAccent">#ff00</item>
+    </style>
+
+</resources>
--- a/app-test/src/test/java/oupson/apngcreator/ExampleUnitTest.kt
+++ b/app-test/src/test/java/oupson/apngcreator/ExampleUnitTest.kt
@ -0,0 +1,17 @@
+package oupson.apngcreator
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
--- a/build.gradle
+++ b/build.gradle
@ -0,0 +1,28 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    ext.kotlin_version = '1.2.61'
+    ext.kotlin_version = '1.2.60'
+    repositories {
+        google()
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
--- a/gradle.properties
+++ b/gradle.properties
@ -0,0 +1,13 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1536m
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -0,0 +1,6 @@
+#Tue Sep 25 21:36:02 CEST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
--- a/172
+++ b/172
@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
--- a/settings.gradle
+++ b/settings.gradle
@ -0,0 +1 @@
+include ':app-test', ':apng_library'