Updated many things

apng/build.gradle.kts

@@ -0,0 +1,37 @@
+plugins {
+    id("com.android.library")
+}
+
+android {
+    namespace = "com.github.penfeizhou.animation.apng"
+    compileSdk = 36
+
+    defaultConfig {
+        minSdk = 21
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+        }
+    }
+}
+
+dependencies {
+    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    api(project(":frameanimation"))
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.3.0")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
+}
+
+apply(from = rootProject.file("scripts/upload.gradle.kts"))

apng/src/main/java/com/github/penfeizhou/animation/apng/APNGAssetLoader.java

@@ -3,6 +3,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.github.penfeizhou.animation.loader.AssetStreamLoader;
 
 /**
@@ -13,7 +15,7 @@
 @Deprecated
 public class APNGAssetLoader extends AssetStreamLoader {
 
-    public APNGAssetLoader(Context context, String assetName) {
+    public APNGAssetLoader(@NonNull Context context, String assetName) {
         super(context, assetName);
     }
 }

apng/src/main/java/com/github/penfeizhou/animation/apng/APNGDrawable.java

@@ -3,6 +3,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.github.penfeizhou.animation.FrameAnimationDrawable;
 import com.github.penfeizhou.animation.apng.decode.APNGDecoder;
 import com.github.penfeizhou.animation.decode.FrameSeqDecoder;
@@ -17,31 +19,35 @@
  * @CreateDate: 2019/3/27
  */
 public class APNGDrawable extends FrameAnimationDrawable<APNGDecoder> {
-    public APNGDrawable(Loader provider) {
+    public APNGDrawable(@NonNull Loader provider) {
         super(provider);
     }
 
-    public APNGDrawable(APNGDecoder decoder) {
+    public APNGDrawable(@NonNull APNGDecoder decoder) {
         super(decoder);
     }
 
+    @NonNull
     @Override
     protected APNGDecoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener) {
         return new APNGDecoder(streamLoader, listener);
     }
 
 
-    public static APNGDrawable fromAsset(Context context, String assetPath) {
+    @NonNull
+    public static APNGDrawable fromAsset(@NonNull Context context, String assetPath) {
         AssetStreamLoader assetStreamLoader = new AssetStreamLoader(context, assetPath);
         return new APNGDrawable(assetStreamLoader);
     }
 
+    @NonNull
     public static APNGDrawable fromFile(String filePath) {
         FileLoader fileLoader = new FileLoader(filePath);
         return new APNGDrawable(fileLoader);
     }
 
-    public static APNGDrawable fromResource(Context context, int resId) {
+    @NonNull
+    public static APNGDrawable fromResource(@NonNull Context context, int resId) {
         ResourceStreamLoader resourceStreamLoader = new ResourceStreamLoader(context, resId);
         return new APNGDrawable(resourceStreamLoader);
     }

apng/src/main/java/com/github/penfeizhou/animation/apng/APNGResourceLoader.java

@@ -3,6 +3,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.github.penfeizhou.animation.loader.ResourceStreamLoader;
 
 /**
@@ -12,7 +14,7 @@
  */
 @Deprecated
 public class APNGResourceLoader extends ResourceStreamLoader {
-    public APNGResourceLoader(Context context, int resId) {
+    public APNGResourceLoader(@NonNull Context context, int resId) {
         super(context, resId);
     }
 }

apng/src/main/java/com/github/penfeizhou/animation/apng/decode/APNGDecoder.java

@@ -8,6 +8,8 @@
 import android.graphics.Rect;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import com.github.penfeizhou.animation.apng.io.APNGReader;
 import com.github.penfeizhou.animation.apng.io.APNGWriter;
 import com.github.penfeizhou.animation.decode.Frame;
@@ -58,6 +60,7 @@ protected APNGWriter getWriter() {
         return apngWriter;
     }
 
+    @NonNull
     @Override
     protected APNGReader getReader(Reader reader) {
         return new APNGReader(reader);
@@ -75,8 +78,9 @@ protected void release() {
     }
 
 
+    @NonNull
     @Override
-    protected Rect read(APNGReader reader) throws IOException {
+    protected Rect read(@NonNull APNGReader reader) throws IOException {
         List<Chunk> chunks = APNGParser.parse(reader);
         List<Chunk> otherChunks = new ArrayList<>();
 
@@ -89,7 +93,7 @@ protected Rect read(APNGReader reader) throws IOException {
                 Log.e(TAG, "chunk read reach to end");
                 break;
             }
-            
+
             if (chunk instanceof ACTLChunk) {
                 mLoopCount = ((ACTLChunk) chunk).num_plays;
                 actl = true;
@@ -121,7 +125,7 @@ protected Rect read(APNGReader reader) throws IOException {
                 canvasWidth = ((IHDRChunk) chunk).width;
                 canvasHeight = ((IHDRChunk) chunk).height;
                 ihdrData = ((IHDRChunk) chunk).data;
-            } else if (!(chunk instanceof IENDChunk)) {
+            } else {
                 otherChunks.add(chunk);
             }
         }
@@ -131,8 +135,8 @@ protected Rect read(APNGReader reader) throws IOException {
     }
 
     @Override
-    protected void renderFrame(Frame<APNGReader, APNGWriter> frame) {
-        if (frame == null || fullRect == null) {
+    protected void renderFrame(@NonNull Frame<APNGReader, APNGWriter> frame) {
+        if (fullRect == null) {
             return;
         }
         try {

apng/src/main/java/com/github/penfeizhou/animation/apng/decode/APNGFrame.java

@@ -4,7 +4,9 @@
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.graphics.Rect;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.github.penfeizhou.animation.apng.io.APNGReader;
 import com.github.penfeizhou.animation.apng.io.APNGWriter;
@@ -40,7 +42,7 @@ private CRC32 getCRC32() {
         return crc32;
     }
 
-    public APNGFrame(APNGReader reader, FCTLChunk fctlChunk) {
+    public APNGFrame(APNGReader reader, @NonNull FCTLChunk fctlChunk) {
         super(reader);
         blend_op = fctlChunk.blend_op;
         dispose_op = fctlChunk.dispose_op;
@@ -59,7 +61,7 @@ public APNGFrame(APNGReader reader, FCTLChunk fctlChunk) {
         frameY = fctlChunk.y_offset;
     }
 
-    private int encode(APNGWriter apngWriter) throws IOException {
+    private int encode(@NonNull  APNGWriter apngWriter) throws IOException {
         int fileSize = 8 + 13 + 12;
 
         //prefixChunks
@@ -130,7 +132,7 @@ private int encode(APNGWriter apngWriter) throws IOException {
 
 
     @Override
-    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, APNGWriter writer) {
+    public Bitmap draw(Canvas canvas, Paint paint, int sampleSize, Bitmap reusedBitmap, @NonNull APNGWriter writer) {
         try {
             int length = encode(writer);
             BitmapFactory.Options options = new BitmapFactory.Options();

apng/src/main/java/com/github/penfeizhou/animation/apng/decode/APNGParser.java

@@ -2,6 +2,8 @@
 
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+
 import com.github.penfeizhou.animation.apng.io.APNGReader;
 import com.github.penfeizhou.animation.io.Reader;
 import com.github.penfeizhou.animation.io.StreamReader;
@@ -24,7 +26,7 @@ static class FormatException extends IOException {
         }
     }
 
-    public static boolean isAPNG(String filePath) {
+    public static boolean isAPNG(@NonNull String filePath) {
         InputStream inputStream = null;
         try {
             inputStream = new FileInputStream(filePath);
@@ -42,7 +44,7 @@ public static boolean isAPNG(String filePath) {
         }
     }
 
-    public static boolean isAPNG(Context context, String assetPath) {
+    public static boolean isAPNG(@NonNull Context context, @NonNull String assetPath) {
         InputStream inputStream = null;
         try {
             inputStream = context.getAssets().open(assetPath);
@@ -60,7 +62,7 @@ public static boolean isAPNG(Context context, String assetPath) {
         }
     }
 
-    public static boolean isAPNG(Context context, int resId) {
+    public static boolean isAPNG(@NonNull Context context, int resId) {
         InputStream inputStream = null;
         try {
             inputStream = context.getResources().openRawResource(resId);
@@ -98,7 +100,8 @@ public static boolean isAPNG(Reader in) {
         return false;
     }
 
-    public static List<Chunk> parse(APNGReader reader) throws IOException {
+    @NonNull
+    public static List<Chunk> parse(@NonNull APNGReader reader) throws IOException {
         if (!reader.matchFourCC("\u0089PNG") || !reader.matchFourCC("\r\n\u001a\n")) {
             throw new FormatException();
         }

apng/src/main/java/com/github/penfeizhou/animation/apng/io/APNGReader.java

@@ -2,6 +2,9 @@
 
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.github.penfeizhou.animation.io.FilterReader;
 import com.github.penfeizhou.animation.io.Reader;
 
@@ -16,6 +19,7 @@ public class APNGReader extends FilterReader {
     private static ThreadLocal<byte[]> __intBytes = new ThreadLocal<>();
 
 
+    @NonNull
     protected static byte[] ensureBytes() {
         byte[] bytes = __intBytes.get();
         if (bytes == null) {
@@ -48,7 +52,7 @@ public short readShort() throws IOException {
     /**
      * @return read FourCC and match chars
      */
-    public boolean matchFourCC(String chars) throws IOException {
+    public boolean matchFourCC(@Nullable String chars) throws IOException {
         if (TextUtils.isEmpty(chars) || chars.length() != 4) {
             return false;
         }