[이벤트][Common] 이벤트 프레그로스바 처리

app/src/main/java/kr/co/zumo/app/lifeplus/helper/ActionBarHelper.java

@@ -221,6 +221,16 @@ public class ActionBarHelper extends Helper {
     navigationBar.setVisibleBookmark(isVisible);
   }
 
+  /**
+   * progress bar 보이기/안보이기
+   *
+   * @param isVisible
+   */
+  public void setProgressVisible(boolean isVisible) {
+    setViewVisible(progressBar, isVisible);
+  }
+
+
   public void animate() {
     toolbar.setTranslationY(-ResourceUtil.getDimension(R.dimen.action_bar_height_with_extra_space));
 
@@ -291,14 +301,6 @@ public class ActionBarHelper extends Helper {
     }
   }
 
-  /**
-   * progress bar 보이기/안보이기
-   *
-   * @param isVisible
-   */
-  private void setProgressVisible(boolean isVisible) {
-    setViewVisible(progressBar, isVisible);
-  }
 
   void set(ActionBarBuilder newBuilder) {
     // navigation bar setting

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

@@ -54,7 +54,7 @@ public class EventDetailAdapter extends RecyclerView.Adapter<EventDetailView> {
     switch (viewType) {
       case TYPE_EVENT_COVER:
         view = inflater.inflate(R.layout.event_enter_type_cover, parent, false);
-        return new EventEnterCoverHolder(view);
+        return new EventDetailCoverHolder(view);
       case TYPE_EVENT_ENTER_CONTENTS:
         view = inflater.inflate(R.layout.event_enter_type_detail, parent, false);
         return new EventEnterContentsHolder(view);

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

@@ -17,7 +17,7 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  * @history 하세미   [2019-01-04]   [최초 작성]
  * @since 2019-01-04
  */
-public class EventEnterCoverHolder extends EventDetailView {
+public class EventDetailCoverHolder extends EventDetailView {
 
   private ImageView imageViewCoverImage; //표지이미지
   private TextView textViewEventFlag; //이벤트 상태값 플래그
@@ -28,7 +28,7 @@ public class EventEnterCoverHolder extends EventDetailView {
   private TextView tag2;
   private TextView tag3;
 
-  public EventEnterCoverHolder(View itemView) {
+  public EventDetailCoverHolder(View itemView) {
     super(itemView);
     imageViewCoverImage = itemView.findViewById(R.id.image_view_background);
     textViewEventFlag = itemView.findViewById(R.id.text_view_flag);
@@ -50,5 +50,6 @@ public class EventEnterCoverHolder extends EventDetailView {
     tag1.setText("#인생샷");
     tag2.setText("#힐링");
     tag3.setText("");
+   // listener.onEvent(new Event.Builder(Event.START).build());
   }
 }

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

@@ -53,7 +53,8 @@ public class EventDetailFragment extends FragmentBase<EventDetailPresenter> impl
 
   @Override
   protected void defineActionBar(ActionBarHelper actionBarHelper) {
-    actionBarHelper.begin().progress()
+    actionBarHelper.begin()
+      // .progress()
       .back(actionBar -> presenter.onNavigationClickBack(actionBar))
       .like(actionBar -> presenter.onNavigationClickLike(actionBar))
       .share(actionBar -> presenter.onNavigationClickShare(actionBar))
@@ -152,8 +153,4 @@ public class EventDetailFragment extends FragmentBase<EventDetailPresenter> impl
     Log.e("APP#  EventDetailFragment | setScrollEnabled", "|" + isScrollEnabled);
   }
 
-  @Override
-  public void setProgressVisible(boolean isProgressVisible) {
-
-  }
 }

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

@@ -103,6 +103,9 @@ public class EventDetailPresenter extends Presenter<EventDetailModel, IEventDeta
       case Event.RECOMMEND:
         view.setScrollToPosition(event.getIndex() + 1);
         break;
+//      case Event.START:
+//        getHelper(ActionBarHelper.class).setProgressVisible(false);
+//        break;
       case Event.DETAIL:
         showEventNoticeDialog();
         break;
@@ -218,21 +221,25 @@ public class EventDetailPresenter extends Presenter<EventDetailModel, IEventDeta
         view.setPageNumber(index + " / 5"); // TODO: 마지막 페이지에서 페이지번호는 뜨지 않는다
       }
     }
-    else if (model.getEventDetailType() == 1) {//복합형(투표)시 스크롤 제어 해야됨
+    else if (model.getEventDetailType() == 1) {
       view.hidePageNumberArea();
-      view.setScrollEnabled(index == 0);
+      //view.setScrollEnabled(index == 0);
     }
     else { //복합형(글자형) 임시 지정
       view.hidePageNumberArea();
-      if (index == 0) {
-
-      }
-      else if (index == 1) {
-        getHelper(ActionBarHelper.class).setProgress(20); // 360/360
+      if (index == 1) {
+        setProgressVisible(true);
+        setProgress(20);
 
       }
       else if (index == 2) {
-        getHelper(ActionBarHelper.class).setProgress(40);
+        setProgress(40);
+      }
+      else if (index == 4) {
+        setProgressVisible(false);
+      }
+      else {
+        setProgress(100);
       }
     }
   }
@@ -242,4 +249,12 @@ public class EventDetailPresenter extends Presenter<EventDetailModel, IEventDeta
     super.onNavigationClickClose(navigationBar);
   }
 
+  private void setProgress(int percent) {
+    getHelper(ActionBarHelper.class).setProgress(percent);
+  }
+
+  private void setProgressVisible(boolean isProgressVisible) {
+    getHelper(ActionBarHelper.class).setProgressVisible(isProgressVisible);
+  }
+
 }