Working on beta

Author: oupson

.idea/caches/build_file_checksums.ser

@@ -8,7 +8,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0.10"
+        versionName "1.0.10-beta1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

apng_library/build.gradle

@@ -4,6 +4,7 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.*
 import android.net.Uri
+import android.util.Log
 import android.widget.ImageView
 import androidx.annotation.RawRes
 import kotlinx.coroutines.Dispatchers
@@ -18,6 +19,8 @@ import oupson.apng.utils.Utils.Companion.isPng
 import java.io.File
 import java.net.URL
 
+// TODO REWRITE WITH CALLBACKS
+
 /**
  * @param file The APNG to load
  * @param speed The speed of the APNG
@@ -270,20 +273,32 @@ class ApngAnimator(private val context: Context?) {
         GlobalScope.launch(Dispatchers.IO) {
             this@ApngAnimator.speed = speed
             // Download PNG
-            Loader.load(context!!, url).apply {
-                try {
-                    this@ApngAnimator.load(this, speed, apngAnimatorOptions)
-                } catch (e : NotPngException) {
-                    if (loadNotApng) {
-                        val bytes = this.readBytes()
-                        GlobalScope.launch(Dispatchers.Main) {
-                            imageView?.scaleType = this@ApngAnimator.scaleType ?: ImageView.ScaleType.FIT_CENTER
-                            imageView?.setImageBitmap(BitmapFactory.decodeByteArray(bytes, 0, bytes.size))
+            try {
+                Loader.load(context!!, url).apply {
+                    try {
+                        this@ApngAnimator.load(this, speed, apngAnimatorOptions)
+                    } catch (e: NotPngException) {
+                        if (loadNotApng) {
+                            val bytes = this.readBytes()
+                            GlobalScope.launch(Dispatchers.Main) {
+                                imageView?.scaleType =
+                                    this@ApngAnimator.scaleType ?: ImageView.ScaleType.FIT_CENTER
+                                imageView?.setImageBitmap(
+                                    BitmapFactory.decodeByteArray(
+                                        bytes,
+                                        0,
+                                        bytes.size
+                                    )
+                                )
+                            }
+                        } else {
+                            throw NotApngException()
                         }
-                    } else {
-                        throw NotApngException()
                     }
                 }
+            } catch (e : java.lang.Exception) {
+                if (BuildConfig.DEBUG)
+                    Log.e("ApngAnimator", "Error : $e")
             }
         }
         return this
@@ -535,6 +550,7 @@ class ApngAnimator(private val context: Context?) {
     private fun toAnimationDrawable( generatedFrame : ArrayList<Bitmap> ): CustomAnimationDrawable {
         if (isApng) {
             return CustomAnimationDrawable().apply {
+                isOneShot = false
                 for (i in 0 until generatedFrame.size) {
                     addFrame(BitmapDrawable(generatedFrame[i]), ((duration!![i]) / (speed ?: 1f)).toInt())
                 }

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

@@ -19,7 +19,7 @@ import oupson.apng.utils.Utils.Companion.isPng
  * @param maxWidth The max width of the APNG
  * @param maxHeight The max height of the APNG
  */
