Browse Source

[공통][Bug] 좋아요/북마크 컬러 바뀌는 것 수정

hyodong.min 7 years ago
parent
commit
64dfa84eb5

+ 16 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/helper/NavigationBar.java

@@ -4,6 +4,7 @@
 package kr.co.zumo.app.lifeplus.helper;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.StringRes;
 import android.support.v4.graphics.drawable.DrawableCompat;
 import android.view.LayoutInflater;
@@ -261,8 +262,6 @@ public class NavigationBar {
 
     setBackgroundTransparent(newBuilder.isTransparentBackground);
 
-    setWhiteUi(newBuilder.isWhite);
-
     setHomeVisible(newBuilder.isVisibleHome);
     mapClickListener(buttonHome, newBuilder.homeListener);
 
@@ -304,6 +303,7 @@ public class NavigationBar {
     setBookmarkVisible(newBuilder.isVisibleBookmark);
     mapClickListener(buttonBookmark, newBuilder.bookmarkListener);
 
+    setWhiteUi(newBuilder.isWhite);
     builder = newBuilder;
   }
 
@@ -345,6 +345,17 @@ public class NavigationBar {
     DrawableCompat.setTint(buttonBookmark.getDrawable(), color);
   }
 
+  private void setWhiteUi(Drawable drawable, boolean isWhite) {
+    int color;
+    if (isWhite) {
+      color = ResourceUtil.getColor(R.color.CFFFFFF);
+    }
+    else {
+      color = ResourceUtil.getColor(R.color.C000000);
+    }
+    DrawableCompat.setTint(drawable, color);
+  }
+
   /***********************************
    * public
    ***********************************/
@@ -393,7 +404,7 @@ public class NavigationBar {
       buttonConfirm.setImageResource(R.drawable.icon_bucket_complete_dim);
     }
 
-    setWhiteUi(builder.isWhite);
+    setWhiteUi(buttonConfirm.getDrawable(), builder.isWhite);
   }
 
   /**
@@ -407,7 +418,7 @@ public class NavigationBar {
     }
     else {
       buttonLike.setImageResource(R.drawable.icon_header_like_wh_off);
-      setWhiteUi(builder.isWhite);
+      setWhiteUi(buttonLike.getDrawable(), builder.isWhite);
     }
   }
 
@@ -422,7 +433,7 @@ public class NavigationBar {
     }
     else {
       buttonBookmark.setImageResource(R.drawable.icon_header_bookmark_wh_off);
-      setWhiteUi(builder.isWhite);
+      setWhiteUi(buttonBookmark.getDrawable(), builder.isWhite);
     }
   }
 

+ 11 - 4
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsFlagHelper.java

@@ -18,6 +18,7 @@ import kr.co.zumo.app.lifeplus.bean.api.ItemNumberBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 import kr.co.zumo.app.lifeplus.network.api.ParameterMapper;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 
 /**
  * ContentsFlagHelper
@@ -42,10 +43,6 @@ public class ContentsFlagHelper {
   private Disposable disposable;
   private ContentsFlagBean contentsFlagBean;
 
-  public ContentsFlagBean getContentsFlagBean() {
-    return contentsFlagBean;
-  }
-
   public Single<ContentsFlagResultBean> load() {
     Single<ContentsFlagResultBean> single;
     if (null != contentsFlagBean) {
@@ -136,6 +133,7 @@ public class ContentsFlagHelper {
       list = contentsFlagBean.getLikedList();
     }
     list.add(new ItemNumberBean(itemNumber));
+    print();
   }
 
   /**
@@ -150,6 +148,7 @@ public class ContentsFlagHelper {
       list = contentsFlagBean.getBookmarkedList();
     }
     list.add(new ItemNumberBean(itemNumber));
+    print();
   }
 
   /**
@@ -167,6 +166,7 @@ public class ContentsFlagHelper {
         }
       }
     }
+    print();
   }
 
   /**
@@ -184,5 +184,12 @@ public class ContentsFlagHelper {
         }
       }
     }
+    print();
+  }
+
+  private void print() {
+    if (AppUtil.isDebug()) {
+      Log.w("APP# ContentsFlagHelper | print", "| lists: \n" + contentsFlagBean.toPrettyJson());
+    }
   }
 }