Ver código fonte

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

hyodong.min 7 anos atrás
pai
commit
eb16e48314

+ 14 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/coop/CoopGoodsBean.java

@@ -18,6 +18,10 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  * @since 2018. 12. 10.
  */
 public class CoopGoodsBean extends JsonBeanBase {
+
+  public static final int TYPE_GOODS_NOW = 0;
+  public static final int TYPE_GOODS_MORE = 1;
+
   /*
   {
         "brand": "죠스떡복이",
@@ -28,6 +32,8 @@ public class CoopGoodsBean extends JsonBeanBase {
     }
    */
 
+  private int type;
+
   @SerializedName("brand")
   private String brand;
   @SerializedName("name")
@@ -39,6 +45,14 @@ public class CoopGoodsBean extends JsonBeanBase {
   @SerializedName("link")
   private String goodsUrl;
 
+  public int getType() {
+    return type;
+  }
+
+  public void setType(int type) {
+    this.type = type;
+  }
+
   public String getBrand() {
     return brand;
   }

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/coop/CoopRecommendGoodsModule.java

@@ -1,3 +1,4 @@
+
 /*
  * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
  */

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerAdapter.java

@@ -70,4 +70,5 @@ public class MainBannerAdapter extends RecyclerView.Adapter<MainBannerViewHolder
   public int getItemCount() {
     return textImageBeanList.size();
   }
+
 }

+ 7 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/category/banner/MainBannerView.java

@@ -30,6 +30,7 @@ public class MainBannerView extends ConstraintLayout {
 
   private MainBannerAdapter mainBannerAdapter;
   private RecyclerView recyclerView;
+  private boolean isDimed;
 
   public MainBannerView(Context context) {
     super(context);
@@ -44,6 +45,8 @@ public class MainBannerView extends ConstraintLayout {
   }
 
   public void init(Context context, List<CategoryBannerBean> textImageBeanList, IEventListener listener) {
+    isDimed = true;
+
     LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     inflater.inflate(R.layout.main_banner_view, this);
 
@@ -73,4 +76,8 @@ public class MainBannerView extends ConstraintLayout {
     mainBannerAdapter = null;
   }
 
+  public void isNotDimLayout() {
+    this.isDimed = false;
+  }
+
 }

+ 54 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/CoopRecommendGoodsHolder.java

@@ -0,0 +1,54 @@
+package kr.co.zumo.app.lifeplus.view.screen.my.coin;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.bumptech.glide.Glide;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.bean.api.coop.CoopGoodsBean;
+import kr.co.zumo.app.lifeplus.view.IEventListener;
+
+/**
+ * CoopRecommendGoodsHolder
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-12-11]   [최초 작성]
+ * @since 2018-12-11
+ */
+public class CoopRecommendGoodsHolder {
+
+  private static final int TYPE_GOODS_NOW = 0;
+
+  private TextView textViewTitle;
+  private ImageView imageViewCouponImage;
+  private TextView textViewStore;
+  private TextView textViewProduct;
+  private TextView textViewPrice;
+  private ImageView imageViewDetailArrow;
+
+  public CoopRecommendGoodsHolder(View itemView) {
+    textViewTitle = itemView.findViewById(R.id.text_view_buy_text);
+    imageViewCouponImage = itemView.findViewById(R.id.image_view_coupon_thumb);
+    textViewStore = itemView.findViewById(R.id.text_view_store);
+    textViewProduct = itemView.findViewById(R.id.text_view_product);
+    textViewPrice = itemView.findViewById(R.id.text_view_price);
+    imageViewDetailArrow = itemView.findViewById(R.id.image_view_detail_arrow);
+  }
+
+  public void init(CoopGoodsBean bean, IEventListener listener) {
+    textViewTitle.setText(bean.getType() == TYPE_GOODS_NOW ? R.string.my_coin_now_buy_it : R.string.my_coin_collect_title);
+    Glide.with(imageViewCouponImage).load(bean.getImageUrl()).into(imageViewCouponImage);
+    textViewStore.setText(bean.getBrand());
+    textViewProduct.setText(bean.getName());
+    textViewPrice.setText(String.valueOf(bean.getPrice()));
+    //imageViewDetailArrow.setOnClickListener(view -> {listener.onEvent();});
+
+  }
+
+
+}

+ 35 - 12
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainFragment.java

@@ -1,5 +1,6 @@
 package kr.co.zumo.app.lifeplus.view.screen.my.coin;
 
+import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,6 +10,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -40,6 +42,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
   private ImageView imageViewArrowMyCoinDetail;
   private MainBannerView mainBannerViewCoin;
   private List<CategoryBannerBean> imageBeanList;
+  private LinearLayout layoutCoopGoodsContainer;
 
   @Override
   protected View onAfterCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
@@ -54,7 +57,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     textViewMyCoinDetail = findViewById(R.id.text_view_my_coin_detail);
     imageViewArrowMyCoinDetail = findViewById(R.id.image_view_arrow_my_colin_detail);
     mainBannerViewCoin = findViewById(R.id.coin_banner_view);
-
+    layoutCoopGoodsContainer = findViewById(R.id.layout_coops_recommend);
     doBannerDataSetting();
     mainBannerViewCoin.init(getActivity(), imageBeanList, new IEventListener() {
       @Override
@@ -110,21 +113,41 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
 
   @Override
   public void draw(CoopRecommendBean coopRecommendBean) {
-    if (null != coopRecommendBean) {
-      CoopGoodsBean goodsNow = coopRecommendBean.getGoodsNow();
-      if (null != goodsNow) {
-        // 지금 살 수 있어요.
+    CoopGoodsBean goodsNow = coopRecommendBean.getGoodsNow();
+    if (null != goodsNow) {
+      // 지금 살 수 있어요.
+      goodsNow.setType(CoopGoodsBean.TYPE_GOODS_NOW);
+      Log.e("APP#  MyCoinMainFragment | draw", "|" + "들어옴 goodsnow");
+      Log.w("APP# MyCoinMainFragment | draw", "| goodsMore: " + goodsNow.toJson());
+      drawCoopGoodsList(goodsNow);
 
-        Log.w("APP# MyCoinMainFragment | draw", "| goodsNow: " + goodsNow.toJson());
-      }
+    }
+
+    CoopGoodsBean goodsMore = coopRecommendBean.getGoodsMore();
+    if (null != goodsMore) {
+      // 조금만 더 모아요.
+      goodsMore.setType(CoopGoodsBean.TYPE_GOODS_MORE);
+      Log.e("APP#  MyCoinMainFragment | draw", "|" + "들어옴 goodsmore");
+      Log.w("APP# MyCoinMainFragment | draw", "| goodsMore: " + goodsMore.toJson());
+      drawCoopGoodsList(goodsMore);
+
+    }
+  }
 
-      CoopGoodsBean goodsMore = coopRecommendBean.getGoodsMore();
-      if (null != goodsMore) {
-        // 조금만 더 모아요.
 
-        Log.w("APP# MyCoinMainFragment | draw", "| goodsMore: " + goodsMore.toJson());
+  private void drawCoopGoodsList(CoopGoodsBean bean) {
+    Log.e("APP#  MyCoinMainFragment | drawCoopGoodsList", "|" + "emfdjdha");
+    LayoutInflater layoutInflater = (LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+    View coopGoodsView = layoutInflater.inflate(R.layout.coop_good_layout, null);
+    layoutCoopGoodsContainer.addView(coopGoodsView);
+
+    CoopRecommendGoodsHolder holder = new CoopRecommendGoodsHolder(coopGoodsView);
+    holder.init(bean, new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
 
       }
-    }
+    });
   }
 }
+

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinMainModel.java

@@ -80,4 +80,5 @@ public class MyCoinMainModel extends Model {
       }
     });
   }
+
 }

