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

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

@@ -4,10 +4,11 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
+import android.support.constraint.ConstraintSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.Calendar;
@@ -37,7 +38,7 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
   private TextView textViewEventDate;
   private TextView textViewWinnerDate;
   private TextView textViewAnnouncementNotice;
-  private LinearLayout layoutContainer;
+  private ConstraintLayout layoutContainer;
   private LayoutInflater inflater;
 
   @Override
@@ -107,19 +108,65 @@ public class EventWinnerFragment extends FragmentBase<EventWinnerPresenter> impl
     bean.setDescription("이벤트 설명 추가 예정");
     textViewAnnouncementNotice.setText(bean.getDescription());
 
+
+    int emailId = R.id.text_view_email;
+    int nameId = R.id.text_view_name;
+    int numberId = R.id.text_view_phone;
+
+
     for (int i = 0; i < bean.getWinnerList().size(); ++i) {
-      EventWinnerBean winnerBean = bean.getWinnerList().get(i);
-      View view = inflater.inflate(R.layout.event_winner_list, null);
 
-      ((TextView) view.findViewById(R.id.text_view_winner_email)).setText(winnerBean.getEmail());
-      ((TextView) view.findViewById(R.id.text_view_winner_name)).setText(winnerBean.getUserName());
-      ((TextView) view.findViewById(R.id.text_view_phone_number)).setText(winnerBean.getMobileNumber());
+      EventWinnerBean winnerBean = bean.getWinnerList().get(i);
+      ConstraintLayout.LayoutParams layoutParams;
+      ConstraintSet constraintSet = new ConstraintSet();
+
+      //이메일
+      TextView textViewEmail = new TextView(getActivity());
+      setTextStyle(textViewEmail);
+      textViewEmail.setText(winnerBean.getEmail());
+      layoutParams = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      layoutContainer.addView(textViewEmail, layoutParams);
+
+
+      //이름
+      TextView textViewName = new TextView(getActivity());
+      setTextStyle(textViewName);
+      textViewName.setText(winnerBean.getUserName());
+      layoutParams = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      layoutContainer.addView(textViewName, layoutParams);
+
+      //전화번호
+      TextView textViewNumber = new TextView(getActivity());
+      setTextStyle(textViewNumber);
+      textViewNumber.setText(winnerBean.getMobileNumber());
+      layoutParams = new ConstraintLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      layoutContainer.addView(textViewNumber, layoutParams);
+
+      constraintSet.clone((ConstraintLayout) layoutContainer);
+      constraintSet.connect(textViewEmail.getId(), ConstraintSet.START, emailId, ConstraintSet.START, 0);
+      constraintSet.connect(textViewEmail.getId(), ConstraintSet.TOP, emailId, ConstraintSet.BOTTOM, ResourceUtil.dpToPx(13));
+      emailId = textViewEmail.getId();
+
+      constraintSet.connect(textViewName.getId(), ConstraintSet.START, nameId, ConstraintSet.START, 0);
+      constraintSet.connect(textViewName.getId(), ConstraintSet.TOP, nameId, ConstraintSet.BOTTOM, ResourceUtil.dpToPx(13));
+      nameId = textViewName.getId();
+
+      constraintSet.connect(textViewNumber.getId(), ConstraintSet.START, numberId, ConstraintSet.START, 0);
+      constraintSet.connect(textViewNumber.getId(), ConstraintSet.TOP, numberId, ConstraintSet.BOTTOM, ResourceUtil.dpToPx(13));
+      numberId = textViewNumber.getId();
+
+      constraintSet.applyTo(layoutContainer);
 
-      layoutContainer.addView(view);
     }
   }
 
   protected String getTimeString(String timeString) {
     return Formatter.format(timeString, EventBean.DATE_FORMAT, "yyyy.MM.dd");
   }
+
+  private void setTextStyle(TextView textView) {
+    textView.setId(View.generateViewId());
+    textView.setTextSize(12);
+    textView.setTextColor(ResourceUtil.getColor(R.color.C666666));
+  }
 }

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

@@ -33,9 +33,13 @@
     android:id="@+id/layout_category"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginTop="25dp"
     android:layout_marginBottom="25dp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_sub_title"
-    app:layout_constraintStart_toStartOf="@+id/text_view_sub_title">
+    app:layout_constraintStart_toStartOf="@+id/text_view_sub_title"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="1"
+    app:layout_constraintVertical_chainStyle="packed">
 
     <TextView
       android:id="@+id/text_view_category1"
@@ -76,35 +80,36 @@
 
   <TextView
     android:id="@+id/text_view_sub_title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="30dp"
     android:layout_marginBottom="6dp"
     android:lineSpacingExtra="6dp"
     android:textColor="@color/CFFFFFF"
