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

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

@@ -5,6 +5,7 @@ import android.os.Handler;
 import android.support.v4.app.FragmentManager;
 
 import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.dialog.CoinSavingDialog;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogBuilder;
 import kr.co.zumo.app.lifeplus.view.dialog.DialogID;
@@ -21,14 +22,15 @@ import kr.co.zumo.app.lifeplus.view.dialog.ICustomDialogListener;
  * @history 하세미   [2019-01-14]   [최초 작성]
  * @since 2019-01-14
  */
-public class CoinSavingPopup {
+public class CoinPopupDriver {
 
   private FragmentManager fragmentManager;
   private CoinSavingDialog dialog;
+  private IEventListener listener;
 
-  public CoinSavingPopup(FragmentManager fragmentManager) {
-
+  public CoinPopupDriver(FragmentManager fragmentManager, IEventListener listener) {
     this.fragmentManager = fragmentManager;
+    this.listener = listener;
   }
 
   public void show() {
@@ -55,6 +57,7 @@ public class CoinSavingPopup {
       @Override
       public void run() {
         dialog.dispose();
+        listener.onEvent(new Event.Builder(Event.EXIT).build());
       }
     }, 2000);
   }

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

@@ -51,13 +51,13 @@ public class CustomIndicator extends View {
   private final Paint mPaint = new Paint();
 
   public void setIndicatorSetting(RecyclerView recyclerview, int inActiveColor, int activeColor, int bottomOffset) {
-      this.recyclerView = recyclerview;
-      this.inActiveColor = inActiveColor;
-      this.activeColor = activeColor;
-      this.bottomOffset = bottomOffset;
-      mPaint.setStrokeCap(Paint.Cap.ROUND);
-      mPaint.setStrokeWidth(mIndicatorStrokeWidth);
-      mPaint.setStyle(Paint.Style.FILL);
+    this.recyclerView = recyclerview;
+    this.inActiveColor = inActiveColor;
+    this.activeColor = activeColor;
+    this.bottomOffset = bottomOffset;
+    mPaint.setStrokeCap(Paint.Cap.ROUND);
+    mPaint.setStrokeWidth(mIndicatorStrokeWidth);
+    mPaint.setStyle(Paint.Style.FILL);
   }
 
   public void onChangedIndex(int firstVisibleItemPosition) {
@@ -92,7 +92,7 @@ public class CustomIndicator extends View {
     for (int i = 0; i < itemCount; i++) {
       // itemCount 1은 안띄움
       if (itemCount != 1) {
-        c.drawCircle(start, indicatorPosY, mIndicatorItemLength / 2, mPaint);
+        c.drawCircle(start, indicatorPosY, DP * 3, mPaint);
         start += itemWidth;
       }
     }
@@ -102,12 +102,12 @@ public class CustomIndicator extends View {
                               int highlightPosition, int itemCount) {
     mPaint.setColor(context.getResources().getColor(activeColor));
 
-    final float itemWidth = mIndicatorItemLength  + mIndicatorItemPadding;
+    final float itemWidth = mIndicatorItemLength + mIndicatorItemPadding;
 
     float start = indicatorStartX;
     for (int i = 0; i < itemCount; i++) {
       if (itemCount != 1 && i == highlightPosition) {
-        canvas.drawCircle(start, indicatorPosY, mIndicatorItemLength /2, mPaint);
+        canvas.drawCircle(start, indicatorPosY, DP * 3, mPaint);
       }
       start += itemWidth;
     }

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

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
+import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
@@ -25,6 +26,7 @@ public class EventViewHolder extends RecyclerView.ViewHolder {
   private TextView textViewEventDate;
   private TextView textViewEventTitle;
   private TextView textViewEventPresent;
+  private ConstraintLayout layoutFlag;
 
 
   public EventViewHolder(View itemView) {
@@ -33,6 +35,7 @@ public class EventViewHolder extends RecyclerView.ViewHolder {
     textViewEventDate = itemView.findViewById(R.id.text_view_event_date);
     textViewEventTitle = itemView.findViewById(R.id.text_view_event_title);
     textViewEventPresent = itemView.findViewById(R.id.text_view_event_present);
+    layoutFlag = itemView.findViewById(R.id.layout_flag);
   }
 
   public void init(IEventListener listener) {
@@ -40,7 +43,7 @@ public class EventViewHolder extends RecyclerView.ViewHolder {
     textViewEventDate.setText("2018.07.15 ~ 2018.07.22");
     textViewEventTitle.setText("샤갈 러브 앤 라이프\n전시회 티켓 증정");
     textViewEventPresent.setText("샤갈展 초대권 1인 2매 증정");
-
+    layoutFlag.setVisibility(View.GONE);
     imageViewThumbnail.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.CLICK).index(getAdapterPosition()).build());});
   }
 }