+ 126 - 0
app/src/main/res/layout/coop_good_layout.xml

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+  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="wrap_content">
+
+  <TextView
+    android:id="@+id/text_view_buy_text"
+    android:layout_width="wrap_content"
+    android:layout_height="19dp"
+    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"
+    />
+
+  <android.support.constraint.ConstraintLayout
+    android:id="@+id/layout_coops_recommend"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="13dp"
+    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_marginStart="25dp"
+      android:layout_marginEnd="25dp"
+      android:scaleType="fitXY"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:srcCompat="@drawable/ic_coupon_shape"/>
+
+    <ImageView
+      android:id="@+id/image_view_coupon_thumb"
+      android:layout_width="84dp"
+      android:layout_height="84dp"
+      android:layout_marginStart="28dp"
+      android:scaleType="centerCrop"
+      app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape"
+      app:layout_constraintStart_toStartOf="@+id/image_view_coupon_shape"
+      app:layout_constraintTop_toTopOf="@id/image_view_coupon_shape"
+      app:srcCompat="@drawable/img_coupon_thumb_1"
+      />
+
+    <TextView
+      android:id="@+id/text_view_store"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="32dp"
+      android:layout_marginTop="20dp"
+      android:layout_marginBottom="4dp"
+      android:lineSpacingExtra="5sp"
+      android:textColor="@color/C999999"
+      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"
+      tools:text="@string/my_coin_example_store_1"
+      />
+
+    <TextView
+      android:id="@+id/text_view_product"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="31dp"
+      android:layout_marginTop="4dp"
+      android:lineSpacingExtra="5.5sp"
+      android:maxWidth="100dp"
+      android:maxLines="2"
+      android:textColor="@color/C000000"
+      android:textSize="14sp"
+      app:layout_constraintBottom_toTopOf="@+id/text_view_price"
+      app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_store"
+      tools:text="@string/my_coin_example_product_1"/>
+
+    <TextView
+      android:id="@+id/text_view_price"
+      android:layout_width="wrap_content"
+      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"
+      app:layout_constraintTop_toBottomOf="@+id/text_view_product"
+      tools:text="@string/my_coin_example_price_1"/>
+
+    <ImageView
+      android:id="@+id/image_view_coin"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="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:srcCompat="@drawable/icon_coin"/>
+
+    <ImageView
+      android:id="@+id/image_view_detail_arrow"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:padding="14dp"
+      app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape"
+      app:layout_constraintEnd_toEndOf="@+id/image_view_coupon_shape"
+      app:layout_constraintTop_toTopOf="@+id/image_view_coupon_shape"
+      app:srcCompat="@drawable/icon_arrow_coupon"/>
+
+  </android.support.constraint.ConstraintLayout>
+</android.support.constraint.ConstraintLayout>