-    android:textSize="15.5sp"
+    android:textSize="16sp"
+    app:layout_constrainedWidth="true"
     app:layout_constraintBottom_toTopOf="@+id/text_view_title"
+    app:layout_constraintEnd_toStartOf="@+id/image_view_arrow"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="입구부터 포토존"/>
+    app:layout_constraintTop_toBottomOf="@+id/layout_category"
+    tools:text="입구부터 포ddddddddd토존"/>
 
   <TextView
     android:id="@+id/text_view_title"
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="30dp"
-    android:layout_marginEnd="30dp"
     android:layout_marginBottom="5dp"
-    android:ellipsize="end"
     android:lineSpacingExtra="7dp"
-    android:maxLines="2"
     android:textColor="@color/CFFFFFF"
     android:textSize="28sp"
+    app:layout_constrainedHeight="true"
     app:layout_constrainedWidth="true"
     app:layout_constraintBottom_toTopOf="@+id/text_view_tag1"
     app:layout_constraintEnd_toStartOf="@+id/image_view_arrow"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="문을 여시오
-대문이 대문짝 5"/>
+    app:layout_constraintTop_toBottomOf="@+id/text_view_sub_title"
+    tools:text="문을 여시오"/>
 
   <TextView
     android:id="@+id/text_view_tag1"
@@ -163,9 +168,10 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="3dp"
     android:layout_marginEnd="15dp"
+    android:layout_marginBottom="109dp"
     android:padding="10dp"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="@id/text_view_title"
     app:srcCompat="@drawable/icon_contents_arrow"
     />
 
@@ -189,11 +195,11 @@
   <ImageView
     android:id="@+id/shopping_icon"
     android:layout_width="wrap_content"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
+    android:layout_height="wrap_content"
     android:layout_marginEnd="25dp"
     android:layout_marginBottom="23dp"
-    android:layout_height="wrap_content"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
     app:srcCompat="@drawable/icon_shopping_wh"
     />
 

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

@@ -33,9 +33,13 @@
     android:id="@+id/layout_category"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:layout_marginTop="25dp"
     android:layout_marginBottom="25dp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_sub_title"
-    app:layout_constraintStart_toStartOf="@+id/text_view_sub_title">
+    app:layout_constraintStart_toStartOf="@+id/text_view_sub_title"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintVertical_bias="1"
+    app:layout_constraintVertical_chainStyle="packed">
 
     <TextView
       android:id="@+id/text_view_flag"
@@ -76,29 +80,34 @@
 
   <TextView
     android:id="@+id/text_view_sub_title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="30dp"
     android:layout_marginBottom="6dp"
     android:lineSpacingExtra="6dp"
+    app:layout_constrainedWidth="true"
+    app:layout_constraintEnd_toStartOf="@+id/image_view_arrow"
     android:textColor="@color/CFFFFFF"
     android:textSize="16sp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_title"
     app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/layout_category"
     tools:text="라플 불꽃좌석권 (1인 2매)"/>
 
   <TextView
     android:id="@+id/text_view_title"
-    android:layout_width="wrap_content"
+    android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_marginStart="30dp"
     android:layout_marginBottom="5dp"
     android:lineSpacingExtra="7dp"
     android:textColor="@color/CFFFFFF"
     android:textSize="28sp"
+    app:layout_constraintEnd_toStartOf="@+id/image_view_arrow"
+    app:layout_constraintTop_toBottomOf="@+id/text_view_sub_title"
     app:layout_constraintBottom_toTopOf="@+id/text_view_tag1"
     app:layout_constraintStart_toStartOf="parent"
-    tools:text="서울세계불꽃축제\n티켓을 잡아라"/>
+    tools:text="서울세계불꽃축제\n티켓을 d잡아라"/>
 
   <TextView
     android:id="@+id/text_view_tag1"
@@ -157,9 +166,10 @@
     android:layout_height="wrap_content"
     android:layout_marginTop="3dp"
     android:layout_marginEnd="15dp"
+    android:layout_marginBottom="109dp"
     android:padding="10dp"
+    app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintTop_toTopOf="@id/text_view_title"
     app:srcCompat="@drawable/icon_contents_arrow"
     />
 

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

@@ -147,12 +147,18 @@
       app:layout_constraintTop_toBottomOf="@+id/text_view_winner_list"/>
 
     <android.support.constraint.ConstraintLayout
-      android:id="@+id/layout_winner_list_top"
+      android:id="@+id/layout_container_winner_list"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:layout_marginBottom="47dp"
+      android:orientation="vertical"
       android:paddingTop="18dp"
       android:paddingBottom="9dp"
