Merge pull request #111 from penfeizhou/feature/zpf

Add nomeasure option

Author: jingpeng

app/src/main/java/com/github/penfeizhou/animation/demo/APNGTestActivity.java

@@ -22,40 +22,17 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_apnglib);
         LinearLayout linearLayout = findViewById(R.id.layout);
         String[] urls = new String[]{
-                "file:///android_asset/apng_detail_guide.png",
-                "https://misc.aotu.io/ONE-SUNDAY/SteamEngine.png",
-                "https://isparta.github.io/compare-webp/image/gif_webp/webp/2.webp",
-                "file:///android_asset/1.gif",
-                "file:///android_asset/2.gif",
-                "file:///android_asset/3.gif",
-                "file:///android_asset/4.gif",
-                "file:///android_asset/5.gif",
-                "file:///android_asset/1.webp",
-                "file:///android_asset/2.webp",
-                "https://misc.aotu.io/ONE-SUNDAY/world_cup_2014_42.webp",
-                "https://misc.aotu.io/ONE-SUNDAY/BladeRunner.webp",
-                "https://misc.aotu.io/ONE-SUNDAY/SteamEngine.webp",
-                "https://misc.aotu.io/ONE-SUNDAY/SteamEngine_lossy.webp",
-                "https://ezgif.com/images/format-demo/butterfly-small.webp",
-        };
+                "https://misc.aotu.io/ONE-SUNDAY/SteamEngine.png"};
         for (String url : urls) {
             ImageView imageView = new ImageView(this);
-            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(500, 500);
             layoutParams.bottomMargin = 50;
             layoutParams.topMargin = 50;
             linearLayout.addView(imageView, layoutParams);
             GlideApp.with(imageView)
                     .load(url)
+                    .set(AnimationDecoderOption.NO_ANIMATION_BOUNDS_MEASURE, true)
                     .into(imageView);
         }
-//        FileLoader fileLoader = new FileLoader("/data/data/com.github.pengfeizhou.animation.demo/cache/image_manager_disk_cache/b6dd68d837b8d1e8f24edb0a0df5213b7accebb16c22c8202e95363f7227740e.0");
-//
-//        ImageView imageView = new ImageView(this);
-//        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-//        layoutParams.bottomMargin = 50;
-//        layoutParams.topMargin = 50;
-//        linearLayout.addView(imageView, layoutParams);
-//        imageView.setImageDrawable(new APNGDrawable(fileLoader));
-
     }
 }

frameanimation/src/main/java/com/github/penfeizhou/animation/FrameAnimationDrawable.java

@@ -74,6 +74,8 @@ public void run() {
 
     private final Set<WeakReference<Callback>> obtainedCallbacks = new HashSet<>();
 
+    private boolean noMeasure = false;
+
     public FrameAnimationDrawable(Decoder frameSeqDecoder) {
         paint.setAntiAlias(true);
         this.frameSeqDecoder = frameSeqDecoder;
@@ -88,6 +90,10 @@ public void setAutoPlay(boolean autoPlay) {
         this.autoPlay = autoPlay;
     }
 
+    public void setNoMeasure(boolean noMeasure) {
+        this.noMeasure = noMeasure;
+    }
+
     protected abstract Decoder createFrameSeqDecoder(Loader streamLoader, FrameSeqDecoder.RenderListener listener);
 
     /**
@@ -240,6 +246,9 @@ public boolean setVisible(boolean visible, boolean restart) {
 
     @Override
     public int getIntrinsicWidth() {
+        if (noMeasure) {
+            return -1;
+        }
         try {
             return frameSeqDecoder.getBounds().width();
         } catch (Exception exception) {
@@ -249,6 +258,9 @@ public int getIntrinsicWidth() {
 
     @Override
     public int getIntrinsicHeight() {
+        if (noMeasure) {
+            return -1;
+        }
         try {
             return frameSeqDecoder.getBounds().height();
         } catch (Exception exception) {

plugin_glide/src/main/java/com/github/penfeizhou/animation/glide/AnimationDecoderOption.java

@@ -28,6 +28,13 @@ public final class AnimationDecoderOption {
     public static final Option<Boolean> DISABLE_ANIMATION_APNG_DECODER = Option.memory(
             "com.github.penfeizhou.animation.glide.AnimationDecoderOption.DISABLE_ANIMATION_APNG_DECODER", false);
 
+    /**
+     * If set to {@code true},  call {@link com.github.penfeizhou.animation.FrameAnimationDrawable#setNoMeasure(boolean)}
+     * Defaults to {@code false}.
+     */
+    public static final Option<Boolean> NO_ANIMATION_BOUNDS_MEASURE = Option.memory(
+            "com.github.penfeizhou.animation.glide.AnimationDecoderOption.DISABLE_ANIMATION_BOUNDS_MEASURE", false);
+
 
     private AnimationDecoderOption() {
     }

plugin_glide/src/main/java/com/github/penfeizhou/animation/glide/FrameDrawableTranscoder.java

@@ -29,9 +29,11 @@ class FrameDrawableTranscoder implements ResourceTranscoder<FrameSeqDecoder, Dra
     @Override
     public Resource<Drawable> transcode(@NonNull Resource<FrameSeqDecoder> toTranscode, @NonNull Options options) {
         FrameSeqDecoder frameSeqDecoder = toTranscode.get();
+        boolean noMeasure = options.get(AnimationDecoderOption.NO_ANIMATION_BOUNDS_MEASURE);
         if (frameSeqDecoder instanceof APNGDecoder) {
             final APNGDrawable apngDrawable = new APNGDrawable((APNGDecoder) frameSeqDecoder);
             apngDrawable.setAutoPlay(false);
+            apngDrawable.setNoMeasure(noMeasure);
             return new DrawableResource<Drawable>(apngDrawable) {
                 @NonNull
                 @Override
@@ -57,6 +59,7 @@ public void initialize() {
         } else if (frameSeqDecoder instanceof WebPDecoder) {
             final WebPDrawable webPDrawable = new WebPDrawable((WebPDecoder) frameSeqDecoder);
             webPDrawable.setAutoPlay(false);
+            webPDrawable.setNoMeasure(noMeasure);
             return new DrawableResource<Drawable>(webPDrawable) {
                 @NonNull
                 @Override
@@ -81,6 +84,7 @@ public void initialize() {
         } else if (frameSeqDecoder instanceof GifDecoder) {
             final GifDrawable gifDrawable = new GifDrawable((GifDecoder) frameSeqDecoder);
             gifDrawable.setAutoPlay(false);
+            gifDrawable.setNoMeasure(noMeasure);
             return new DrawableResource<Drawable>(gifDrawable) {
                 @NonNull
                 @Override