Преглед изворни кода

[이벤트][Common] 이벤트 참여하기 화면 홀더 정리

Hasemi пре 7 година
родитељ
комит
108886d102
23 измењених фајлова са 276 додато и 61 уклоњено
  1. 2 1
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationAddressViewHolder.java
  2. 12 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationButtonViewHolder.java
  3. 21 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationEmailViewHolder.java
  4. 11 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationImageViewHolder.java
  5. 20 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationNameViewHolder.java
  6. 17 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationNicknameViewHolder.java
  7. 25 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationPhoneViewHolder.java
  8. 10 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationPresenter.java
  9. 16 2
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationScoreViewHolder.java
  10. 6 0
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/EventParticipationView.java
  11. 0 1
      app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/IEventParticipationView.java
  12. 7 0
      app/src/main/res/drawable/icon_image_delete.xml
  13. 6 4
      app/src/main/res/layout/event_participation_item_address.xml
  14. 35 6
      app/src/main/res/layout/event_participation_item_agree.xml
  15. 12 9
      app/src/main/res/layout/event_participation_item_button.xml
  16. 4 1
      app/src/main/res/layout/event_participation_item_email.xml
  17. 1 0
      app/src/main/res/layout/event_participation_item_image.xml
  18. 6 5
      app/src/main/res/layout/event_participation_item_name.xml
  19. 3 1
      app/src/main/res/layout/event_participation_item_nickname.xml
  20. 37 2
      app/src/main/res/layout/event_participation_item_notice.xml
  21. 19 11
      app/src/main/res/layout/event_participation_item_phone.xml
  22. 5 4
      app/src/main/res/layout/event_participation_item_score.xml
  23. 1 0
      app/src/main/res/values/strings.xml

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

