Quellcode durchsuchen

[이벤트][New] 액션바 컬러 변경 시 변동 사항만 반영

hyodong.min vor 6 Jahren
Ursprung
Commit
2801a0d6f0

+ 9 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -272,6 +272,15 @@ public class ActionBarHelper extends Helper {
     navigationBar.setBlack();
   }
 
+  /**
+   * 흰색 컬러인지 확인
+   *
+   * @return
+   */
+  public boolean isWhite() {
+    return navigationBar.isWhite();
+  }
+
   /***********************************
    * private
    ***********************************/

+ 35 - 23
app/src/main/java/kr/co/zumo/app/lifeplus/helper/NavigationBar.java

@@ -64,6 +64,7 @@ public class NavigationBar {
   private HashMap<View, INavigationBarListener> clickListenerMap;
 
   private Builder builder;
+  private boolean isWhite;
 
   private NavigationBar(Context context) {
 
@@ -377,7 +378,7 @@ public class NavigationBar {
       buttonArrow.setImageResource(R.drawable.icon_header_up);
     }
     isArrowOpened = !isArrowOpened;
-    setWhiteUi(buttonArrow.getDrawable(), builder.isWhite);
+    setWhiteDrawable(buttonArrow.getDrawable(), builder.isWhite);
   }
 
   private void setWhiteUi(boolean isWhite) {
@@ -390,24 +391,26 @@ public class NavigationBar {
     }
     actionBarTitle.setTextColor(color);
     textButton.setTextColor(color);
-    setWhiteUi(imageBi.getDrawable(), isWhite);
-    setWhiteUi(buttonBack.getDrawable(), isWhite);
-    setWhiteUi(buttonSearch.getDrawable(), isWhite);
-    setWhiteUi(buttonMenu.getDrawable(), isWhite);
-    setWhiteUi(buttonArrow.getDrawable(), isWhite);
-    setWhiteUi(buttonHome.getDrawable(), isWhite);
-    setWhiteUi(buttonNotification.getDrawable(), isWhite);
-    setWhiteUi(buttonSetting.getDrawable(), isWhite);
-    setWhiteUi(buttonClose.getDrawable(), isWhite);
-    setWhiteUi(buttonTrash.getDrawable(), isWhite);
-    setWhiteUi(buttonConfirm.getDrawable(), isWhite);
-    setWhiteUi(buttonShare.getDrawable(), isWhite);
-    setWhiteUi(buttonLike.getDrawable(), isWhite);
-    setWhiteUi(buttonBookmark.getDrawable(), isWhite);
-  }
-
-  private void setWhiteUi(Drawable drawable, boolean isWhite) {
-    if(drawable instanceof AnimationDrawable) {
+    setWhiteDrawable(imageBi.getDrawable(), isWhite);
+    setWhiteDrawable(buttonBack.getDrawable(), isWhite);
+    setWhiteDrawable(buttonSearch.getDrawable(), isWhite);
+    setWhiteDrawable(buttonMenu.getDrawable(), isWhite);
+    setWhiteDrawable(buttonArrow.getDrawable(), isWhite);
+    setWhiteDrawable(buttonHome.getDrawable(), isWhite);
+    setWhiteDrawable(buttonNotification.getDrawable(), isWhite);
+    setWhiteDrawable(buttonSetting.getDrawable(), isWhite);
+    setWhiteDrawable(buttonClose.getDrawable(), isWhite);
+    setWhiteDrawable(buttonTrash.getDrawable(), isWhite);
+    setWhiteDrawable(buttonConfirm.getDrawable(), isWhite);
+    setWhiteDrawable(buttonShare.getDrawable(), isWhite);
+    setWhiteDrawable(buttonLike.getDrawable(), isWhite);
+    setWhiteDrawable(buttonBookmark.getDrawable(), isWhite);
+
+    this.isWhite = isWhite;
+  }
+
+  private void setWhiteDrawable(Drawable drawable, boolean isWhite) {
+    if (drawable instanceof AnimationDrawable) {
       // animation 적용된 drawable 은 컬러 변경 제외
       return;
     }
@@ -487,7 +490,7 @@ public class NavigationBar {
     }
     else {
       buttonConfirm.setImageResource(R.drawable.ic_icon_bucket_complete_default);
-      setWhiteUi(buttonConfirm.getDrawable(), builder.isWhite);
+      setWhiteDrawable(buttonConfirm.getDrawable(), builder.isWhite);
     }
   }
 
@@ -508,7 +511,7 @@ public class NavigationBar {
     }
     else {
       buttonLike.setImageResource(R.drawable.icon_header_like_wh_off);
-      setWhiteUi(buttonLike.getDrawable(), builder.isWhite);
+      setWhiteDrawable(buttonLike.getDrawable(), builder.isWhite);
     }
   }
 
@@ -533,7 +536,7 @@ public class NavigationBar {
     }
     else {
       buttonBookmark.setImageResource(R.drawable.icon_header_bookmark_wh_off);
-      setWhiteUi(buttonBookmark.getDrawable(), builder.isWhite);
+      setWhiteDrawable(buttonBookmark.getDrawable(), builder.isWhite);
     }
   }
 
@@ -555,7 +558,7 @@ public class NavigationBar {
     }
     else {
       buttonNotification.setImageResource(R.drawable.icon_header_notice);
-      setWhiteUi(buttonNotification.getDrawable(), builder.isWhite);
+      setWhiteDrawable(buttonNotification.getDrawable(), builder.isWhite);
     }
   }
 
@@ -616,6 +619,15 @@ public class NavigationBar {
     setWhiteUi(false);
   }
 
+  /**
+   * 흰색 컬러인지 확인
+   *
+   * @return
+   */
+  public boolean isWhite() {
+    return isWhite;
+  }
+
   /***********************************
    * Builder
    ***********************************/

+ 3 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/select/EventDetailSelectFragment.java

@@ -128,7 +128,9 @@ public class EventDetailSelectFragment extends EventDetailBaseFragment<EventDeta
 
   @Override
   public void setBlackActionBar() {
-    actionBarHelper.setBlack();
+    if (actionBarHelper.isWhite()) {
+      actionBarHelper.setBlack();
+    }
   }
 
   @Override