Explorar o código

[이벤트][Common] 이벤트 참여하기 뷰 구현

Hasemi %!s(int64=6) %!d(string=hai) anos
pai
achega
697cf2f437

+ 9 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/EventParticipationCheckbox.java

@@ -4,6 +4,7 @@
 package kr.co.zumo.app.lifeplus.view.custom;
 
 import android.content.Context;
+import android.graphics.drawable.StateListDrawable;
 import android.support.constraint.ConstraintLayout;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -43,9 +44,17 @@ public class EventParticipationCheckbox extends ConstraintLayout {
       inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
       View view = inflater.inflate(R.layout.event_participation_checkbox, this);
       checkBox = view.findViewById(R.id.check_box);
+      //checkBox.setButtonDrawable(getStateListDrawable());
     }
   }
 
+  private StateListDrawable getStateListDrawable() {
+    StateListDrawable stateListDrawable = new StateListDrawable();
+    stateListDrawable.addState(new int[]{android.R.attr.state_checked}, getContext().getResources().getDrawable(R.drawable.ic_checkbox_on));
+    stateListDrawable.addState(new int[]{-android.R.attr.state_checked}, getContext().getResources().getDrawable(R.drawable.ic_checkbox_off));
+    return stateListDrawable;
+  }
+
   public void setText(String text) {
     checkBox.setText(text);
   }

+ 65 - 30
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionAgreeView.java

@@ -1,9 +1,19 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
+import android.content.Context;
+import android.graphics.drawable.StateListDrawable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.CheckBox;
+import android.widget.LinearLayout;
 
-import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
+import java.util.List;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.EventPolicyBean;
+import kr.co.zumo.app.lifeplus.view.CheckBoxAllDriver;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * EventParticipationAgreeViewHolder
@@ -15,37 +25,62 @@ import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventQuestionAgreeView extends EventQuestionView {
+class EventQuestionAgreeView extends RecyclerView.ViewHolder {
 
+  private LinearLayout layoutContainer;
   private CheckBox checkBoxAll;
-  private CheckBox checkBox1;
+  private List<EventPolicyBean> policyBeans;
+  private CheckBox checkBox;
+  private LayoutInflater inflater;
+
+  public EventQuestionAgreeView(View itemView, List<EventPolicyBean> policyBeans) {
+    super(itemView);
+    this.policyBeans = policyBeans;
+    inflater = (LayoutInflater) itemView.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    checkBoxAll = itemView.findViewById(R.id.checkbox_all_agree);
+    layoutContainer = itemView.findViewById(R.id.checkbox_agree_container);
+  }
+
+  public void draw(IEventListener listener) {
+
+    checkBoxAll.setButtonDrawable(getStateListDrawable());
+    CheckBoxAllDriver checkBoxAllDriver = new CheckBoxAllDriver(checkBoxAll);
+
+    // 전체 동의 클릭
+    checkBoxAll.setOnClickListener(v12 -> {
+      boolean b = checkBoxAll.isChecked();
+      checkBoxAllDriver.applyCheckAll(b);
+    });
+//    checkBoxAllAgree.setTypeface(ResourcesCompat.getFont(context, R.font.font_droid_sans));
+
+    // 약관 동의
+    for (int i = 0; i < policyBeans.size(); ++i) {
+      EventPolicyBean bean = policyBeans.get(i);
+      View view = inflater.inflate(R.layout.setting_agree_check, null);
+      CheckBox checkBox = view.findViewById(R.id.agree_check);
+      checkBox.setButtonDrawable(getStateListDrawable());
+      checkBox.setText(bean.getTitle());
 
-  public EventQuestionAgreeView(View itemView, EventQuestionBean bean) {
-    super(itemView, bean);
+      // agree
+      checkBox.setOnClickListener(v -> {
+
+      });
+
+      // detail
+      View button = view.findViewById(R.id.agree_detail_button);
+      button.setOnClickListener(v -> {
+
+      });
+      layoutContainer.addView(view);
+    }
   }
-//
-//  public EventQuestionAgreeViewHolder(View view) {
-//    super(view);
-//    checkBoxAll = view.findViewById(R.id.checkbox_all_agree);
-//    checkBox1 = view.findViewById(R.id.checkbox_agree1);
-//
-//  }
-//
-//  @Override
-//  public void init(IEventListener listener) {
-//    checkBoxAll.setButtonDrawable(getStateListDrawable());
-//    checkBox1.setButtonDrawable(getStateListDrawable());
-//
-//  }
-//
-//  private StateListDrawable getStateListDrawable() {
-//    StateListDrawable stateListDrawable = new StateListDrawable();
-//    stateListDrawable.addState(new int[]{android.R.attr.state_checked}, itemView.getContext().getResources().getDrawable(R.drawable.ic_checkbox_on));
-//    stateListDrawable.addState(new int[]{-android.R.attr.state_checked}, itemView.getContext().getResources().getDrawable(R.drawable.ic_checkbox_off));
-//    return stateListDrawable;
-//  }
-//
-//  @Override
-//  public void setUploadImage(Bitmap image) {
-//  }
+
+  private StateListDrawable getStateListDrawable() {
+    StateListDrawable stateListDrawable = new StateListDrawable();
+    stateListDrawable.addState(new int[]{android.R.attr.state_checked}, itemView.getContext().getResources().getDrawable(R.drawable.ic_checkbox_on));
+    stateListDrawable.addState(new int[]{-android.R.attr.state_checked}, itemView.getContext().getResources().getDrawable(R.drawable.ic_checkbox_off));
+    return stateListDrawable;
+  }
+
+
 }

+ 37 - 15
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionFragment.java

@@ -11,9 +11,9 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,7 +49,7 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
   private Bitmap uploadImage;
   private LinearLayout layoutContainer;
   private LayoutInflater inflater;
-  // private EventParticipationAdapter adapter;
+  private EventQuestionImageView eventQuestionImageView;
   private static final int PERMISSION_CHECK = 0;
 
   @Override
@@ -137,12 +137,8 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
 
 
     for (int i = 0; i < detailBean.getEventQuestionList().size(); ++i) {
-      Log.e("APP#  EventQuestionFragment | drawList", "|" + detailBean.getEventQuestionList().size());
       View questionItemView = null;
       EventQuestionBean eventQuestionBean = detailBean.getEventQuestionList().get(i);
-      Log.e("APP#  EventQuestionFragment | drawList", "|" + eventQuestionBean.getQuestionName());
-      Log.e("APP#  EventQuestionFragment | drawList", "|" + eventQuestionBean.getQuestionType());
-
       if (eventQuestionBean.getQuestionType().equals(EventQuestionBean.QUESTION_TYPE_SINGLE)) {
         questionItemView = inflater.inflate(R.layout.event_participation_item_single_choice, null);
         EventQuestionSingleView eventQuestionSingleView = new EventQuestionSingleView(questionItemView, eventQuestionBean);
@@ -163,6 +159,7 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
             presenter.onEvent(event);
           }
         }, eventQuestionBean);
+        layoutContainer.addView(questionItemView);
 
       }
       else if (eventQuestionBean.getQuestionType().equals(EventQuestionBean.QUESTION_TYPE_ANSWER)) {
@@ -174,19 +171,47 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
             presenter.onEvent(event);
           }
         }, eventQuestionBean);
