Browse Source

[공통][Common] 프로모션 팝업 인디케이터 색상 변경요청 반영

Hasemi 6 years ago
parent
commit
72a9cf759f

+ 5 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerView.java

@@ -1,6 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.custom.category.banner;
 
 import android.content.Context;
+import android.support.annotation.ColorRes;
 import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -46,7 +47,9 @@ public class MainBannerView extends ConstraintLayout {
     super(context, attrs, defStyleAttr);
   }
 
-  public void init(Context context, List<? extends IImageTitleBean> textImageBeanList, IEventListener listener, boolean isDimLayerEnabled) {
+  public void init(Context context, List<? extends IImageTitleBean> textImageBeanList,
+                   IEventListener listener, boolean isDimLayerEnabled,
+                   @ColorRes int activeColor, @ColorRes int inActiveColor) {
 
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     view = inflater.inflate(R.layout.main_banner_view, this);
@@ -64,7 +67,7 @@ public class MainBannerView extends ConstraintLayout {
       }
     };
     recyclerView.setLayoutManager(layoutManager);
-    customIndicator.setIndicator(recyclerView, R.color.C4DFFFFFF, R.color.CFFFFFF, event -> {
+    customIndicator.setIndicator(recyclerView, activeColor, inActiveColor, event -> {
       recyclerView.smoothScrollToPosition(event.getIndex());
     });
 

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PromotionDialog.java

@@ -74,6 +74,6 @@ public class PromotionDialog extends DialogBase<ICustomDialogListener<PromotionD
       if (null != getCustomListener()) {
         getCustomListener().onDialogResult(PromotionDialog.this, event);
       }
-    }, false);
+    }, false, R.color.C000000, R.color.C1A000000);
   }
 }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/PromotionFullScreenDialog.java

@@ -49,6 +49,6 @@ public class PromotionFullScreenDialog extends PromotionDialog {
 
     mainBannerView.init(getActivity(), imageBeanList, event -> {
       getCustomListener().onDialogResult(PromotionFullScreenDialog.this, event);
-    }, false);
+    }, false, R.color.CFFFFFF, R.color.C4DFFFFFF);
   }
 }

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/category/CategoryMainBannerViewHolder.java

@@ -37,7 +37,7 @@ public class CategoryMainBannerViewHolder extends CategoryMainViewHolder<Categor
         if (null != listener) {
           listener.onEvent(event);
         }
-      }, true);
+      }, true, R.color.CFFFFFF, R.color.C4DFFFFFF);
     }
 
   }

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

@@ -65,7 +65,7 @@ public class CustomIndicator extends View {
    * @param activeColor
    * @param listener
    */
-  public void setIndicator(RecyclerView recyclerview, int inActiveColor, int activeColor, IEventListener listener) {
+  public void setIndicator(RecyclerView recyclerview,  int activeColor, int inActiveColor, IEventListener listener) {
     this.recyclerView = recyclerview;
     this.inActiveColor = inActiveColor;
     this.activeColor = activeColor;

+ 1 - 1
app/src/main/res/layout/dialog_promotion.xml

@@ -17,7 +17,7 @@
 
     <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView
       android:id="@+id/promotion_banner"
-      android:layout_width="261dp"
+      android:layout_width="262dp"
       android:layout_height="342dp"
       android:background="@color/C999999"
       app:layout_constraintBottom_toBottomOf="parent"

+ 1 - 0
app/src/main/res/values/colors.xml

@@ -21,6 +21,7 @@
   <color name="C66000000">#66000000</color> <!-- 40%-->
   <color name="C99000000">#99000000</color> <!-- 60%-->
   <color name="CF2000000">#F2000000</color> <!-- 95%-->
+  <color name="C1A000000">#1A000000</color> <!-- 95%-->
 
   <color name="C99ebebeb">#99ebebeb</color> <!-- 60%-->