+ 27 - 228
app/src/main/res/layout/fragment_my_coin_main.xml

@@ -5,21 +5,26 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
- >
+  android:layout_marginTop="@dimen/action_bar_height"
+  >
 
   <android.support.constraint.ConstraintLayout
-    android:paddingTop="@dimen/action_bar_height"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+
+>
 
     <android.support.constraint.ConstraintLayout
-      android:id="@+id/first_layout"
+      android:id="@+id/layout_container_my_coin"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="@color/CF8F8F8">
+      app:layout_constraintEnd_toEndOf="parent"
+      android:background="@color/CF8F8F8"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
 
       <android.support.constraint.ConstraintLayout
-        android:id="@+id/second_layout"
+        android:id="@+id/layout_my_coin"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
@@ -27,9 +32,10 @@
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="25dp"
         android:background="@drawable/rectangle_border_ce5e5e5"
-        app:layout_constraintBottom_toBottomOf="@+id/first_layout"
-        app:layout_constraintStart_toStartOf="@+id/first_layout"
-        app:layout_constraintTop_toTopOf="@+id/first_layout">
+        app:layout_constraintBottom_toBottomOf="@+id/layout_container_my_coin"
+        app:layout_constraintEnd_toEndOf="@+id/layout_container_my_coin"
+        app:layout_constraintStart_toStartOf="@+id/layout_container_my_coin"
+        app:layout_constraintTop_toTopOf="@+id/layout_container_my_coin">
 
         <TextView
           android:id="@+id/text_view_coin_detail"
@@ -53,11 +59,11 @@
           android:id="@+id/image_view_coin"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
+          android:layout_marginStart="3dp"
           android:layout_marginTop="8dp"
           android:layout_marginBottom="8dp"
           android:paddingEnd="6dp"
           app:layout_constraintBottom_toBottomOf="parent"
-          android:layout_marginStart="3dp"
           app:layout_constraintHorizontal_bias="0.5"
           app:layout_constraintStart_toEndOf="@+id/text_view_coin_detail"
           app:layout_constraintTop_toTopOf="parent"
