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

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

@@ -38,7 +38,6 @@ public class WinnerAnnouncementFragment extends FragmentBase<WinnerAnnouncementP
       .menu(actionBar -> presenter.onNavigationClickMenu(actionBar))
       .search(actionBar -> presenter.onNavigationClickSearch(actionBar))
       .back(actionBar -> presenter.onNavigationClickBack(actionBar))
-      .scroll()
       .show();
   }
 

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

@@ -1,6 +1,249 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                             android:layout_width="match_parent"
-                                             android:layout_height="match_parent">
+<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.constraint.ConstraintLayout>
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginStart="24dp"
+    android:layout_marginTop="26dp"
+    android:layout_marginEnd="24dp">
+
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/event_flag"
+      android:layout_width="25dp"
+      android:layout_height="16dp"
+      android:layout_marginTop="6dp"
+      android:background="@color/C000000"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <TextView
+        android:id="@+id/end_flag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:lineSpacingExtra="4sp"
+        android:text="종료"
+        android:textAlignment="center"
+        android:textColor="@color/CFFFFFF"
+        android:textSize="9sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+    </android.support.constraint.ConstraintLayout>
+
+    <TextView
+      android:id="@+id/text_view_title"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="15dp"
+      android:lineSpacingExtra="8sp"
+      android:text="샤갈 러브 앤 라이프 전\n티켓 증정 이벤트 당첨자 발표"
+      android:textColor="@color/C000000"
+      android:textSize="21sp"
+      android:textStyle="bold"
+      app:layout_constraintTop_toBottomOf="@+id/event_flag"
+      />
+
+    <View
+      android:id="@+id/divider"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="25dp"
+      android:background="@color/CE5E5E5"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_title"/>
+
+    <TextView
+      android:id="@+id/text_view_announcement_notice"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="43dp"
+      android:lineSpacingExtra="10sp"
+      android:text="안녕하세요.지난 7/19(목)부터 7/21(토)에 진행된
+&lt;샤갈 러브 앤 라이프 전 티켓 증정&gt;당첨자를 발표합니다.
+이벤트에 당첨된 모든 분들께 진심으로 축하를 드리며, 마르크 샤갈이 전하는 사랑과 삶의 색채 속에서 잠시나마 더위를 잊으시길 바랍니다."
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/divider"
+      />
+
+    <TextView
+      android:id="@+id/text_view_event_info"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="38dp"
+      android:lineSpacingExtra="6sp"
+      android:text="이벤트 정보"
+      android:textColor="@color/C000000"
+      android:textSize="14sp"
+      android:textStyle="bold"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_announcement_notice"/>
+
+    <TextView
+      android:id="@+id/text_view_event_date"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="8dp"
+      android:lineSpacingExtra="9.5sp"
+      android:text="·이벤트 기간 : 2018.12.06 ~ 2018.12.30"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_event_info"/>
+
+    <!--경품 발송안내 박스-->
+    <android.support.constraint.ConstraintLayout
+      android:id="@+id/layout_present_send_info"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="38dp"
+      android:background="@color/CF8F8F8"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_event_date">
+
+      <TextView
+        android:id="@+id/text_view_present_send_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="21dp"
+        android:lineSpacingExtra="4sp"
+        android:text="경품 발송 안내"
+        android:textColor="@color/C000000"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="18dp"
+        android:layout_marginTop="7dp"
+        android:layout_marginBottom="21dp"
+        android:lineSpacingExtra="4sp"
+        android:text="· 경품 샤갈 러브 앤 라이프전 초대권은 현장에서 본인 확인\n(이름/연락처) 후 초대권으로 교환해 드릴 예정입니다."
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_present_send_info"
+        />
+    </android.support.constraint.ConstraintLayout>
+
+    <TextView
+      android:id="@+id/text_view_winner_list"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="45dp"
+      android:lineSpacingExtra="6sp"
+      android:text="당첨자 리스트(휴대폰 뒷자리 순 정렬)"
+      android:textColor="@color/C000000"
+      android:textSize="14sp"
+      android:textStyle="bold"
+      app:layout_constraintTop_toBottomOf="@+id/layout_present_send_info"
+      />
+
+    <View
+      android:id="@+id/divider2"
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="17dp"
+      android:background="@color/CE5E5E5"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_winner_list"/>
+
+    <TextView
+      android:id="@+id/text_view_email"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="10dp"
+      android:layout_marginTop="18dp"
+      android:layout_marginEnd="12dp"
+      android:lineSpacingExtra="10sp"
+      android:text="이메일 주소"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintEnd_toStartOf="@+id/text_view_name"
+      app:layout_constraintHorizontal_chainStyle="spread_inside"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/divider2"/>
+
+    <TextView
+      android:id="@+id/text_view_name"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="60dp"
+      android:layout_marginTop="18dp"
+      android:lineSpacingExtra="10sp"
+      android:text="이름"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintEnd_toStartOf="@+id/text_view_phone"
+      app:layout_constraintHorizontal_chainStyle="spread_inside"
+      app:layout_constraintStart_toEndOf="@+id/text_view_email"
+      app:layout_constraintTop_toBottomOf="@+id/divider2"/>
+
+    <TextView
+      android:id="@+id/text_view_phone"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="18dp"
+      android:lineSpacingExtra="10sp"
+      android:text="연락처 뒷자리"
+      android:textColor="@color/C000000"
+      android:textSize="12sp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintHorizontal_chainStyle="spread_inside"
+      app:layout_constraintStart_toEndOf="@+id/text_view_name"
+      app:layout_constraintTop_toBottomOf="@+id/divider2"/>
+
+    <TextView
+      android:id="@+id/text_view_winner_email"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="9sp"
+      android:textColor="@color/C666666"
+      android:textSize="12sp"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_email"
+      app:layout_constraintStart_toStartOf="@+id/text_view_email"
+      android:layout_marginTop="15dp"
+      android:text="07**wlsldu@naver.com"
+      />
+
+    <TextView
+      android:id="@+id/text_view_winner_name"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:lineSpacingExtra="9sp"
+      android:textColor="@color/C666666"
+      android:textSize="12sp"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_name"
+      app:layout_constraintStart_toStartOf="@+id/text_view_name"
+      android:layout_marginTop="15dp"
+      android:text="김*원"/>
+
+    <TextView
+      android:id="@+id/text_view_phone_number"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:lineSpacingExtra="9sp"
+      android:textColor="@color/C666666"
+      android:textSize="12sp"
+      android:text="0*14"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_phone"
+      app:layout_constraintStart_toStartOf="@+id/text_view_phone"
+      android:layout_marginTop="15dp"
+      />
+  </android.support.constraint.ConstraintLayout>
+</android.support.v4.widget.NestedScrollView>

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

