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

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

@@ -4,6 +4,7 @@ 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.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,6 +39,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
   private TextView textCoin;
   private ImageView imageViewArrowMyCoinDetail;
   private MainBannerView mainBannerViewCoin;
+  private ConstraintLayout layoutMyCoin;
   private LinearLayout layoutCoopGoodsContainer;
 
   @Override
@@ -52,11 +54,8 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     imageViewArrowMyCoinDetail = findViewById(R.id.image_view_arrow_my_colin_detail);
     mainBannerViewCoin = findViewById(R.id.coin_banner_view);
     layoutCoopGoodsContainer = findViewById(R.id.layout_coops_recommend);
-
-    textCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
-    textViewMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
-    findViewById(R.id.image_view_coin).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
-    imageViewArrowMyCoinDetail.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
+    layoutMyCoin = findViewById(R.id.layout_my_coin);
+    layoutMyCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
 
   }
 
@@ -132,7 +131,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     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, event -> {
       presenter.onGoodsClick(bean.getGoodsUrl());

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

@@ -11,7 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="19dp"
     android:layout_marginStart="24dp"
-    android:layout_marginTop="30dp"
+    android:layout_marginTop="15dp"
     android:lineSpacingExtra="6sp"
     android:textColor="@color/C333333"
     android:textSize="15sp"
@@ -25,6 +25,7 @@
   <android.support.constraint.ConstraintLayout
     android:id="@+id/layout_coops_recommend"
     android:layout_width="match_parent"
+
     android:layout_height="0dp"
     android:layout_marginTop="13dp"
     android:padding="0dp"
@@ -35,6 +36,7 @@
       android:id="@+id/image_view_coupon_shape"
       android:layout_width="match_parent"
       android:layout_height="125dp"
+      android:layout_marginBottom="15dp"
       android:layout_marginStart="25dp"
       android:layout_marginEnd="25dp"
       android:scaleType="fitXY"

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

@@ -16,10 +16,14 @@
       android:id="@+id/layout_container_my_coin"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:layout_marginBottom="15dp"
       android:background="@color/CF8F8F8"
+      app:layout_constraintBottom_toTopOf="@+id/layout_coops_recommend"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
+      app:layout_constraintTop_toTopOf="parent"
+      app:layout_constraintVertical_bias="0"
+      app:layout_constraintVertical_chainStyle="packed">
 
       <android.support.constraint.ConstraintLayout
         android:id="@+id/layout_my_coin"
@@ -40,7 +44,6 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginStart="30dp"
-          android:background="?android:attr/selectableItemBackground"
           android:includeFontPadding="false"
           android:lineSpacingExtra="0dp"
           android:paddingTop="5dp"
@@ -61,7 +64,6 @@
           android:layout_height="wrap_content"
           android:layout_marginTop="12dp"
           android:layout_marginBottom="8dp"
-          android:background="?android:attr/selectableItemBackground"
           android:paddingStart="3dp"
           android:paddingTop="10dp"
           android:paddingEnd="3dp"
@@ -80,7 +82,6 @@
           android:layout_marginTop="30dp"
           android:layout_marginEnd="2dp"
           android:layout_marginBottom="30dp"
-          android:background="?android:attr/selectableItemBackground"
           android:gravity="end"
           android:includeFontPadding="false"
           android:lineSpacingExtra="0dp"
@@ -100,7 +101,6 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginEnd="19dp"
-          android:background="?android:attr/selectableItemBackground"
           android:paddingTop="10dp"
           android:paddingEnd="10dp"
           android:paddingBottom="10dp"
@@ -114,20 +114,22 @@
     <LinearLayout
       android:id="@+id/layout_coops_recommend"
       android:layout_width="match_parent"
-      android:layout_height="0dp"
+      android:layout_height="wrap_content"
       android:orientation="vertical"
-      android:paddingBottom="40dp"
+      android:paddingBottom="15dp"
       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">
+      app:layout_constraintTop_toBottomOf="@+id/layout_container_my_coin"
+      tools:layout_height="200dp">
     </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="15dp"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"