-      app:layout_constraintTop_toBottomOf="@+id/divider2">
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/divider2"
+      >
 
       <TextView
         android:id="@+id/text_view_email"
@@ -160,6 +166,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp"
         android:lineSpacingExtra="10sp"
+        android:paddingBottom="2dp"
         android:text="@string/email_address_kor"
         android:textColor="@color/C000000"
         android:textSize="12sp"
@@ -173,6 +180,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="104dp"
         android:lineSpacingExtra="10sp"
+        android:paddingBottom="2dp"
         android:text="@string/phone_identify_name"
         android:textColor="@color/C000000"
         android:textSize="12sp"
@@ -188,6 +196,7 @@
         android:layout_marginStart="44dp"
         android:layout_marginEnd="12dp"
         android:lineSpacingExtra="10sp"
+        android:paddingBottom="2dp"
         android:text="@string/phone_number_back"
         android:textColor="@color/C000000"
         android:textSize="12sp"
@@ -195,20 +204,7 @@
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toEndOf="@+id/text_view_name"
         />
-    </android.support.constraint.ConstraintLayout>
 
-    <LinearLayout
-      android:id="@+id/layout_container_winner_list"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="47dp"
-      android:orientation="vertical"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/layout_winner_list_top"
-      tools:layout_height="30dp">
-
-    </LinearLayout>
+    </android.support.constraint.ConstraintLayout>
   </android.support.constraint.ConstraintLayout>
 </android.support.v4.widget.NestedScrollView>

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

@@ -24,14 +24,15 @@
       android:visibility="gone"
       app:layout_constraintBottom_toTopOf="@+id/divider"
       app:layout_constraintTop_toTopOf="parent"
-      tools:visibility="gone">
+      tools:visibility="visible">
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/member_coin_area"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:background="?android:attr/selectableItemBackground"
+        android:paddingStart="7dp"
+        android:paddingEnd="3dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -47,7 +48,7 @@
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintHorizontal_chainStyle="packed"
           app:layout_constraintTop_toTopOf="parent"
-          tools:text="18,744"/>
+          tools:text="6,900"/>
 
         <ImageView
           android:id="@+id/image_view_coin"
@@ -100,7 +101,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:includeFontPadding="false"
+            android:paddingStart="4dp"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/having_coupon"
             android:textColor="@color/C999999"
@@ -112,15 +115,14 @@
             android:id="@+id/text_view_coupon_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:layout_marginEnd="21dp"
             android:includeFontPadding="false"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/zero"
             android:textColor="@color/C000000"
             android:textSize="12sp"
-
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/text_view_coupon"/>
         </android.support.constraint.ConstraintLayout>
@@ -151,10 +153,11 @@
             android:id="@+id/text_view_purchase"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="4dp"
             android:includeFontPadding="false"
             android:lineSpacingExtra="4sp"
+            android:paddingStart="4dp"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/buy_and_reserve"
             android:textColor="@color/C999999"
@@ -167,16 +170,15 @@
             android:id="@+id/text_view_purchase_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:layout_marginEnd="23dp"
             android:includeFontPadding="false"
             android:lineSpacingExtra="4sp"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/zero"
             android:textColor="@color/C000000"
             android:textSize="12sp"
-
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/text_view_purchase"/>
         </android.support.constraint.ConstraintLayout>
@@ -206,10 +208,11 @@
             android:id="@+id/text_view_event"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="4dp"
             android:includeFontPadding="false"
             android:lineSpacingExtra="4sp"
+            android:paddingStart="4dp"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/menu_category2"
             android:textColor="@color/C999999"
@@ -221,10 +224,10 @@
             android:id="@+id/text_view_event_count"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:includeFontPadding="false"
             android:lineSpacingExtra="4sp"
             android:paddingTop="10dp"
+            android:paddingEnd="4dp"
             android:paddingBottom="10dp"
             android:text="@string/zero"
             android:textColor="@color/C000000"
@@ -245,7 +248,7 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent"
-      tools:visibility="visible">
+      tools:visibility="gone">
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/guest_coin_area"

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

@@ -99,6 +99,7 @@
           android:lineSpacingExtra="6sp"
           android:textColor="@color/C666666"
           android:textSize="14sp"
+          android:textAlignment="center"
           tools:text="- 일시 : 2018년 5월 27일(일) 04:00~07:00 점검 시간동안 해당 메뉴를\n 이용할 수 없는 점 양해부탁드립니다. 점검 시간동안 해당 메뉴를\n 이용할 수 없는 점 양해부탁드립니다."
           />