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

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

@@ -38,25 +38,28 @@
     tools:text="투표 참여는 1인 1회만 가능하며
 당첨 확인은 MY>이벤트에서 확인 가능합니다."/>
 
-  <android.support.constraint.ConstraintLayout
+  <LinearLayout
     android:id="@+id/event_select_area"
     android:layout_width="match_parent"
     android:layout_height="225dp"
     android:layout_marginTop="49dp"
-    tools:background="@color/C666666"
+    android:gravity="center"
+    android:orientation="horizontal"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/text_view_question_sub_title">
+    app:layout_constraintTop_toBottomOf="@+id/text_view_question_sub_title"
+    tools:background="@color/C666666">
 
     <android.support.v7.widget.RecyclerView
       android:id="@+id/recycler_view_event_select_area"
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       android:layout_height="match_parent"
+      android:layout_gravity="center"
       android:clipToPadding="false"
       android:overScrollMode="never"
       android:paddingStart="17dp"
       android:paddingEnd="17dp"/>
-  </android.support.constraint.ConstraintLayout>
+  </LinearLayout>
 
 
   <ImageView
@@ -74,14 +77,14 @@
     android:id="@+id/text_view_confirm"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:lineSpacingExtra="3.5sp"
+    android:lineSpacingExtra="4sp"
     android:paddingTop="7dp"
     android:paddingBottom="7dp"
+    android:text="@string/go_confirm"
     android:textColor="@color/C999999"
     android:textSize="12sp"
     app:layout_constraintStart_toEndOf="@+id/icon_info"
     app:layout_constraintTop_toTopOf="@+id/icon_info"
-    android:text="@string/go_confirm"
     />
 
   <Button

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

@@ -8,14 +8,19 @@
 
   <TextView
     android:id="@+id/text_view_result_title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="25dp"
     android:layout_marginTop="28dp"
+    android:layout_marginEnd="25dp"
+    android:ellipsize="end"
     android:lineSpacingExtra="8sp"
+    android:maxLines="2"
     android:textColor="@color/C000000"
     android:textSize="21sp"
     android:textStyle="bold"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="투표 결과!
@@ -24,36 +29,44 @@
 
   <TextView
     android:id="@+id/text_view_result_sub_title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="25dp"
     android:layout_marginTop="8dp"
+    android:layout_marginEnd="25dp"
+    android:ellipsize="end"
     android:lineSpacingExtra="5sp"
+    android:maxLines="2"
     android:textColor="@color/C999999"
     android:textSize="14sp"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_result_title"
     tools:text="투표는 현재 기준이며,
 진행 기간동안 순위 변동 될 수 있습니다."
     />
 
-  <android.support.constraint.ConstraintLayout
+  <LinearLayout
     android:id="@+id/layout_result_view"
     android:layout_width="match_parent"
     android:layout_height="278dp"
     android:layout_marginTop="19dp"
+    android:gravity="center"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toBottomOf="@+id/text_view_result_sub_title"
     tools:background="@color/CF8F8F8">
 
     <android.support.v7.widget.RecyclerView
       android:id="@+id/recycler_view_event_select_result"
-      android:layout_width="match_parent"
+      android:layout_width="wrap_content"
       android:layout_height="match_parent"
       android:clipToPadding="false"
       android:overScrollMode="never"
       android:paddingStart="19dp"
       android:paddingEnd="19dp"/>
-  </android.support.constraint.ConstraintLayout>
+  </LinearLayout>
 
   <ImageView
     android:id="@+id/icon_info"