@@ -10,9 +10,8 @@
     android:id="@+id/recycler_view_my_event"
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    tools:background="@color/CC5C5C5"
-    app:layout_constraintTop_toTopOf="parent"
-    app:layout_constraintBottom_toTopOf="@+id/button_ing_event"/>
+    app:layout_constraintBottom_toTopOf="@+id/button_ing_event"
+    app:layout_constraintTop_toTopOf="parent"/>
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/button_ing_event"
@@ -38,4 +37,35 @@
       />
 
   </android.support.constraint.ConstraintLayout>
+
+  <ImageView
+    android:id="@+id/image_view_search_none"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="20dp"
+    android:visibility="gone"
+    app:layout_constraintBottom_toTopOf="@+id/textView8"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias=".35"
+    app:layout_constraintVertical_chainStyle="packed"
+    app:srcCompat="@drawable/ic_icon_search_none"
+    tools:visibility="visible"/>
+
+  <TextView
+    android:id="@+id/textView8"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:lineSpacingExtra="6sp"
+    android:text="@string/event_none"
+    android:textColor="@color/CC5C5C5"
+    android:textSize="14sp"
+    android:visibility="gone"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/image_view_search_none"
+    tools:visibility="visible"/>
 </android.support.constraint.ConstraintLayout>

app/src/main/res/values/strings.xml

@@ -569,6 +569,7 @@
   <string name="event">이벤트</string>
   <string name="event_ing">진행중인 이벤트</string>
   <string name="winner_announcement">당첨자 발표</string>
+  <string name="event_none">참여하신 이벤트가 없습니다</string>
   <string name="show_event">이벤트 보기</string>
   <string name="event_date">2018.08.13. 11:24</string>
   <string name="event_title">디뮤지엄 전시회 티켓 증정 이벤트</string>