-class Frame// Get width and height for image
+class Frame // Get width and height for image
     (
     byteArray: ByteArray,
     delay: Float = 1000f,

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

@@ -12,10 +12,10 @@ import java.net.URL
 class Loader {
     companion object {
         /**
-         * Download file from given url
-         * @param context Context of app
-         * @param url Url of the file to download
-         * @return [ByteArray] of the file
+         * Download file from given url.
+         * @param context Context of app.
+         * @param url Url of the file to download.
+         * @return [ByteArray] of the file.
          */
         @Throws(IOException::class, java.io.FileNotFoundException::class)
         suspend fun load(context: Context, url: URL) =

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

@@ -44,7 +44,7 @@ class ApngDecoderFragment : Fragment() {
 
                     override fun onError(error: Exception) {
                         if (BuildConfig.DEBUG)
-                            Log.e(TAG, "onError", error)
+                            Log.e(TAG, "onError : $error")
                     }
                 })
         }

apng_library/src/main/java/oupson/apng/decoder/ApngDecoder.kt

@@ -15,6 +15,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import oupson.apng.decoder.ApngDecoder;
+import oupson.apngcreator.BuildConfig;
 import oupson.apngcreator.R;
 
 
@@ -24,7 +25,8 @@ public class JavaFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        Log.i(TAG, "onCreateView()");
+        if (BuildConfig.DEBUG)
+            Log.i(TAG, "onCreateView()");
 
         View v = inflater.inflate(R.layout.fragment_java, container, false);
 
@@ -49,12 +51,14 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
             ApngDecoder.decodeApngAsyncInto(context, imageUrl, imageView, 1f, new ApngDecoder.Callback() {
                 @Override
                 public void onSuccess(@NotNull Drawable drawable) {
-                    Log.i(TAG, "Success");
+                    if (BuildConfig.DEBUG)
+                        Log.i(TAG, "Success");
                 }
 
                 @Override
                 public void onError(@NotNull Exception error) {
-                    Log.e(TAG, "Error", error);
+                    if (BuildConfig.DEBUG)
+                        Log.e(TAG, "Error : " + error.toString());
                 }
             });
 

app-test/src/main/java/oupson/apngcreator/fragments/ApngDecoderFragment.kt

@@ -87,12 +87,17 @@ class KotlinFragment : Fragment() {
         })
 
         if (animator == null) {
-            animator = apngImageView?.loadApng(imageUrls[selected])?.apply {
-                onLoaded {
-                    setOnFrameChangeLister {
-                        // Log.e("app-test", "onLoop")
+            try {
+                animator = apngImageView?.loadApng(imageUrls[selected])?.apply {
+                    onLoaded {
+                        setOnFrameChangeLister {
+                            // Log.e("app-test", "onLoop")
+                        }
                     }
                 }
+            } catch (e : Exception) {
+                if (BuildConfig.DEBUG)
+                    Log.e(TAG, "Error : $e")
             }
         }
 

app-test/src/main/java/oupson/apngcreator/fragments/JavaFragment.java

@@ -4,7 +4,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/viewerImageView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app-test/src/main/java/oupson/apngcreator/fragments/KotlinFragment.kt

@@ -9,7 +9,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/ApngImageView"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -22,7 +22,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 android:contentDescription="@string/description_viewer_imageView"/>
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/NormalImageView"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
@@ -36,7 +36,7 @@
                 app:layout_constraintTop_toBottomOf="@id/ApngImageView"
                 android:contentDescription="@string/description_viewer_imageView" />
 
-        <SeekBar
+        <androidx.appcompat.widget.AppCompatSeekBar
                 android:id="@+id/SpeedSeekBar"
                 style="@style/Widget.AppCompat.SeekBar"
                 android:layout_width="0dp"
@@ -49,24 +49,26 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/PlayButton"
-                style="@android:style/Widget.Material.Light.Button.Borderless.Colored"
+                android:theme="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:backgroundTint="@color/colorPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
-                android:background="@android:color/white"
+                android:textColor="@color/control"
                 android:text="@string/title_playButton"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
-        <Button
+        <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/PauseButton"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:theme="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:backgroundTint="@color/colorPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:background="@android:color/white"
+                android:textColor="@color/control"
                 android:text="@string/title_pauseButton"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />

app-test/src/main/res/layout/activity_viewer.xml

@@ -14,6 +14,7 @@
         <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/is_theme_light</item>
         <item name="android:navigationBarColor">@color/colorPrimary</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/nav_bar_light</item>
+        <item name="colorControlHighlight">@color/colorPrimary</item>
     </style>
 
     <style name="AppShapeAppearance.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">