[이벤트][Common] 이벤트 참여하기 스크롤뷰로 변경 중

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

@@ -2,6 +2,7 @@ package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -11,6 +12,7 @@ import com.bumptech.glide.request.RequestOptions;
 
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.EventBean;
+import kr.co.zumo.app.lifeplus.bean.api.LifeplusData;
 import kr.co.zumo.app.lifeplus.util.Formatter;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -65,6 +67,8 @@ public class EventListViewHolder extends RecyclerView.ViewHolder {
       textViewEventPresent.setText(bean.getSubTitle());
       layoutFlag.setVisibility(View.GONE);
       imageViewThumbnail.setOnClickListener(view -> {listener.onEvent(new Event.Builder(Event.CLICK).index(getAdapterPosition()).build());});
+      layoutFlag.setVisibility(LifeplusData.isTrue(bean.getEntryCompleted()) ? View.GONE : View.VISIBLE);
+      Log.e("APP#  EventListViewHolder | init", "|" + bean.getEntryCompleted());
     }
   }
 

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

@@ -53,14 +53,14 @@ public class EventParticipationAdapter extends RecyclerView.Adapter<EventPartici
         view = inflater.inflate(R.layout.event_participation_item_title, parent, false);
         return new EventParticipationTitleViewHolder(view);
       case TYPE_EMAIL:
-        view = inflater.inflate(R.layout.event_participation_item_email, parent, false);
+        view = inflater.inflate(R.layout.event_participation_item_answer, parent, false);
         return new EventParticipationEmailViewHolder(view);
       case TYPE_NICKNAME:
-        view = inflater.inflate(R.layout.event_participation_item_nickname, parent, false);
+        view = inflater.inflate(R.layout.event_participation_item_single_choice, parent, false);
         return new EventParticipationNicknameViewHolder(view);
-      case TYPE_SCORE:
-        view = inflater.inflate(R.layout.event_participation_item_score, parent, false);
-        return new EventParticipationScoreViewHolder(view);
+//      case TYPE_SCORE:
+//        view = inflater.inflate(R.layout.event_participation_item_score, parent, false);
+//        return new EventParticipationScoreViewHolder(view);
       case TYPE_MULTIPLE_CHOICE:
         view = inflater.inflate(R.layout.event_participation_item_multiple_choice, parent, false);
         return new EventParticipationMultipleChoiceViewHolder(view);

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

@@ -120,6 +120,12 @@ public class EventParticipationFragment extends FragmentBase<EventParticipationP
     startActivity(intent);
   }
 
+  @Override
+  public void drawList() {
+
+  }
+
+
   @Override
   public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
     switch (requestCode) {

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

@@ -28,7 +28,6 @@ public class EventParticipationNicknameViewHolder extends EventParticipationView
     super(view);
     radioGroupStore = view.findViewById(R.id.radio_group_store);
     editTextNickName = view.findViewById(R.id.edit_text_nickname);
-    textViewNickNameValidation = view.findViewById(R.id.text_view_nick_name_validation);
   }
 
   @Override

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

@@ -81,7 +81,7 @@ public class EventParticipationPresenter extends Presenter<EventParticipationMod
       case Event.IMAGE: //이미지 가져오기성공
         view.uploadAlbumImage();
         break;
-        case Event.DIALOG: //권한 설정 완전 거부시 다이얼로그 임시
+      case Event.DIALOG: //권한 설정 완전 거부시 다이얼로그 임시
         showPermissionCheckDialog();
         break;
       default:
@@ -91,7 +91,6 @@ public class EventParticipationPresenter extends Presenter<EventParticipationMod
 
   @Override
   public void onScreenReady() {
-
   }
 
   @Override

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

@@ -22,4 +22,6 @@ public interface IEventParticipationView extends IView {
 
   void goSettingPermission();
 
+  void drawList();
+
 }

app/src/main/res/layout/event_participation_item_nickname.xml

@@ -58,36 +58,4 @@
       />
   </RadioGroup>
 
-  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
-    android:id="@+id/edit_text_nickname"
-    android:layout_width="match_parent"
-    android:layout_height="80dp"
-    android:layout_marginTop="6dp"
-    android:background="@drawable/button_underline_background"
-    android:hint="@string/event_participation_nickname_hint"
-    android:inputType="text"
-    android:lineSpacingExtra="6sp"
-    android:maxLines="1"
-    android:paddingStart="5dp"
-    android:paddingBottom="38dp"
-    android:textColorHint="@color/CC5C5C5"
-    android:textSize="14sp"
-    app:layout_constraintTop_toBottomOf="@+id/radio_group_store"/>
-
-  <TextView
-    android:id="@+id/text_view_nick_name_validation"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="54dp"
-    android:layout_marginBottom="8dp"
-    android:lineSpacingExtra="4sp"
-    android:text="@string/event_participation_nickname_validation"
-    android:textColor="@color/C666666"
-    android:textSize="11sp"
-    android:visibility="gone"
-    tools:visibility="visible"
-    app:layout_constraintTop_toBottomOf="@+id/edit_text_nickname"
-    app:layout_constraintTop_toTopOf="@+id/edit_text_nickname"
-    app:layout_constraintVertical_chainStyle="spread_inside"
-    />
 </android.support.constraint.ConstraintLayout>

app/src/main/res/layout/fragment_event_participation.xml

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<android.support.v4.widget.NestedScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <android.support.v7.widget.RecyclerView
-    android:id="@+id/recycler_view_event_participation"
+  <LinearLayout
+    android:id="@+id/layout_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    android:orientation="vertical">
 
-</android.support.constraint.ConstraintLayout>
+    <android.support.v7.widget.RecyclerView
+      android:id="@+id/recycler_view_event_participation"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
+  </LinearLayout>
+</android.support.v4.widget.NestedScrollView>