Small improvements

Author: oupson

apng_library/src/main/java/oupson/apng/APNGDisassembler.kt

@@ -9,9 +9,8 @@ import oupson.apng.chunks.fcTL
 import oupson.apng.exceptions.NotApngException
 import java.util.zip.CRC32
 
-class APNGDisassembler() {
+class APNGDisassembler {
     companion object {
-
         fun disassemble(byteArray: ByteArray) : Apng {
             val pngList = ArrayList<Frame>()
             var png: ArrayList<Byte>? = null

apng_library/src/main/java/oupson/apng/ImageUtils/PnnQuantizer.java

@@ -27,7 +27,7 @@ public class PnnQuantizer {
     protected int width, height;
     protected int pixels[] = null;
     private Integer m_transparentColor;
-    private Map<Integer, short[]> closestMap = new HashMap();
+    private HashMap<Integer, short[]> closestMap = new HashMap();
 
     public PnnQuantizer(String fname) throws IOException {
         fromBitmap(fname);
@@ -156,7 +156,7 @@ private Integer[] pnnquan(final int[] pixels, int nMaxColors, boolean quan_sqrt)
         /* Merge bins which increase error the least */
         int extbins = maxbins - nMaxColors;
         for (int i = 0; i < extbins; ) {
-            Pnnbin tb = null;
+            Pnnbin tb;
             /* Use heap to find which bins to merge */
             for (;;) {
                 int b1 = heap[1];
@@ -253,7 +253,7 @@ private short nearestColorIndex(final Integer[] palette, final int[] squares3, f
         return k;
     }
 
-    private short closestColorIndex(final Integer[] palette, final int[] squares3, final int c)
+    private short closestColorIndex(final Integer[] palette, final int c)
     {
         short k = 0;
         short[] closest = new short[5];
@@ -407,7 +407,7 @@ boolean quantize_image(final int[] pixels, final Integer[] palette, int[] qPixel
         }
         else {
             for (int i = 0; i < qPixels.length; i++)
-                qPixels[i] = palette[closestColorIndex(palette, squares3, pixels[i])];
+                qPixels[i] = palette[closestColorIndex(palette, pixels[i])];
         }
 
         return true;

apng_library/src/main/java/oupson/apng/Loader.kt

@@ -2,39 +2,28 @@ package oupson.apng
 
 import android.content.Context
 import java.io.BufferedInputStream
-import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
 import java.net.URL
 
 class Loader {
     companion object {
+        @Throws(IOException::class)
         fun load(context: Context, url: URL): ByteArray {
-            val currenDir = context.filesDir
-            val fileTXT = File(currenDir, "apngLoader.txt")
-            var filePNG = File(currenDir, "apngLoader.png")
-            if (fileTXT.exists() && url.toString() == fileTXT.readText()) {
-                return filePNG.readBytes()
+            val currentDir = context.filesDir
+            val fileTXT = File(currentDir, "apngLoader.txt")
+            val filePNG = File(currentDir, "apngLoader.png")
+            return if (fileTXT.exists() && url.toString() == fileTXT.readText()) {
+                filePNG.readBytes()
             } else {
-                try {
-                    val connection = url.openConnection()
-                    connection.connect()
-                    val input = BufferedInputStream(connection.getInputStream())
-                    val output = ByteArrayOutputStream()
-                    val data = ByteArray(1024)
-                    var count = 0
-                    while ({ count = input.read(data); count }() != -1) {
-                        output.write(data, 0, count)
-                    }
-                    output.flush()
-                    output.close()
-                    input.close()
-                    fileTXT.writeText(url.toString())
-                    filePNG.writeBytes(output.toByteArray())
-                    return output.toByteArray()
-                } catch (e: IOException) {
-                    throw e
-                }
+                val connection = url.openConnection()
+                connection.connect()
+                val input = BufferedInputStream(connection.getInputStream())
+                val bytes = input.readBytes()
+                input.close()
+                fileTXT.writeText(url.toString())
+                filePNG.writeBytes(bytes)
+                bytes
             }
         }
     }

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

@@ -34,31 +34,25 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-
         doAsync {
             Loader.load(applicationContext, URL(imageUrl)).apply {
                 val a = APNGDisassembler.disassemble(this)
                 a.reduceSize(100, false, 60)
-                File(File(Environment.getExternalStorageDirectory(), "Documents"), "apng.png").writeBytes(a.toByteArray())
+                File(File(Environment.getExternalStorageDirectory(), "Download"), "apng.png").writeBytes(a.toByteArray())
                 runOnUiThread {
                     toast("Converted ! ")
                 }
             }
         }
 
         this.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            internal var progress = 0
 
-            // When Progress value changed.
             override fun onProgressChanged(seekBar: SeekBar, progressValue: Int, fromUser: Boolean) {
-                progress = progressValue
             }
 
-            // Notification that the user has started a touch gesture.
             override fun onStartTrackingTouch(seekBar: SeekBar) {
             }
 
-            // Notification that the user has finished a touch gesture
             override fun onStopTrackingTouch(seekBar: SeekBar) {
                 Log.e("TAG" , (seekBar.progress.toFloat() / 100f).toString())
                 animator.speed = (seekBar.progress.toFloat() / 100f)