-
+        layoutContainer.addView(questionItemView);
       }
-      else {
+      else if (eventQuestionBean.getQuestionType().equals(EventQuestionBean.QUESTION_TYPE_IMAGE)) {
         questionItemView = inflater.inflate(R.layout.event_participation_item_image, null);
-        EventQuestionImageView eventQuestionImageView = new EventQuestionImageView(questionItemView, eventQuestionBean);
+        eventQuestionImageView = new EventQuestionImageView(questionItemView, eventQuestionBean);
         eventQuestionImageView.draw(new IEventListener() {
           @Override
           public void onEvent(Event event) {
             presenter.onEvent(event);
           }
         }, eventQuestionBean);
+        layoutContainer.addView(questionItemView);
       }
     }
+
+    //동의 영역
+    View agreeView = inflater.inflate(R.layout.event_participation_item_agree, null);
+    EventQuestionAgreeView eventQuestionAgreeView = new EventQuestionAgreeView(agreeView, detailBean.getEventPolicyList());
+    eventQuestionAgreeView.draw(new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+
+      }
+    });
+    layoutContainer.addView(agreeView);
+
+    //버튼
+    View buttonView = inflater.inflate(R.layout.event_participation_item_button, null);
+    ((ConstraintLayout) buttonView.findViewById(R.id.layout_button)).setOnClickListener(view -> {
+      //참여하기 버튼 클릭함
+      presenter.onEvent(new Event.Builder(Event.CLICK).build());
+    });
+    layoutContainer.addView(buttonView);
+
+
+    //공지사항 영역
+    View noticeView = inflater.inflate(R.layout.event_participation_item_notice, null);
+    EventQuestionNoticeView eventQuestionNoticeView = new EventQuestionNoticeView(noticeView);
+    eventQuestionNoticeView.draw(detailBean);
+    layoutContainer.addView(noticeView);
+
   }
 
 
