Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsCardCoverHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
-import android.graphics.Bitmap;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
@@ -10,7 +9,8 @@ import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -53,22 +53,22 @@ public class ContentsCardCoverHolder extends ContentsHolder<ContentsItemBean> {
   protected void bindInternal() {
     imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     Glide.with(imageViewCardListicleCover)
-      .asBitmap()
-      .transition(new BitmapTransitionOptions().crossFade(100))
+      //.asBitmap()
+      .asGif()
+      .transition(new DrawableTransitionOptions().crossFade(100))
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().skipMemoryCache(true))
       // 커버에는 placeholder 없음.
 //      .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewCardListicleCover.getContext(), R.drawable.image_loading_full)))
       .load(bean.getImageUrl())
-      .transition(new BitmapTransitionOptions().crossFade(100))
-      .listener(new RequestListener<Bitmap>() {
+      .listener(new RequestListener<GifDrawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dimTop, dimBottom);
           imageViewCardListicleCover.setImageResource(0);
           imageViewCardListicleCover.setScaleType(ImageView.ScaleType.CENTER_CROP);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsCardHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
-import android.graphics.Bitmap;
 import android.support.annotation.CallSuper;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
@@ -12,6 +11,7 @@ import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -59,18 +59,18 @@ public class ContentsCardHolder extends ContentsHolder<ContentsItemBean> {
 
     // 기본 이미지
     Glide.with(imageViewCardListicleCover)
-      .asBitmap().load(bean.getImageUrl())
+      .asGif().load(bean.getImageUrl())
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().skipMemoryCache(true))
       .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewCardListicleCover.getContext(), R.drawable.image_loading_full)))
-      .listener(new RequestListener<Bitmap>() {
+      .listener(new RequestListener<GifDrawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dim0, dim1);
           return false;
         }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsListicleCoverHolder.java

@@ -1,6 +1,5 @@
 package kr.co.zumo.app.lifeplus.view.screen.contents;
 
-import android.graphics.Bitmap;
 import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
@@ -9,7 +8,8 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.load.resource.bitmap.BitmapTransitionOptions;
+import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
+import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -75,20 +75,21 @@ public class ContentsListicleCoverHolder extends ContentsHolder<ContentsItemBean
 
     imageViewShopping.setVisibility(ContentsItemBean.TYPE_ATTRIBUTE_PURCHASE.equals(bean.getListAttributeType()) ? View.VISIBLE : View.GONE);
     Glide.with(imageViewBackground)
-      .asBitmap().load(bean.getImageUrl())
-      .transition(new BitmapTransitionOptions().crossFade(100))
+      //.asBitmap().load(bean.getImageUrl())
+      .asGif().load(bean.getImageUrl())
+      .transition(new DrawableTransitionOptions().crossFade(100))
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().skipMemoryCache(true))
       // 커버에는 placeholder 없음.
 //      .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewBackground.getContext(), R.drawable.image_loading_full)))
-      .listener(new RequestListener<Bitmap>() {
+      .listener(new RequestListener<GifDrawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
           return false;
         }
 
         @Override
-        public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(dim);
           imageViewBackground.setImageResource(0);
           imageViewBackground.setScaleType(ImageView.ScaleType.CENTER_CROP);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/view/ListicleImageViewHolder.java

@@ -53,7 +53,7 @@ public class ListicleImageViewHolder extends RecyclerView.ViewHolder {
     this.listener = listener;
 
     Glide.with(imageViewBackground)
-      .asBitmap()
+      .asGif()
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
       .apply(new RequestOptions().placeholder(ResourceUtil.getDrawable(imageViewBackground.getContext(), R.drawable.image_loading_full)))
       .apply(new RequestOptions().skipMemoryCache(true))

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/main/MainCategoryContentsImageView.java

@@ -4,7 +4,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.main;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.os.Handler;
 import android.support.annotation.Nullable;
@@ -18,6 +17,7 @@ import android.widget.TextView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
@@ -346,23 +346,23 @@ public class MainCategoryContentsImageView extends MainCategoryContentsView {
     imageWidth = Math.max(maskWidth + ResourceUtil.dpToPx(50), screenWidth - ResourceUtil.dpToPx(50));
     imageHeight = maskHeight + ResourceUtil.dpToPx(50);
     Glide.with(imageView)
-      .asBitmap()
+      .asGif()
       .load(url)
 //      .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.NONE))
 //      .apply(new RequestOptions().skipMemoryCache(true))
       .apply(new RequestOptions().centerCrop())
       .apply(new RequestOptions().placeholder((ResourceUtil.getDrawable(imageView.getContext(), R.drawable.image_loading_main))))
       .apply(new RequestOptions().override(/*maskWidth + ResourceUtil.dpToPx(200)*/ imageWidth, imageHeight))
-      .listener(new RequestListener<Bitmap>() {
+      .listener(new RequestListener<GifDrawable>() {
         @Override
-        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Bitmap> target, boolean isFirstResource) {
+        public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<GifDrawable> target, boolean isFirstResource) {
           imageWidth = maskWidth;
           imageHeight = maskHeight;
           return false;
         }
 
         @Override
-        public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
+        public boolean onResourceReady(GifDrawable resource, Object model, Target<GifDrawable> target, DataSource dataSource, boolean isFirstResource) {
           Visibler.visible(mask0, mask1, mask2);
           //you should call after the bitmap drawn
 //          int imageLoadedWidth = resource.getWidth(); //this is the bitmap's width