[코인][New] 마이 메인, 추천 상품 레이아웃 수정

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainFragment.java

@@ -20,6 +20,7 @@ import kr.co.zumo.app.lifeplus.bean.api.CategoryBannerBean;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopGoodsBean;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopRecommendBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.IEventListener;
 import kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView;
@@ -110,19 +111,17 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
   @Override
   public void draw(CoopRecommendBean coopRecommendBean) {
     CoopGoodsBean goodsNow = coopRecommendBean.getGoodsNow();
-    if (null != goodsNow) {
+    if (null != goodsNow && goodsNow.getPrice() > 0 && StringUtil.isFull(goodsNow.getName())) {
       // 지금 살 수 있어요.
       goodsNow.setType(CoopGoodsBean.TYPE_GOODS_NOW);
       drawCoopGoodsList(goodsNow);
-
     }
 
     CoopGoodsBean goodsMore = coopRecommendBean.getGoodsMore();
-    if (null != goodsMore) {
+    if (null != goodsMore && goodsMore.getPrice() > 0 && StringUtil.isFull(goodsMore.getName())) {
       // 조금만 더 모아요.
       goodsMore.setType(CoopGoodsBean.TYPE_GOODS_MORE);
       drawCoopGoodsList(goodsMore);
-
     }
   }
 

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

@@ -13,31 +13,35 @@
     android:layout_marginStart="24dp"
     android:layout_marginTop="30dp"
     android:lineSpacingExtra="6sp"
-    android:text="@string/my_coin_now_buy_it"
     android:textColor="@color/C333333"
     android:textSize="15sp"
     android:textStyle="bold"
     app:layout_constraintBottom_toTopOf="@+id/layout_coops_recommend"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
+    tools:text="@string/my_coin_now_buy_it"
     />
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_coops_recommend"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="0dp"
+    android:padding="0dp"
     android:layout_marginTop="13dp"
+    app:layout_constraintHeight_default="wrap"
     app:layout_constraintTop_toBottomOf="@+id/text_view_buy_text">
 
     <ImageView
       android:id="@+id/image_view_coupon_shape"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="125dp"
       android:layout_marginStart="25dp"
       android:layout_marginEnd="25dp"
       android:scaleType="fitXY"
+      app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent"
       app:srcCompat="@drawable/ic_coupon_shape"/>
 
     <ImageView
@@ -64,7 +68,7 @@
       android:textSize="11sp"
       app:layout_constraintBottom_toTopOf="@+id/text_view_product"
       app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb"
-      app:layout_constraintTop_toTopOf="@+id/layout_coops_recommend"
+      app:layout_constraintTop_toTopOf="@+id/image_view_coupon_shape"
       tools:text="@string/my_coin_example_store_1"
       />
 
@@ -74,7 +78,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="31dp"
       android:layout_marginTop="4dp"
-      android:lineSpacingExtra="6sp"
+      android:lineSpacingExtra="2sp"
       android:maxWidth="120dp"
       android:maxLines="2"
       android:textColor="@color/C000000"
@@ -90,12 +94,10 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="31dp"
       android:layout_marginTop="8dp"
-      android:layout_marginBottom="19dp"
       android:lineSpacingExtra="6sp"
       android:textColor="@color/C000000"
       android:textSize="15sp"
       android:textStyle="bold"
-      app:layout_constraintBottom_toBottomOf="@+id/image_view_coupon_shape"
       app:layout_constraintEnd_toStartOf="@+id/image_view_coin"
       app:layout_constraintHorizontal_chainStyle="spread_inside"
       app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb"
@@ -107,6 +109,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="3dp"
+      android:paddingTop="3dp"
       app:layout_constraintBottom_toBottomOf="@+id/text_view_price"
       app:layout_constraintStart_toEndOf="@+id/text_view_price"
       app:layout_constraintTop_toTopOf="@+id/text_view_price"

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

@@ -4,9 +4,10 @@
   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:layout_height="match_parent"
+  android:fillViewport="true">
 
-  <LinearLayout
+  <android.support.constraint.ConstraintLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
@@ -76,10 +77,10 @@
           android:layout_marginBottom="30dp"
           android:gravity="end"
           android:lineSpacingExtra="4sp"
-          android:text="@string/my_coin_detail_go"
+          android:paddingStart="10dp"
           android:paddingTop="10dp"
           android:paddingBottom="10dp"
-          android:paddingStart="10dp"
+          android:text="@string/my_coin_detail_go"
           android:textColor="@color/C666666"
           android:textSize="12sp"
           app:layout_constraintBottom_toBottomOf="parent"
@@ -92,8 +93,8 @@
           android:layout_height="wrap_content"
           android:layout_marginEnd="19dp"
           android:paddingTop="10dp"
-          android:paddingBottom="10dp"
           android:paddingEnd="10dp"
+          android:paddingBottom="10dp"
           app:layout_constraintBottom_toBottomOf="@+id/text_view_my_coin_detail"
           app:layout_constraintEnd_toEndOf="@+id/layout_my_coin"
           app:layout_constraintTop_toTopOf="@+id/text_view_my_coin_detail"
@@ -104,13 +105,14 @@
     <LinearLayout
       android:id="@+id/layout_coops_recommend"
       android:layout_width="match_parent"
-      android:layout_height="421dp"
+      android:layout_height="0dp"
       android:orientation="vertical"
+      android:paddingBottom="45dp"
+      app:layout_constrainedHeight="true"
       app:layout_constraintBottom_toTopOf="@+id/coin_banner_view"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/layout_container_my_coin">
-
     </LinearLayout>
 
     <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView
@@ -123,5 +125,5 @@
       app:layout_constraintTop_toBottomOf="@+id/layout_coops_recommend"
       tools:background="@color/C666666"/>
 
-  </LinearLayout>
+  </android.support.constraint.ConstraintLayout>
 </android.support.v4.widget.NestedScrollView>