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

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

@@ -3,7 +3,6 @@
  */
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -35,11 +34,12 @@ class EventParticipationMultipleChoiceViewHolder extends EventParticipationView
 
   @Override
   public void init(IEventListener listener) {
-    Log.e("APP#  EventParticipationMultipleChoiceViewHolder | init", "|");
     textViewTitle.setText("Lifeplus 설치하게 된 경로를 선택해주세요.");
+    for (int i = 0; i < 6; i++) {
+      EventParticipationCheckbox checkbox = new EventParticipationCheckbox(itemView.getContext());
+      checkbox.setText("테스트" + i);
+      layoutChoiceView.addView(checkbox);
+    }
 
-    EventParticipationCheckbox checkbox = new EventParticipationCheckbox(itemView.getContext());
-    checkbox.setText("테스트");
-    layoutChoiceView.addView(checkbox);
   }
 }

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

@@ -1,6 +1,11 @@
 package kr.co.zumo.app.lifeplus.view.screen.event;
 
 import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
 
 /**
  * EventParticipationTitleViewHolder
@@ -13,7 +18,25 @@ import android.view.View;
  * @since 2019-01-09
  */
 public class EventParticipationTitleViewHolder extends EventParticipationView {
+
+  private ImageView imageViewBackground;
+  private TextView textViewTitle;
+  private TextView textViewSubTitle;
+  private TextView textViewDetail;
+
   public EventParticipationTitleViewHolder(View itemView) {
     super(itemView);
+    imageViewBackground = itemView.findViewById(R.id.image_view_background);
+    textViewTitle = itemView.findViewById(R.id.text_view_title);
+    textViewSubTitle = itemView.findViewById(R.id.text_view_sub_title);
+    textViewDetail = itemView.findViewById(R.id.text_view_detail);
+  }
+
+  @Override
+  public void init(IEventListener listener) {
+    imageViewBackground.setImageDrawable(itemView.getResources().getDrawable(R.drawable.banner_bg_1));
+    textViewTitle.setText("앱 후기 남기고 \n1,000코인 득템하자!");
+    textViewSubTitle.setText("2018.07.15 ~ 2018.07.22");
+    textViewDetail.setText("Lifeplus에게 하고 싶었던 이야기나 \n만족스러웠던 부분을 스토어 리뷰로 남겨주세요!\n추첨을 통해 푸짐한 경품을 드립니다.");
   }
 }

app/src/main/res/layout/event_participation_checkbox.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">
   <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:background="@drawable/custom_rectangle_radio_selector"

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

@@ -32,7 +32,7 @@
     android:maxLength="5"
     android:maxLines="1"
     android:paddingStart="5dp"
-    android:paddingBottom="35dp"
+    android:paddingBottom="38dp"
     android:textColorHint="@color/CC5C5C5"
     android:textSize="14sp"
     app:layout_constraintTop_toBottomOf="@+id/text_view_email"/>

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

@@ -11,7 +11,7 @@
   <TextView
     android:id="@+id/text_view_nick_name"
     android:layout_width="wrap_content"
-    android:layout_height="38dp"
+    android:layout_height="wrap_content"
     android:lineSpacingExtra="4sp"
     android:text="@string/event_participation_nickname"
     android:textColor="@color/C999999"
@@ -70,7 +70,7 @@
     android:maxLength="5"
     android:maxLines="1"
     android:paddingStart="5dp"
-    android:paddingBottom="35dp"
+    android:paddingBottom="38dp"
     android:textColorHint="@color/CC5C5C5"
     android:textSize="14sp"
     app:layout_constraintTop_toBottomOf="@+id/radio_group_store"/>

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

@@ -10,10 +10,11 @@
     android:id="@+id/image_view_background"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
+    android:scaleType="centerCrop"
     app:layout_constraintDimensionRatio="V , 360: 269"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
     tools:background="@color/CF8F8F8"/>
 
   <View

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

@@ -448,7 +448,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginStart="15dp"
-      android:layout_marginTop="33dp"
+      android:layout_marginTop="23dp"
       android:layout_marginEnd="25dp"
       android:layout_marginBottom="35dp"
       app:layout_constraintBottom_toTopOf="@+id/layout_my_bucket_list_preview"