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

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/DialogBase.java

@@ -10,6 +10,8 @@ import android.util.Log;
 import android.view.WindowManager;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 
 /**
  * DialogBase
@@ -36,7 +38,11 @@ public abstract class DialogBase<CL extends ICustomDialogCancelListener> extends
   @Override
   public final void onActivityCreated(Bundle savedInstanceState) {
     super.onActivityCreated(savedInstanceState);
-
+    if (AppUtil.hasNavBar()) {
+      if (null != getView()) {
+        getView().setPadding(getView().getPaddingLeft(), getView().getPaddingTop(), getView().getPaddingRight(), getView().getPaddingBottom() + ResourceUtil.getNavBarHeightValue());
+      }
+    }
     onActivityCreatedInternal();
   }
 

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

@@ -50,6 +50,5 @@ public class EventDetailCoverHolder 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/EventDetailPresenter.java

@@ -73,6 +73,7 @@ public class EventDetailPresenter extends Presenter<EventDetailModel, IEventDeta
 
   @Override
   public boolean onBackPressedInternal() {
+    setProgressVisible(false);
     back(ScreenID.EVENT);
     return true;
   }
@@ -99,9 +100,6 @@ 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;
@@ -195,19 +193,25 @@ public class EventDetailPresenter extends Presenter<EventDetailModel, IEventDeta
       //view.setScrollEnabled(index == 0);
     }
     else { //복합형(글자형) 임시 지정
+
       view.hidePageNumberArea();
-      if (index == 1) {
+      if (index == 0) {
+        setProgressVisible(false);
+      }
+      else if (index == 1) {
         setProgressVisible(true);
         setProgress(20);
 
       }
       else if (index == 2) {
+        setProgressVisible(true);
         setProgress(40);
       }
       else if (index == 4) {
         setProgressVisible(false);
       }
       else {
+        setProgressVisible(true);
         setProgress(100);
       }
     }

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

@@ -26,19 +26,16 @@ public class EventParticipationAdapter extends RecyclerView.Adapter<EventPartici
   private IEventListener listener;
   private LayoutInflater inflater;
 
-  private static final int LIST_COUNT = 11;
+  private static final int LIST_COUNT = 8;
 
   private static final int TYPE_TITLE = 0;
-  private static final int TYPE_EMAIL = 1;
-  private static final int TYPE_NAME = 2;
-  private static final int TYPE_PHONE = 3;
-  private static final int TYPE_ADDRESS = 4;
-  private static final int TYPE_NICKNAME = 5;
-  private static final int TYPE_SCORE = 6;
-  private static final int TYPE_IMAGE = 7;
-  private static final int TYPE_AGREE = 8;
-  private static final int TYPE_BUTTON = 9;
-  private static final int TYPE_NOTICE = 10;
+  private static final int TYPE_NICKNAME = 1;
+  private static final int TYPE_EMAIL = 2;
+  private static final int TYPE_SCORE = 3;
+  private static final int TYPE_IMAGE = 4;
+  private static final int TYPE_AGREE = 5;
+  private static final int TYPE_BUTTON = 6;
+  private static final int TYPE_NOTICE = 7;
 
   public EventParticipationAdapter(Context context, IEventListener listener) {
     this.context = context;
@@ -57,15 +54,6 @@ public class EventParticipationAdapter extends RecyclerView.Adapter<EventPartici
       case TYPE_EMAIL:
         view = inflater.inflate(R.layout.event_participation_item_email, parent, false);
         return new EventParticipationEmailViewHolder(view);
-      case TYPE_NAME:
-        view = inflater.inflate(R.layout.event_participation_item_name, parent, false);
-        return new EventParticipationNameViewHolder(view);
-      case TYPE_PHONE:
-        view = inflater.inflate(R.layout.event_participation_item_phone, parent, false);
-        return new EventParticipationPhoneViewHolder(view);
-      case TYPE_ADDRESS:
-        view = inflater.inflate(R.layout.event_participation_item_address, parent, false);
-        return new EventParticipationAddressViewHolder(view);
       case TYPE_NICKNAME:
         view = inflater.inflate(R.layout.event_participation_item_nickname, parent, false);
         return new EventParticipationNicknameViewHolder(view);
@@ -108,20 +96,14 @@ public class EventParticipationAdapter extends RecyclerView.Adapter<EventPartici
       case 1:
         return TYPE_EMAIL;
       case 2:
-        return TYPE_NAME;
-      case 3:
-        return TYPE_PHONE;
-      case 4:
-        return TYPE_ADDRESS;
-      case 5:
         return TYPE_NICKNAME;
-      case 6:
+      case 3:
         return TYPE_SCORE;
-      case 7:
+      case 4:
         return TYPE_IMAGE;
-      case 8:
+      case 5:
         return TYPE_AGREE;
-      case 9:
+      case 6:
         return TYPE_BUTTON;
       default:
         return TYPE_NOTICE;