@@ -88,241 +94,34 @@
           android:layout_marginEnd="29dp"
           android:layout_marginBottom="8dp"
           app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="@+id/second_layout"
+          app:layout_constraintEnd_toEndOf="@+id/layout_my_coin"
           app:layout_constraintTop_toTopOf="parent"
           app:srcCompat="@drawable/icon_arrow_coin"/>
       </android.support.constraint.ConstraintLayout>
-
     </android.support.constraint.ConstraintLayout>
 
-    <TextView
-      android:id="@+id/text_view_buy_text"
-      android:layout_width="wrap_content"
-      android:layout_height="19dp"
-      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"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/first_layout"
-      />
-
-    <android.support.constraint.ConstraintLayout
-      android:id="@+id/third_layout"
+    <LinearLayout
+      android:id="@+id/layout_coops_recommend"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginTop="12.5dp"
-      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_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:scaleType="fitXY"
-        app:layout_constraintEnd_toEndOf="@+id/third_layout"
-        app:layout_constraintStart_toStartOf="@+id/third_layout"
-        app:srcCompat="@drawable/ic_coupon_shape"/>
-
-      <ImageView
-        android:id="@+id/image_view_coupon_thumb1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape"
-        app:layout_constraintStart_toStartOf="@+id/image_view_coupon_shape"
-        app:layout_constraintTop_toTopOf="@id/image_view_coupon_shape"
-        app:srcCompat="@drawable/img_coupon_thumb_1"
-        />
-
-      <TextView
-        android:id="@+id/text_view_store1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="4dp"
-        android:lineSpacingExtra="5sp"
-        android:text="@string/my_coin_example_store_1"
-        android:textColor="@color/C999999"
-        android:textSize="11sp"
-        app:layout_constraintBottom_toTopOf="@+id/text_view_product1"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb1"
-        app:layout_constraintTop_toTopOf="@+id/third_layout"
-        />
-
-      <TextView
-        android:id="@+id/text_view_product1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="31dp"
-        android:layout_marginTop="4dp"
-        android:lineSpacingExtra="5.5sp"
-        android:text="@string/my_coin_example_product_1"
-        android:textColor="@color/C000000"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb1"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_store1"/>
-
-      <TextView
-        android:id="@+id/text_view_price1"
-        android:layout_width="wrap_content"
-        android:layout_height="17dp"
-        android:layout_marginStart="31dp"
-        android:layout_marginTop="8dp"
-        android:lineSpacingExtra="6sp"
-        android:text="@string/my_coin_example_price_1"
-        android:textColor="@color/C000000"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@+id/image_view_coin_2"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb1"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_product1"/>
-
-      <ImageView
-        android:id="@+id/image_view_coin_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="3dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_price1"
-        app:layout_constraintStart_toEndOf="@+id/text_view_price1"
-        app:layout_constraintTop_toTopOf="@+id/text_view_price1"
-        app:srcCompat="@drawable/icon_coin"/>
-
-      <ImageView
-        android:id="@+id/image_view_detail_arrow1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="14dp"
-        app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape"
-        app:layout_constraintEnd_toEndOf="@+id/image_view_coupon_shape"
-        app:layout_constraintTop_toTopOf="@+id/image_view_coupon_shape"
-        app:srcCompat="@drawable/icon_arrow_coupon"/>
-    </android.support.constraint.ConstraintLayout>
-
-    <TextView
-      android:id="@+id/text_view_coin_collect"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="25dp"
-      android:layout_marginTop="30dp"
-      android:lineSpacingExtra="6sp"
-      android:text="@string/my_coin_collect_title"
-      android:textColor="@color/C333333"
-      android:textSize="15sp"
-      app:layout_constraintBottom_toTopOf="@+id/fourth_layout"
+      android:orientation="vertical"
+      app:layout_constraintBottom_toTopOf="@+id/coin_banner_view"
+      app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/third_layout"
-      />
-
-    <android.support.constraint.ConstraintLayout
-      android:id="@+id/fourth_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="12dp"
-      app:layout_constraintTop_toBottomOf="@+id/text_view_coin_collect">
-
-      <ImageView
-        android:id="@+id/image_view_coupon_shape2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="25dp"
-        android:layout_marginEnd="25dp"
-        android:scaleType="fitXY"
-        app:layout_constraintEnd_toEndOf="@+id/fourth_layout"
-        app:layout_constraintStart_toStartOf="@+id/fourth_layout"
-        app:srcCompat="@drawable/ic_coupon_shape"/>
-
-      <ImageView
-        android:id="@+id/image_view_coupon_thumb_2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape2"
-        app:layout_constraintStart_toStartOf="@+id/image_view_coupon_shape2"
-        app:layout_constraintTop_toTopOf="@id/image_view_coupon_shape2"
-        app:srcCompat="@drawable/img_coupon_thumb_2"
-        />
+      app:layout_constraintTop_toBottomOf="@+id/layout_container_my_coin">
 