@@ -12,6 +12,7 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationAddressViewHolder extends EventParticipationView {
+public class EventParticipationAddressViewHolder extends EventParticipationView {
+
   public EventParticipationAddressViewHolder(View view) {super(view);}
 }

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

@@ -1,7 +1,10 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 
+import kr.co.zumo.app.R;
+
 /**
  * EventParticipationButtonViewHolder
  * <pre>
@@ -12,6 +15,13 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationButtonViewHolder extends EventParticipationView {
-  public EventParticipationButtonViewHolder(View view) {super(view);}
+public class EventParticipationButtonViewHolder extends EventParticipationView {
+
+  private ConstraintLayout layoutButton;
+
+  public EventParticipationButtonViewHolder(View view) {
+    super(view);
+    layoutButton = view.findViewById(R.id.layout_button);
+  }
+
 }

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

@@ -1,6 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
 
 /**
  * EventParticipationEmailViewHolder
@@ -12,6 +17,20 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationEmailViewHolder extends EventParticipationView {
-  public EventParticipationEmailViewHolder(View view) {super(view);}
+public class EventParticipationEmailViewHolder extends EventParticipationView {
+
+  private ClearEditText editTextEmail;
+  private TextView textViewValidation;
+
+  public EventParticipationEmailViewHolder(View view) {
+    super(view);
+    editTextEmail = view.findViewById(R.id.edit_text_email);
+    textViewValidation = view.findViewById(R.id.text_recommend_validation);
+
+  }
+
+  @Override
+  public void init(IEventListener listener) {
+    super.init(listener);
+  }
 }

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

@@ -1,7 +1,10 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
+import android.support.constraint.ConstraintLayout;
 import android.view.View;
 
+import kr.co.zumo.app.R;
+
 /**
  * EventParticipationImageViewHolder
  * <pre>
@@ -12,6 +15,12 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationImageViewHolder extends EventParticipationView {
-  public EventParticipationImageViewHolder(View view) {super(view);}
+public class EventParticipationImageViewHolder extends EventParticipationView {
+
+  private ConstraintLayout layoutCamera;
+
+  public EventParticipationImageViewHolder(View view) {
+    super(view);
+    layoutCamera = view.findViewById(R.id.layout_camera);
+  }
 }

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

@@ -1,6 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
 
 /**
  * EventParticipationNameViewHolder
@@ -12,6 +17,19 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationNameViewHolder extends EventParticipationView {
-  public EventParticipationNameViewHolder(View itemView) {super(itemView);}
+public class EventParticipationNameViewHolder extends EventParticipationView {
+
+  private ClearEditText editTextName;
+  private TextView textViewNameValidation;
+
+  public EventParticipationNameViewHolder(View itemView) {
+    super(itemView);
+    editTextName = itemView.findViewById(R.id.edit_text_name);
+    textViewNameValidation = itemView.findViewById(R.id.text_name_validation);
+  }
+
+  @Override
+  public void init(IEventListener listener) {
+    super.init(listener);
+  }
 }

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

@@ -1,6 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.RadioGroup;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
 
 /**
  * EventParticipationNicknameViewHolder
@@ -12,6 +17,16 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationNicknameViewHolder extends EventParticipationView {
-  public EventParticipationNicknameViewHolder(View view) {super(view);}
+public class EventParticipationNicknameViewHolder extends EventParticipationView {
+
+  private RadioGroup radioGroupStore;
+  private ClearEditText editTextNickName;
+  private TextView textViewNickNameValidation;
+
+  public EventParticipationNicknameViewHolder(View view) {
+    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);
+  }
 }

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

@@ -1,6 +1,12 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
+import kr.co.zumo.app.lifeplus.view.custom.CustomSpinner;
 
 /**
  * EventParticipationPhoneViewHolder
@@ -12,6 +18,23 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationPhoneViewHolder extends EventParticipationView {
-  public EventParticipationPhoneViewHolder(View view) {super(view);}
+public class EventParticipationPhoneViewHolder extends EventParticipationView {
+
+  private CustomSpinner spinnerPhone;
+  private View spinnerDivider;
+  private ClearEditText editTextPhoneNumber;
+  private TextView textViewValidation;
+
+  public EventParticipationPhoneViewHolder(View view) {
+    super(view);
+    spinnerPhone = view.findViewById(R.id.spinner_phone_number);
+    spinnerDivider = view.findViewById(R.id.spinner_divider);
+    editTextPhoneNumber = view.findViewById(R.id.edit_text_phone_number);
+    textViewValidation = view.findViewById(R.id.text_view_phone_number_validation);
+  }
+
+  @Override
+  public void init(IEventListener listener) {
+    super.init(listener);
+  }
 }

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

@@ -1,5 +1,7 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
+import kr.co.zumo.app.lifeplus.helper.NavigationBar;
+import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
 
@@ -13,7 +15,7 @@ import kr.co.zumo.app.lifeplus.view.presenter.Presenter;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-public class EventParticipationPresenter extends Presenter<EventParticipationModel,IEventParticipationView > {
+public class EventParticipationPresenter extends Presenter<EventParticipationModel, IEventParticipationView> {
   public EventParticipationPresenter(EventParticipationModel model, IEventParticipationView view) {
     super(model, view);
   }
@@ -60,7 +62,8 @@ public class EventParticipationPresenter extends Presenter<EventParticipationMod
 
   @Override
   public boolean onBackPressedInternal() {
-    return false;
+    go(ScreenID.EVENT);
+    return true;
   }
 
   @Override
@@ -77,4 +80,9 @@ public class EventParticipationPresenter extends Presenter<EventParticipationMod
   public void onResult(Event event) {
 
   }
+
+  @Override
+  public void onNavigationClickClose(NavigationBar navigationBar) {
+    onBackPressedInternal();
+  }
 }

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

@@ -1,6 +1,10 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.custom.ClearEditText;
 
 /**
  * EventParticipationScoreViewHolder
@@ -12,6 +16,16 @@ import android.view.View;
  * @history 하세미   [2019-01-09]   [최초 작성]
  * @since 2019-01-09
  */
-class EventParticipationScoreViewHolder extends EventParticipationView {
-  public EventParticipationScoreViewHolder(View view) {super(view);}
+public class EventParticipationScoreViewHolder extends EventParticipationView {
+
+  private ClearEditText textScore1;
+  private ClearEditText textScore2;
+  private TextView textViewScoreValidation;
+
+  public EventParticipationScoreViewHolder(View view) {
+    super(view);
+    textScore1 = view.findViewById(R.id.edit_text_score1);
+    textScore2 = view.findViewById(R.id.edit_text_score2);
+    textViewScoreValidation = view.findViewById(R.id.text_view_score_validation);
+  }
 }

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

@@ -3,6 +3,8 @@ package kr.co.zumo.app.lifeplus.view.screen.event;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+
 /**
  * EventParticipationView
  * <pre>
@@ -17,4 +19,8 @@ public class EventParticipationView extends RecyclerView.ViewHolder {
   public EventParticipationView(View itemView) {
     super(itemView);
   }
+
+  public void init(IEventListener listener) {
+
+  }
 }

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

@@ -13,5 +13,4 @@ import kr.co.zumo.app.lifeplus.view.IView;
  * @since 2019-01-09
  */
 public interface IEventParticipationView extends IView {
-
 }

+ 7 - 0
app/src/main/res/drawable/icon_image_delete.xml

@@ -0,0 +1,7 @@
+<vector android:height="14dp" android:viewportHeight="54"
+        android:viewportWidth="54" android:width="14dp" xmlns:android="http://schemas.android.com/apk/res/android">
+  <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M27,27m-27,0a27,27 0,1 1,54 0a27,27 0,1 1,-54 0"/>
+  <path android:fillColor="#00000000" android:fillType="evenOdd"
+        android:pathData="M17,16l20,22M16,37l22,-20"
+        android:strokeColor="#FFFFFF" android:strokeWidth="4"/>
+</vector>

+ 6 - 4
app/src/main/res/layout/event_participation_item_address.xml

@@ -19,13 +19,13 @@
     app:layout_constraintStart_toStartOf="parent"/>
 
 
-  <EditText
-    android:id="@+id/edit_text_email"
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
+    android:id="@+id/edit_text_address"
     android:layout_width="match_parent"
     android:layout_height="80dp"
     android:layout_marginTop="2dp"
     android:background="@drawable/button_underline_background"
-    android:hint="@string/event_participation_email_hint"
+    android:hint="@string/event_participation_address_hint"
     android:lineSpacingExtra="6sp"
     android:maxLength="5"
     android:maxLines="1"
@@ -36,7 +36,7 @@
     app:layout_constraintTop_toBottomOf="@+id/textView7"/>
 
   <TextView
-    android:id="@+id/text_recommend_validation"
+    android:id="@+id/text_address_validation"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="54dp"
@@ -45,6 +45,8 @@
     android:text="@string/event_participation_address_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/textView7"
     app:layout_constraintVertical_chainStyle="spread_inside"

+ 35 - 6
app/src/main/res/layout/event_participation_item_agree.xml

@@ -6,6 +6,8 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_marginStart="25dp"
+  android:layout_marginTop="17dp"
+  android:layout_marginBottom="17dp"
   android:layout_marginEnd="25dp"
   >
 
@@ -19,23 +21,50 @@
     />
 
   <View
-    android:layout_marginTop="20dp"
-    app:layout_constraintTop_toBottomOf="@+id/checkbox_all_agree"
     android:id="@+id/view"
     android:layout_width="match_parent"
     android:layout_height="1dp"
-    android:background="@color/CEBEBEB"/>
+    android:layout_marginTop="20dp"
+    android:background="@color/CEBEBEB"
+    app:layout_constraintTop_toBottomOf="@+id/checkbox_all_agree"/>
 
   <LinearLayout
-    app:layout_constraintTop_toBottomOf="@+id/view"
+    android:id="@+id/check_layout"
     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"
+      style="@style/CommonCheckBox"
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/phone_identify_agree4"
+      />
+
+    <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:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    app:layout_constraintTop_toBottomOf="@+id/check_layout"
+    android:layout_marginTop="14dp"
     >
 
     <CheckBox
-      android:id="@+id/checkbox_agree4"
+      android:id="@+id/checkbox_agree2"
       style="@style/CommonCheckBox"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
@@ -44,7 +73,7 @@
       />
 
     <ImageView
-      android:id="@+id/button_identify_agree4"
+      android:id="@+id/button_identify_agree2"
       android:layout_width="19dp"
       android:layout_height="19dp"
       android:layout_gravity="center_vertical"

+ 12 - 9
app/src/main/res/layout/event_participation_item_button.xml

@@ -4,9 +4,12 @@
   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">
+  android:layout_height="wrap_content"
+  android:layout_marginTop="17dp"
+  android:layout_marginBottom="17dp">
 
   <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_button"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_marginStart="25dp"
@@ -14,19 +17,19 @@
     android:background="@color/C000000">
 
     <TextView
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      app:layout_constraintBottom_toBottomOf="parent"
-      android:layout_marginTop="10dp"
-      android:layout_marginBottom="10dp"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_marginTop="10dp"
+      android:layout_marginBottom="10dp"
       android:gravity="center_horizontal"
       android:lineSpacingExtra="6sp"
-      android:text="신청하기"
+      android:text="@string/participation"
       android:textColor="@color/CFFFFFF"
-      android:textSize="15.7sp"
+      android:textSize="16sp"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
       />
 
   </android.support.constraint.ConstraintLayout>

+ 4 - 1
app/src/main/res/layout/event_participation_item_email.xml

@@ -5,6 +5,7 @@
   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">
 
@@ -20,7 +21,7 @@
     app:layout_constraintStart_toStartOf="parent"/>
 
 
-  <EditText
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_email"
     android:layout_width="match_parent"
     android:layout_height="80dp"
@@ -46,6 +47,8 @@
     android: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_email"
     app:layout_constraintVertical_chainStyle="spread_inside"

+ 1 - 0
app/src/main/res/layout/event_participation_item_image.xml

@@ -5,6 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  android:layout_marginBottom="17dp"
   android:layout_marginStart="25dp"
   android:layout_marginEnd="25dp">
 

+ 6 - 5
app/src/main/res/layout/event_participation_item_name.xml

@@ -20,8 +20,8 @@
     app:layout_constraintStart_toStartOf="parent"/>
 
 
-  <EditText
-    android:id="@+id/edit_recommend_code"
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
+    android:id="@+id/edit_text_name"
     android:layout_width="match_parent"
     android:layout_height="80dp"
     android:layout_marginTop="2dp"
@@ -38,7 +38,7 @@
     app:layout_constraintTop_toBottomOf="@+id/text_view_name"/>
 
   <TextView
-    android:id="@+id/text_recommend_validation"
+    android:id="@+id/text_name_validation"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="54dp"
@@ -47,8 +47,9 @@
     android:text="@string/event_participation_name_validation"
     android:textColor="@color/C666666"
     android:textSize="11sp"
-    app:layout_constraintBottom_toTopOf="@+id/button_registering"
-    app:layout_constraintStart_toStartOf="@+id/edit_recommend_code"
+    android:visibility="gone"
+    tools:visibility="visible"
+    app:layout_constraintStart_toStartOf="@+id/edit_text_name"
     app:layout_constraintTop_toBottomOf="@+id/text_view_name"
     app:layout_constraintVertical_chainStyle="spread_inside"
     />

+ 3 - 1
app/src/main/res/layout/event_participation_item_nickname.xml

@@ -58,7 +58,7 @@
       />
   </RadioGroup>
 
-  <EditText
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_nickname"
     android:layout_width="match_parent"
     android:layout_height="80dp"
@@ -85,6 +85,8 @@
     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"

+ 37 - 2
app/src/main/res/layout/event_participation_item_notice.xml

@@ -3,19 +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"
   >
+
   <TextView
+    android:id="@+id/text_view_notice_title"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:textSize="12sp"
+    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"/>
+
+  <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_notice1"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="5dp"
+    android:layout_marginTop="7dp"
     android:lineSpacingExtra="4sp"
-    tools:text="꼭 확인해주세요"
+    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"
     />
 
 </android.support.constraint.ConstraintLayout>

+ 19 - 11
app/src/main/res/layout/event_participation_item_phone.xml

@@ -3,58 +3,66 @@
   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_marginStart="25dp"
-  android:layout_marginEnd="25dp"
   android:layout_width="match_parent"
-  android:layout_height="wrap_content">
+  android:layout_height="wrap_content"
+  android:layout_marginStart="25dp"
+  android:layout_marginEnd="25dp">
 
   <kr.co.zumo.app.lifeplus.view.custom.CustomSpinner
     android:id="@+id/spinner_phone_number"
     android:layout_width="100dp"
     android:layout_height="44dp"
-    android:layout_marginStart="5dp"
     android:background="@drawable/spinner_drop_down"
     android:entries="@array/phone_numbers"
     android:focusable="true"
     android:lineSpacingExtra="5sp"
     android:textColor="@color/C000000"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintEnd_toStartOf="@+id/edit_text_phone_number"
     android:textSize="14sp"/>
 
   <View
+    android:id="@+id/spinner_divider"
     android:layout_width="100dp"
     android:layout_height="1dp"
-    app:layout_constraintTop_toBottomOf="@+id/spinner_phone_number"
+    android:background="@color/CE5E5E5"
     app:layout_constraintStart_toStartOf="parent"
-    android:background="@color/CE5E5E5"/>
-  <EditText
+    app:layout_constraintTop_toBottomOf="@+id/spinner_phone_number"/>
+
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_phone_number"
     android:layout_width="0dp"
-    app:layout_constraintDimensionRatio="V, 199:45"
     android:layout_height="80dp"
+    android:layout_marginStart="12dp"
     android:layout_marginTop="2dp"
     android:background="@drawable/button_underline_background"
     android:hint="@string/event_participation_phone_hint"
     android:lineSpacingExtra="6sp"
-    android:maxLength="5"
+    android:maxLength="8"
     android:maxLines="1"
-    android:layout_marginStart="12dp"
     android:paddingStart="5dp"
     android:paddingBottom="35dp"
     android:textColorHint="@color/CC5C5C5"
     android:textSize="14sp"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toEndOf="@+id/spinner_phone_number"/>
+
   <TextView
     android:id="@+id/text_view_phone_number_validation"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="54dp"
     android:layout_marginBottom="8dp"
-    android:lineSpacingExtra="3.5sp"
+    android:inputType="number"
+    android:lineSpacingExtra="4sp"
     android:text="@string/event_participation_phone_validation"
     android:textColor="@color/C666666"
     android:textSize="11sp"
+    android:visibility="gone"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="@+id/edit_text_phone_number"
     app:layout_constraintVertical_chainStyle="spread_inside"
+    tools:visibility="visible"
     />
 </android.support.constraint.ConstraintLayout>

+ 5 - 4
app/src/main/res/layout/event_participation_item_score.xml

@@ -5,7 +5,6 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-
   android:layout_marginStart="25dp"
   android:layout_marginEnd="25dp">
 
@@ -19,7 +18,7 @@
     android:textSize="12sp"
     />
 
-  <EditText
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_score1"
     android:layout_width="0dp"
     android:layout_height="80dp"
@@ -67,7 +66,7 @@
       app:layout_constraintTop_toBottomOf="@+id/view1"/>
   </android.support.constraint.ConstraintLayout>
 
-  <EditText
+  <kr.co.zumo.app.lifeplus.view.custom.ClearEditText
     android:id="@+id/edit_text_score2"
     android:layout_width="0dp"
     android:layout_height="80dp"
@@ -91,7 +90,7 @@
 
 
   <TextView
-    android:id="@+id/text_view_nick_name_validation"
+    android:id="@+id/text_view_score_validation"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="54dp"
@@ -100,6 +99,8 @@
     android:text="@string/event_participation_score_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_score1"
     app:layout_constraintVertical_chainStyle="spread_inside"

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -569,6 +569,7 @@
 
   <string name="go_vote">투표하기</string>
   <string name="go_confirm">꼭 확인하세요!</string>
+  <string name="go_confirm2">꼭 확인해주세요</string>
 
   <string name="event">이벤트</string>
   <string name="event_ing">진행중인 이벤트</string>