Sfoglia il codice sorgente

[북마크][Bug] 리스트에서 좋아요/북마크 버튼 회색으로 보여지 않는 현상 패치

hyodong.min 6 anni fa
parent
commit
f6beb129c9

+ 4 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/helper/NavigationBar.java

@@ -488,7 +488,8 @@ public class NavigationBar {
     else {
       if (isAnim) {
         int drawableRes = isWhite ? R.drawable.icon_header_like_wh_off : R.drawable.icon_header_like_bk_off;
-        likeAnimation.offAnimationShow(buttonLike, drawableRes, isWhite);
+        int tintColor = isWhite ? R.color.CFFFFFF : R.color.C000000;
+        likeAnimation.offAnimationShow(buttonLike, drawableRes, tintColor);
       }
       else {
         buttonLike.setImageResource(R.drawable.icon_header_like_wh_off);
@@ -522,7 +523,8 @@ public class NavigationBar {
     else {
       if (isAnim) {
         int drawableRes = isWhite ? R.drawable.icon_header_bookmark_wh_off : R.drawable.icon_header_bookmark_bk_off;
-        bookmarkAnimation.offAnimationShow(buttonBookmark, drawableRes, isWhite);
+        int tintColor = isWhite ? R.color.CFFFFFF : R.color.C000000;
+        bookmarkAnimation.offAnimationShow(buttonBookmark, drawableRes, tintColor);
       }
       else {
         buttonBookmark.setImageResource(R.drawable.icon_header_bookmark_wh_off);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/animation/BookmarkAnimation.java

@@ -34,7 +34,7 @@ public class BookmarkAnimation {
     animationDrawable.start();
   }
 
-  public void offAnimationShow(ImageView target, @DrawableRes int drawableRes, boolean isWhite) {
+  public void offAnimationShow(ImageView target, @DrawableRes int drawableRes, int tintColor) {
     target.setImageResource(R.drawable.bookmark_off_animation);
     animationDrawable = (AnimationDrawable) target.getDrawable();
     animationDrawable.setOneShot(true);
@@ -43,7 +43,7 @@ public class BookmarkAnimation {
      * 이를 방지하기 위해서 컬러를 다시 설정해준다.
      */
     Drawable drawable = ContextCompat.getDrawable(target.getContext(), drawableRes);
-    DrawableCompat.setTint(drawable, isWhite ? ResourceUtil.getColor(R.color.CFFFFFF) : ResourceUtil.getColor(R.color.C000000));
+    DrawableCompat.setTint(drawable, ResourceUtil.getColor(tintColor));
     animationDrawable.addFrame(drawable, 40);
     animationDrawable.start();
   }

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/animation/LikeAnimation.java

@@ -35,12 +35,12 @@ public class LikeAnimation {
     animationDrawable.start();
   }
 
-  public void offAnimationShow(ImageView target, @DrawableRes int drawableRes, boolean isWhite) {
+  public void offAnimationShow(ImageView target, @DrawableRes int drawableRes, int tintColor) {
     target.setImageDrawable(AppCompatResources.getDrawable(target.getContext(), R.drawable.like_off_animation));
     animationDrawable = (AnimationDrawable) target.getDrawable();
     animationDrawable.setOneShot(true);
     Drawable drawable = ContextCompat.getDrawable(target.getContext(), drawableRes);
-    DrawableCompat.setTint(drawable, isWhite ? ResourceUtil.getColor(R.color.CFFFFFF) : ResourceUtil.getColor(R.color.C000000));
+    DrawableCompat.setTint(drawable, ResourceUtil.getColor(tintColor));
     animationDrawable.addFrame(drawable, 40);
     animationDrawable.start();
   }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/BookmarkCheckbox.java

@@ -53,7 +53,7 @@ public class BookmarkCheckbox extends AbstractCheckbox {
     }
     else {
       if (isAnim) {
-        bookmarkAnimation.offAnimationShow(checkImage, R.drawable.icon_bookmark_off, true);
+        bookmarkAnimation.offAnimationShow(checkImage, R.drawable.icon_bookmark_off, R.color.CC5C5C5);
       }
       else {
         checkImage.setImageResource(R.drawable.icon_bookmark_off);

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/LikeCheckbox.java

@@ -55,7 +55,7 @@ public class LikeCheckbox extends AbstractCheckbox {
     }
     else {
       if (isAnim) {
-        likeAnimation.offAnimationShow(checkImage, R.drawable.icon_like_off, true);
+        likeAnimation.offAnimationShow(checkImage, R.drawable.icon_like_off, R.color.CC5C5C5);
       }
       else {
         checkImage.setImageResource(R.drawable.icon_like_off);

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsOverviewFragment.java

@@ -154,7 +154,7 @@ public class ContentsOverviewFragment extends FragmentBase<ContentsOverviewPrese
     }
     else {
       if (isAnim) {
-        likeAnimation.offAnimationShow(imageLiked, R.drawable.icon_header_like_off_over_view, false);
+        likeAnimation.offAnimationShow(imageLiked, R.drawable.icon_header_like_off_over_view, R.color.C000000);
       }
       else {
         imageLiked.setImageResource(R.drawable.icon_header_like_off_over_view);
@@ -190,7 +190,7 @@ public class ContentsOverviewFragment extends FragmentBase<ContentsOverviewPrese
     else {
 
       if (isAnim) {
-        bookmarkAnimation.offAnimationShow(imageBookmark, R.drawable.icon_header_bookmark_off_over_view, false);
+        bookmarkAnimation.offAnimationShow(imageBookmark, R.drawable.icon_header_bookmark_off_over_view, R.color.C000000);
       }
       else {
         imageBookmark.setImageResource(R.drawable.icon_header_bookmark_off_over_view);