-      <TextView
-        android:id="@+id/text_view_store2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginBottom="4dp"
-        android:lineSpacingExtra="5sp"
-        android:text="@string/my_coin_example_store_2"
-        android:textColor="@color/C999999"
-        android:textSize="11sp"
-        app:layout_constraintBottom_toTopOf="@+id/text_view_coupon_title"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb_2"
-        app:layout_constraintTop_toTopOf="@+id/fourth_layout"
-        app:layout_constraintVertical_bias="0.727"/>
-
-      <TextView
-        android:id="@+id/text_view_coupon_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="31dp"
-        android:layout_marginTop="4dp"
-        android:lineSpacingExtra="6sp"
-        android:text="@string/my_coin_example_product_2"
-        android:textColor="@color/C000000"
-        android:textSize="14sp"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb_2"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_store2"
-        tools:layout_editor_absoluteY="41dp"/>
-
-      <TextView
-        android:id="@+id/text_view_price2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="31dp"
-        android:layout_marginTop="8dp"
-        android:lineSpacingExtra="6sp"
-        android:text="@string/my_coin_example_price_2"
-        android:textColor="@color/C000000"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@+id/image_view_coin_3"
-        app:layout_constraintStart_toEndOf="@+id/image_view_coupon_thumb_2"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_coupon_title"
-        tools:layout_editor_absoluteY="89dp"/>
-
-      <ImageView
-        android:id="@+id/image_view_coin_3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="3dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_price2"
-        app:layout_constraintStart_toEndOf="@+id/text_view_price2"
-        app:layout_constraintTop_toTopOf="@+id/text_view_price2"
-        app:srcCompat="@drawable/icon_coin"/>
-
-      <ImageView
-        android:id="@+id/image_view_detail_arrow2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="14dp"
-        app:layout_constraintBottom_toBottomOf="@id/image_view_coupon_shape2"
-        app:layout_constraintEnd_toEndOf="@+id/image_view_coupon_shape2"
-        app:layout_constraintTop_toTopOf="@+id/image_view_coupon_shape2"
-        app:srcCompat="@drawable/icon_arrow_coupon"/>
-
-    </android.support.constraint.ConstraintLayout>
+    </LinearLayout>
 
     <kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView
       android:id="@+id/coin_banner_view"
       android:layout_width="match_parent"
       android:layout_height="151dp"
       android:layout_marginTop="45dp"
-      app:layout_constraintTop_toBottomOf="@+id/fourth_layout"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"/>
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/layout_coops_recommend"
+      tools:background="@color/C666666"/>
 
   </android.support.constraint.ConstraintLayout>
 </android.support.v4.widget.NestedScrollView>

+ 2 - 2
app/src/main/res/values/strings.xml

@@ -588,8 +588,8 @@
   <string name="my_coin_now_buy_it"><b>지금 당장 살 수 있어요!</b></string>
   <string name="my_coin_example_store_1">투썸플레이스</string>
   <string name="my_coin_example_product_1">달콤함에 기분업!\n투썸딸기케이크</string>
-  <string name="my_coin_example_price_1"><b>32,000</b></string>
-  <string name="my_coin_collect_title"><b>조금만 더 모아보세요!</b></string>
+  <string name="my_coin_example_price_1">32,000</string>
+  <string name="my_coin_collect_title">조금만 더 모아보세요!</string>
   <string name="my_coin_example_store_2">베스킨라빈스</string>
   <string name="my_coin_example_product_2">달콤함에 기분업!\n아이스크림 케이크</string>
   <string name="my_coin_example_price_2"><b>24,000</b></string>