@@ -212,10 +237,7 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
   @Override
   public void uploadAlbumImage() {
     if (null != uploadImage) {
-      Log.e("APP#  EventParticipationFragment | uploadAlbumImage", "|" + "===>");
-//      EventParticipationView view =
-//        (EventParticipationView) recyclerViewEventParticipation.findViewHolderForAdapterPosition(5);
-//      view.setUploadImage(uploadImage);
+      eventQuestionImageView.setUploadImage(uploadImage);
     }
   }
 
@@ -224,10 +246,10 @@ public class EventQuestionFragment extends FragmentBase<EventQuestionPresenter>
     if (requestCode == GET_ALBUM_PHOTO) {
       try {
         Uri uri = data.getData();
-        Log.e("APP#  EventParticipationFragment | onActivityResult", "|" + uri);
+        //Uri 프리젠터로 보내기
+        //presenter.onEvent(new Event.Builder(Event.IMAGE ).string(uri.toString()).build());
 
         InputStream inputStream = getContext().getContentResolver().openInputStream(data.getData());
-        Log.e("APP#  EventParticipationFragment | onActivityResult", "|" + data.toString());
         uploadImage = BitmapFactory.decodeStream(inputStream);
         inputStream.close();
         presenter.onEvent(new Event.Builder(Event.IMAGE).build());

+ 0 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionImageView.java

@@ -3,7 +3,6 @@ package kr.co.zumo.app.lifeplus.view.screen.event;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.support.constraint.ConstraintLayout;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -54,7 +53,6 @@ public class EventQuestionImageView extends EventQuestionView {
   @Override
   public void setUploadImage(Bitmap image) {
     ++count;
-    Log.e("APP#  EventParticipationImageViewHolder | setUploadImage", "| count" + count);
     LayoutInflater inflater = (LayoutInflater) itemView.getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
     FlowLayout.LayoutParams layoutParams = new FlowLayout.LayoutParams(FlowLayout.LayoutParams.WRAP_CONTENT, FlowLayout.LayoutParams.WRAP_CONTENT);

+ 0 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionMultiView.java

@@ -4,7 +4,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.graphics.Bitmap;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -43,7 +42,6 @@ class EventQuestionMultiView extends EventQuestionView {
     textViewTitle.setText(bean.getQuestionName());
 
     for (int i = 0; i < bean.getEventQuestionItemBeanList().size(); i++) {
-      Log.e("APP#  EventQuestionMultiView | draw", "|" + bean.getEventQuestionItemBeanList().size());
       EventQuestionItemBean itemBean = bean.getEventQuestionItemBeanList().get(i);
       EventParticipationCheckbox checkbox = new EventParticipationCheckbox(itemView.getContext());
       checkbox.setText(itemBean.getQuestionItemName());

+ 17 - 5
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventQuestionNoticeView.java

@@ -1,7 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
-import android.graphics.Bitmap;
+import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 
 /**
  * EventParticipationNoticeViewHolder
@@ -13,11 +17,19 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventQuestionNoticeView extends EventQuestionView {
-  public EventQuestionNoticeView(View view) {super(view);}
+class EventQuestionNoticeView extends RecyclerView.ViewHolder {
+
+  private TextView textViewNoticeTitle;
+  private TextView textViewNoticeContents;
 
-  @Override
-  public void setUploadImage(Bitmap image) {
+  public EventQuestionNoticeView(View itemView) {
+    super(itemView);
+    textViewNoticeTitle = itemView.findViewById(R.id.text_view_notice_title);
+    textViewNoticeContents = itemView.findViewById(R.id.text_view_notice1);
+  }
 
+  public void draw(EventDetailBean bean) {
+    textViewNoticeContents.setText(bean.getNotice());
   }
 }
+

+ 3 - 3
app/src/main/res/layout/event_participation_checkbox.xml

@@ -4,14 +4,14 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
-
   android:layout_height="wrap_content">
+
   <CheckBox
     android:id="@+id/check_box"
-    android:layout_marginTop="4dp"
-    android:layout_marginBottom="4dp"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="4dp"
+    android:layout_marginBottom="4dp"
     android:background="@drawable/custom_rectangle_radio_selector"
     android:button="@null"
     android:drawableLeft="@drawable/custom_check_box"

+ 36 - 34
app/src/main/res/layout/event_participation_item_agree.xml

@@ -5,54 +5,56 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginStart="25dp"
-  android:layout_marginTop="17dp"
-  android:layout_marginEnd="25dp"
-  android:layout_marginBottom="17dp"
+  android:orientation="vertical"
+  android:paddingStart="25dp"
+  android:paddingTop="17dp"
+  android:paddingEnd="25dp"
+  android:paddingBottom="17dp"
   >
 
-  <CheckBox
-    android:id="@+id/checkbox_all_agree"
-    style="@style/CommonCheckBox"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_weight="1"
-    android:text="@string/agree_all"
-    />
-
-  <View
-    android:id="@+id/view"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:layout_marginTop="20dp"
-    android:background="@color/CEBEBEB"
-    app:layout_constraintTop_toBottomOf="@+id/checkbox_all_agree"/>
-
   <LinearLayout
-    android:id="@+id/check_layout"
+    android:id="@+id/layout_all_agree"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="21dp"
     android:orientation="horizontal"
-    app:layout_constraintTop_toBottomOf="@+id/view"
     >
 
     <CheckBox
-      android:id="@+id/checkbox_agree1"
+      android:id="@+id/checkbox_all_agree"
       style="@style/CommonCheckBox"
-      android:layout_width="0dp"
+      android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="1"
-      android:text="@string/phone_identify_agree4"
+      android:text="@string/phone_identify_all_agree"
       />
 
-    <ImageView
-      android:id="@+id/button_identify_agree1"
-      android:layout_width="19dp"
-      android:layout_height="19dp"
-      android:layout_gravity="center_vertical"
-      android:padding="4dp"
-      app:srcCompat="@drawable/icon_detail_arrow"/>
+  </LinearLayout>
+
+  <LinearLayout
+    android:id="@+id/view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:layout_constraintTop_toBottomOf="@+id/layout_all_agree">
+
+    <View
+      android:id="@+id/checkbox_all_agree_bar"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="20dp"
+      android:layout_marginBottom="20dp"
+      android:background="@color/CEBEBEB"/>
+
+  </LinearLayout>
+
+  <LinearLayout
+    android:id="@+id/checkbox_agree_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:layout_constraintTop_toBottomOf="@+id/view">
+
+
   </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>

+ 13 - 14
app/src/main/res/layout/event_participation_item_answer.xml

@@ -5,52 +5,51 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginTop="36dp"
-  android:layout_marginStart="25dp"
-  android:layout_marginEnd="25dp">
+  android:paddingStart="25dp"
+  android:paddingTop="19dp"
+  android:paddingEnd="25dp"
+  >
 
   <TextView
     android:id="@+id/text_view_question"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="23dp"
     android:lineSpacingExtra="3.5sp"
-    tools:text="@string/event_participation_email"
     android:textColor="@color/C999999"
     android:textSize="12sp"
-    app:layout_constraintStart_toStartOf="parent"/>
+    app:layout_constraintStart_toStartOf="parent"
+    tools:text="@string/event_participation_email"/>
 
 
   <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_email"
     android:layout_width="match_parent"
-    android:layout_height="80dp"
+    android:layout_height="66dp"
     android:layout_marginTop="2dp"
     android:background="@drawable/button_underline_background"
-    tools:hint="@string/event_participation_email_hint"
-    android:lineSpacingExtra="6sp"
     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/text_view_question"/>
+    app:layout_constraintTop_toBottomOf="@+id/text_view_question"
+    tools:hint="@string/event_participation_email_hint"/>
 
   <TextView
     android:id="@+id/text_recommend_validation"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="54dp"
-    android:layout_marginBottom="8dp"
+    android:layout_marginTop="37dp"
     android:lineSpacingExtra="4sp"
-    tools:text="@string/event_participation_email_validation"
     android:textColor="@color/C666666"
     android:textSize="11sp"
     android:visibility="gone"
-    tools:visibility="visible"
     app:layout_constraintStart_toStartOf="@+id/edit_text_email"
     app:layout_constraintTop_toBottomOf="@+id/text_view_question"
     app:layout_constraintVertical_chainStyle="spread_inside"
+    tools:text="@string/event_participation_email_validation"
+    tools:visibility="visible"
     />
 </android.support.constraint.ConstraintLayout>

+ 3 - 2
app/src/main/res/layout/event_participation_item_button.xml

@@ -5,8 +5,9 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginTop="17dp"
-  android:layout_marginBottom="17dp">
+  android:paddingTop="19dp"
+  android:paddingBottom="19dp"
+  >
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_button"

+ 4 - 3
app/src/main/res/layout/event_participation_item_image.xml

@@ -5,9 +5,10 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginStart="20dp"
-  android:layout_marginEnd="20dp"
-  android:layout_marginBottom="17dp">
+  android:paddingStart="25dp"
+  android:paddingEnd="25dp"
+  android:paddingTop="19dp"
+  android:paddingBottom="19dp">
 
   <TextView
     android:id="@+id/text_view_image"

+ 3 - 3
app/src/main/res/layout/event_participation_item_multiple_choice.xml

@@ -5,6 +5,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:paddingTop="19dp"
+  android:paddingBottom="15dp"
   >
 
   <TextView
@@ -18,7 +20,6 @@
     android:textColor="@color/C666666"
     android:textSize="12sp"
     app:layout_constraintBottom_toTopOf="@+id/choice_view"
-    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="Lifeplus 설치하게 된 경로를 선택해주세요."
@@ -32,10 +33,9 @@
     android:layout_marginTop="15dp"
     android:layout_marginEnd="25dp"
     android:orientation="vertical"
-    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_title"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
     tools:background="@color/C666666">
   </LinearLayout>
 

+ 42 - 42
app/src/main/res/layout/event_participation_item_notice.xml

@@ -3,54 +3,54 @@
   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_marginTop="17dp"
-  android:layout_marginBottom="17dp"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:layout_marginStart="25dp"
-  android:layout_marginEnd="25dp"
-  android:background="@color/CF8F8F8"
+  android:paddingTop="17dp"
+  android:paddingBottom="25dp"
+
   >
 
-  <TextView
-    android:id="@+id/text_view_notice_title"
-    android:layout_width="wrap_content"
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="18dp"
-    android:layout_marginTop="21dp"
-    android:lineSpacingExtra="4sp"
-    android:text="@string/go_confirm2"
-    android:textColor="@color/C000000"
-    android:textSize="12sp"
-    android:textStyle="bold"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    android:layout_marginStart="25dp"
+    android:layout_marginEnd="25dp"
+    android:background="@color/CF8F8F8"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
 
-  <View
-    android:id="@+id/view_notice1"
-    android:layout_width="1dp"
-    android:layout_height="1dp"
-    android:layout_marginStart="18dp"
-    android:layout_marginTop="6dp"
-    android:background="@color/C999999"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="@+id/text_view_notice1"/>
+    <TextView
+      android:id="@+id/text_view_notice_title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="18dp"
+      android:layout_marginTop="21dp"
+      android:lineSpacingExtra="4sp"
+      android:text="@string/go_confirm2"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      android:textStyle="bold"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"/>
 
-  <TextView
-    android:id="@+id/text_view_notice1"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="5dp"
-    android:layout_marginTop="7dp"
-    android:lineSpacingExtra="4sp"
-    android:text="해당 이벤트는 ID당 1회에 한해 참여 가능합니다."
-    android:textColor="@color/C999999"
-    android:textSize="12sp"
-    app:layout_constraintBottom_toBottomOf="parent"
-    android:layout_marginBottom="21dp"
-    app:layout_constraintStart_toEndOf="@+id/view_notice1"
-    app:layout_constraintTop_toBottomOf="@+id/text_view_notice_title"
-    />
 
+    <TextView
+      android:id="@+id/text_view_notice1"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="7dp"
+      android:layout_marginEnd="25dp"
+      android:layout_marginBottom="21dp"
+      android:lineSpacingExtra="4sp"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      app:layout_constrainedWidth="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_notice_title"
+      tools:text="OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO"
+      />
+  </android.support.constraint.ConstraintLayout>
 </android.support.constraint.ConstraintLayout>

+ 8 - 4
app/src/main/res/layout/event_participation_item_single_choice.xml

@@ -5,18 +5,20 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
->
+  android:paddingTop="19dp"
+  android:paddingBottom="19dp"
+  >
 
   <TextView
     android:id="@+id/text_view_question"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:lineSpacingExtra="4sp"
-    tools:text="@string/event_participation_nickname"
+    android:paddingStart="25dp"
+    android:paddingEnd="25dp"
     android:textColor="@color/C999999"
     android:textSize="12sp"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
+    tools:text="@string/event_participation_nickname"
     />
 
   <LinearLayout
@@ -25,6 +27,8 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="15dp"
     android:orientation="horizontal"
+    android:paddingStart="12dp"
+    android:paddingEnd="12dp"
     app:layout_constraintTop_toBottomOf="@+id/text_view_question">
 
   </LinearLayout>

+ 3 - 2
app/src/main/res/layout/event_single_answer_check.xml

@@ -9,7 +9,7 @@
   <CheckBox
     android:id="@+id/radio_button_answer"
     style="@style/CommonCheckBox"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="13dp"
     android:layout_marginEnd="13dp"
@@ -21,6 +21,7 @@
     android:textSize="14sp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="@string/app_store"
+    tools:text="텍스트 영역의 텍스트 길이가 2줄 Full 케이스일
+경우 사용됨"
     />
 </android.support.constraint.ConstraintLayout>