Browse Source

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

hyodong.min 7 years ago
parent
commit
6f11ead6d2

+ 35 - 34
app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MoreInfoDialog.java

@@ -74,41 +74,42 @@ public class MoreInfoDialog extends DialogBottomBase<ICustomDialogListener<MoreI
 
     for (int i = 0; i < contentsMoreInfoBeanList.size(); i++) {
       CustomMoreInfoView customMoreInfoView = null;
-
       ContentsMoreInfoBean contentsMoreInfoBean = contentsMoreInfoBeanList.get(i);
-      switch (contentsMoreInfoBean.getDetailType()) {
-        case PERIOD_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_date, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case ORGANIZATION_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case AGE_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case GUEST_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_cast, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case TIME_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_time, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case PARKING_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_parking, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case MENU_DETAIL_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_menu, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case PHONE_INFO:
-          getView().findViewById(R.id.image_view_call_info).setVisibility(View.VISIBLE);
-          phoneNumber = contentsMoreInfoBean.getMoreInfo();
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
-          break;
-        case ADDRESS_INFO:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_audience, contentsMoreInfoBean.getMoreInfo());
-          break;
-        default:
-          customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
-          break;
+      if (null != contentsMoreInfoBean.getMoreInfo() && !contentsMoreInfoBean.getMoreInfo().trim().equals("")) {
+        switch (contentsMoreInfoBean.getDetailType()) {
+          case PERIOD_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_date, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case ORGANIZATION_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case AGE_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case GUEST_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_cast, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case TIME_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_time, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case PARKING_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_parking, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case MENU_DETAIL_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_menu, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case PHONE_INFO:
+            getView().findViewById(R.id.image_view_call_info).setVisibility(View.VISIBLE);
+            phoneNumber = contentsMoreInfoBean.getMoreInfo();
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
+            break;
+          case ADDRESS_INFO:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_audience, contentsMoreInfoBean.getMoreInfo());
+            break;
+          default:
+            customMoreInfoView = new CustomMoreInfoView(getActivity(), R.drawable.icon_info_info, contentsMoreInfoBean.getMoreInfo());
+            break;
+        }
       }
       if (null != customMoreInfoView) {
         layoutMoreInfoContainer.addView(customMoreInfoView);

+ 10 - 67
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailAdapter.java

@@ -26,9 +26,6 @@ import kr.co.zumo.app.lifeplus.view.IEventListener;
  */
 public class MyCoinDetailAdapter extends RecyclerView.Adapter<MyCoinDetailViewHolder> {
 
-  private static final int FILTER_TYPE = 0;
-  private static final int ITEM_TYPE = 1;
-  private static final int DATA_SIZE = 5;
   private IEventListener listener;
   private Context context;
   private List<MyCoinBean> myCoinBeanList;
@@ -42,79 +39,25 @@ public class MyCoinDetailAdapter extends RecyclerView.Adapter<MyCoinDetailViewHo
   @NonNull
   @Override
   public MyCoinDetailViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-    View view;
-    switch (viewType) {
-      case FILTER_TYPE:
-        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_coin_filter_view, parent, false);
-        return new MyCoinDetailFilterViewHolder(view);
-      case ITEM_TYPE:
-        view = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_coin_detail_view, parent, false);
-        return new MyCoinDetailItemViewHolder(view);
-      default:
-        break;
-    }
-    return null;
+    View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.my_coin_detail_view, parent, false);
+    return new MyCoinDetailItemViewHolder(view);
   }
 
   @Override
   public void onBindViewHolder(@NonNull MyCoinDetailViewHolder holder, int position) {
-    switch (getItemViewType(position)) {
-      case FILTER_TYPE:
-        holder.bind(new IEventListener() {
-          @Override
-          public void onEvent(Event event) {
-            listener.onEvent(event);
-          }
-        });
-        break;
-      case ITEM_TYPE:
-        MyCoinBean bean = myCoinBeanList.get(position - 1);
-        holder.bind(bean, new IEventListener() {
-          @Override
-          public void onEvent(Event event) {
-            //listener.onEvent(event);
-          }
-        });
-        break;
-      default:
-        break;
-    }
-
-  }
-
-  @Override
-  public void onBindViewHolder(@NonNull MyCoinDetailViewHolder holder, int position, @NonNull List<Object> payloads) {
-    if (payloads.isEmpty()) {
-      super.onBindViewHolder(holder, position, payloads);
-    }
-    else {
-      for (Object payload : payloads) {
-        if (payload instanceof Boolean) {
-          boolean clickFlag = (boolean) payload;
-          if ( holder instanceof MyCoinDetailFilterViewHolder) {
-            holder.setFilterContents(clickFlag);
-          }
-        }
+    MyCoinBean bean = myCoinBeanList.get(position);
+    holder.bind(bean, new IEventListener() {
+      @Override
+      public void onEvent(Event event) {
+        //listener.onEvent(event);
       }
-    }
+    });
   }
 
-  @Override
-  public int getItemCount() {
-    return DATA_SIZE;
-  }
 
   @Override
-  public int getItemViewType(int position) {
-    switch (position) {
-      case 0:
-        return FILTER_TYPE;
-      default:
-        return ITEM_TYPE;
-    }
+  public int getItemCount() {
+    return myCoinBeanList.size();
   }
 
-  public void updateFilterContents(boolean clickFlag) {
-      notifyItemChanged(0, clickFlag);
-  }
 }

+ 9 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/coin/MyCoinDetailFragment.java

@@ -4,13 +4,13 @@ import android.graphics.Color;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -38,7 +38,7 @@ import kr.co.zumo.app.lifeplus.view.screen.setting.SettingExpandableListViewDeco
 public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> implements IMyCoinView {
 
   private RecyclerView recyclerViewCoinList;
-  private LinearLayout layoutFilterContents;
+  private ConstraintLayout layoutFilterContents;
   private RelativeLayout filterDivider;
   private View viewDivider;
   private ImageView imageViewCoinInformationDialog;
@@ -113,6 +113,11 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
     myCoinBeanList.add(new MyCoinBean("메소드 친환경 핸드워시 ", "2018.05.27", "사용", "-4,100"));
     myCoinBeanList.add(new MyCoinBean("호텔앤리조트 가평 힐링 스토리\n" + "펜션 1박", "2018.05.27", "사용", "-4,100"));
     myCoinBeanList.add(new MyCoinBean("스타벅스 아이스 아메리카노 Tall", "2018.05.27", "사용", "-4,100"));
+    myCoinBeanList.add(new MyCoinBean("스타벅스 아이스 아메리카노 Tall", "2018.05.27", "사용", "-4,100"));
+    myCoinBeanList.add(new MyCoinBean("4월 출석체크 미션 성공", "2018.05.27", "적립", "+1,500"));
+    myCoinBeanList.add(new MyCoinBean("메소드 친환경 핸드워시 ", "2018.05.27", "사용", "-4,100"));
+    myCoinBeanList.add(new MyCoinBean("호텔앤리조트 가평 힐링 스토리\n" + "펜션 1박", "2018.05.27", "사용", "-4,100"));
+    myCoinBeanList.add(new MyCoinBean("스타벅스 아이스 아메리카노 Tall", "2018.05.27", "사용", "-4,100"));
   }
 
   @Override
@@ -139,6 +144,7 @@ public class MyCoinDetailFragment extends FragmentBase<MyCoinDetailPresenter> im
   public void doClickFilter() {
     clickFlag = !clickFlag;
     viewDivider.setVisibility(clickFlag? View.GONE : View.VISIBLE);
-    adapter.updateFilterContents(clickFlag);
+    layoutFilterContents.setVisibility(clickFlag? View.VISIBLE : View.GONE);
+
   }
 }

+ 209 - 159
app/src/main/res/layout/fragment_my_coin_detail.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<android.support.design.widget.CoordinatorLayout
   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"
@@ -7,190 +7,240 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-
-  <LinearLayout
+  <android.support.design.widget.AppBarLayout
+    android:id="@+id/app_bar_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/CF8F8F8"
-    >
+    android:background="@null"
+    app:elevation="0dp">
+
+    <android.support.design.widget.CollapsingToolbarLayout
+      android:id="@+id/collapsing_tool_bar"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      app:layout_scrollFlags="scroll|exitUntilCollapsed">
+
+
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/CF8F8F8"
+        >
+
+        <RelativeLayout
+          android:layout_width="wrap_content"
+          android:layout_height="117dp"
+          android:layout_marginStart="30dp"
+          android:layout_marginTop="25dp"
+          android:layout_marginEnd="30dp"
+          android:layout_marginBottom="25dp"
+          android:background="@color/CFFFFFF">
+
+          <TextView
+            android:id="@+id/text_view_coin_detail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="20dp"
+            android:lineSpacingExtra="10sp"
+            android:text="6,900"
+            android:textColor="@color/C000000"
+            android:textSize="25sp"
+            />
+
+          <ImageView
+            android:id="@+id/image_view_coin1"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="31dp"
+            android:layout_toRightOf="@+id/text_view_coin_detail"
+            app:srcCompat="@drawable/icon_coin"/>
+
+          <ImageView
+            android:id="@+id/image_view_coin_information_pop_up"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_alignTop="@+id/image_view_coin1"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="0dp"
+            android:layout_marginEnd="30dp"
+            app:srcCompat="@drawable/icon_info_popup_btn"/>
+
+          <ImageView
+            android:id="@+id/image_view_coin"
+            android:layout_width="14dp"
+            android:layout_height="14dp"
+            android:layout_below="@+id/divider"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="19dp"
+            android:layout_marginEnd="30dp"
+
+            app:srcCompat="@drawable/icon_coin"/>
+
+          <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_alignParentStart="true"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="30dp"
+            android:background="@color/CE5E5E5"/>
+
+          <TextView
+            android:id="@+id/text_view_extinct_coin"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignStart="@+id/text_view_coin_detail"
+            android:layout_alignParentBottom="true"
+            android:layout_marginStart="1dp"
+            android:layout_marginBottom="19dp"
+            android:lineSpacingExtra="4sp"
+            android:text="당월 소멸예정코인"
+            android:textColor="@color/C666666"
+            android:textSize="12sp"/>
+
+          <ImageView
+            android:id="@+id/image_view_extinct_coin_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_marginStart="2dp"
+            android:layout_marginLeft="48dp"
+            android:layout_marginTop="86dp"
+            android:layout_toRightOf="@+id/text_view_extinct_coin"
+            app:srcCompat="@drawable/icon_detail_arrow"/>
+
+          <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/divider"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="3dp"
+            android:layout_toLeftOf="@+id/image_view_coin"
+            android:lineSpacingExtra="6sp"
+            android:text="-410"
+            android:textColor="@color/C000000"
+            android:textSize="16sp"/>
+        </RelativeLayout>
+      </LinearLayout>
+
+      <!--<android.support.v7.widget.Toolbar-->
+      <!--android:id="@+id/flexible.example.toolbar"-->
+      <!--android:layout_width="match_parent"-->
+      <!--android:layout_height="0dp"-->
+      <!--android:layout_gravity="bottom"-->
+      <!--android:visibility="invisible"-->
+      <!--app:elevation="0dp"-->
+      <!--app:layout_collapseMode="pin"-->
+      <!--tools:background="@color/C888888"-->
+      <!--tools:visibility="visible"-->
+      <!--/>-->
+
+    </android.support.design.widget.CollapsingToolbarLayout>
 
     <RelativeLayout
-      android:layout_width="wrap_content"
-      android:layout_height="117dp"
-      android:layout_marginStart="30dp"
-      android:layout_marginTop="25dp"
-      android:layout_marginEnd="30dp"
-      android:layout_marginBottom="25dp"
-      android:background="@color/CFFFFFF">
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="25dp"
+      android:layout_marginTop="33dp"
+      android:layout_marginEnd="25dp"
+      android:layout_marginBottom="11dp"
+      app:layout_collapseMode="pin"
+      tools:background="@color/C888888">
 
       <TextView
-        android:id="@+id/text_view_coin_detail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="30dp"
-        android:layout_marginTop="20dp"
-        android:lineSpacingExtra="10sp"
-        android:text="6,900"
-        android:textColor="@color/C000000"
-        android:textSize="25sp"
+        android:lineSpacingExtra="4sp"
+        android:text="조회결과 5건"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
         />
 
-      <ImageView
-        android:id="@+id/image_view_coin1"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="3dp"
-        android:layout_marginTop="31dp"
-        android:layout_toRightOf="@+id/text_view_coin_detail"
-        app:srcCompat="@drawable/icon_coin"/>
-
-      <ImageView
-        android:id="@+id/image_view_coin_information_pop_up"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:layout_alignTop="@+id/image_view_coin1"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="0dp"
-        android:layout_marginEnd="30dp"
-        app:srcCompat="@drawable/icon_info_popup_btn"/>
-
-      <ImageView
-        android:id="@+id/image_view_coin"
-        android:layout_width="14dp"
-        android:layout_height="14dp"
-        android:layout_below="@+id/divider"
-        android:layout_alignParentEnd="true"
-        android:layout_marginTop="19dp"
-        android:layout_marginEnd="30dp"
-
-        app:srcCompat="@drawable/icon_coin"/>
-
-      <View
-        android:id="@+id/divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="30dp"
-        android:layout_marginEnd="30dp"
-        android:background="@color/CE5E5E5"/>
-
       <TextView
-        android:id="@+id/text_view_extinct_coin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/text_view_coin_detail"
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="1dp"
-        android:layout_marginBottom="19dp"
+        android:layout_toLeftOf="@id/text_view_mark"
         android:lineSpacingExtra="4sp"
-        android:text="당월 소멸예정코인"
-        android:textColor="@color/C666666"
-        android:textSize="12sp"/>
+        android:text="2018.05.01"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        />
 
-      <ImageView
-        android:id="@+id/image_view_extinct_coin_arrow"
+      <TextView
+        android:id="@+id/text_view_mark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="2dp"
-        android:layout_marginLeft="48dp"
-        android:layout_marginTop="86dp"
-        android:layout_toRightOf="@+id/text_view_extinct_coin"
-        app:srcCompat="@drawable/icon_detail_arrow"/>
+        android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
+        android:layout_toLeftOf="@+id/text_view_select_date2"
+        android:lineSpacingExtra="4sp"
+        android:text="~"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        />
 
       <TextView
+        android:id="@+id/text_view_select_date2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/divider"
-        android:layout_marginTop="15dp"
-        android:layout_marginEnd="3dp"
-        android:layout_toLeftOf="@+id/image_view_coin"
-        android:lineSpacingExtra="6sp"
-        android:text="-410"
-        android:textColor="@color/C000000"
-        android:textSize="16sp"/>
-    </RelativeLayout>
-  </LinearLayout>
-
-  <RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="25dp"
-    android:layout_marginTop="33dp"
-    android:layout_marginEnd="25dp"
-    android:layout_marginBottom="11dp">
+        android:layout_marginEnd="9dp"
+        android:layout_toLeftOf="@+id/image_view_filter"
+        android:lineSpacingExtra="4sp"
+        android:text="2018.06.05"
+        android:textColor="@color/C999999"
+        android:textSize="12sp"
+        />
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:lineSpacingExtra="4sp"
-      android:text="조회결과 5건"
-      android:textColor="@color/C999999"
-      android:textSize="12sp"
-      />
+      <ImageView
+        android:id="@+id/image_view_filter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        app:srcCompat="@drawable/icon_filter"
+        />
+    </RelativeLayout>
+  </android.support.design.widget.AppBarLayout>
 
-    <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_toLeftOf="@id/text_view_mark"
-      android:lineSpacingExtra="3.5sp"
-      android:text="2018.05.01"
-      android:textColor="#999999"
-      android:textSize="12sp"
-      />
 
-    <TextView
-      android:id="@+id/text_view_mark"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="4dp"
-      android:layout_marginEnd="4dp"
-      android:layout_toLeftOf="@+id/text_view_select_date2"
-      android:lineSpacingExtra="3.5sp"
-      android:text="~"
-      android:textColor="#999999"
-      android:textSize="12sp"
-      />
+  <!--기준 divider-->
 
-    <TextView
-      android:id="@+id/text_view_select_date2"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginEnd="9dp"
-      android:layout_toLeftOf="@+id/image_view_filter"
-      android:lineSpacingExtra="3.5sp"
-      android:text="2018.06.05"
-      android:textColor="#999999"
-      android:textSize="12sp"
+  <android.support.constraint.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+    <View
+      android:id="@+id/view_divider"
+      android:layout_width="match_parent"
+      app:layout_constraintTop_toTopOf="parent"
+      android:layout_height="1dp"
+      android:layout_marginTop="3dp"
+      android:layout_marginStart="25dp"
+      android:layout_marginEnd="25dp"
+      android:background="@color/C000000"
+      android:visibility="visible"
+      tools:visibility="visible"
       />
 
-    <ImageView
-      android:id="@+id/image_view_filter"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_alignParentEnd="true"
-      app:srcCompat="@drawable/icon_filter"
+    <include
+      layout="@layout/my_coin_filter_view"
+      android:visibility="gone"
+      tools:visibility="visible"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/view_divider"
+      app:layout_constraintBottom_toTopOf="@+id/recycler_view_coin_list"
       />
-  </RelativeLayout>
 
-  <!--기준 divider-->
-  <View
-    android:id="@+id/view_divider"
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:layout_marginStart="25dp"
-    android:layout_marginEnd="25dp"
-    android:background="@color/C000000"
-    android:visibility="visible"
-    tools:visibility="visible"
-    />
-
-
-
-  <android.support.v7.widget.RecyclerView
-    android:id="@+id/recycler_view_coin_list"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"/>
-</LinearLayout>
+    <android.support.v7.widget.RecyclerView
+      app:layout_constraintTop_toBottomOf="@+id/layout_filter_contents"
+      android:id="@+id/recycler_view_coin_list"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
+  </android.support.constraint.ConstraintLayout>
+</android.support.design.widget.CoordinatorLayout>

+ 8 - 8
app/src/main/res/layout/my_coin_filter_view.xml

@@ -3,6 +3,7 @@
   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:id="@+id/layout_filter_contents"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   >
@@ -14,9 +15,8 @@
     android:layout_gravity="center"
     android:orientation="horizontal"
     app:layout_constraintTop_toTopOf="parent"
-    android:visibility="gone"
-    tools:visibility="visible"
     >
+
     <View
       android:id="@+id/filter_divider1"
       android:layout_width="31dp"
@@ -47,18 +47,18 @@
       android:layout_toEndOf="@id/image_view_arrow_my_colin_detail"
       android:background="@color/C000000"/>
   </RelativeLayout>
+
   <LinearLayout
-    app:layout_constraintTop_toBottomOf="@+id/filter_divider"
-    android:id="@+id/layout_filter_contents"
-    tools:visibility="visible"
-    android:visibility="gone"
     android:layout_width="match_parent"
+
     android:layout_height="160dp"
     android:background="@color/CF8F8F8"
     android:orientation="vertical"
     android:paddingStart="25dp"
     android:paddingTop="30dp"
-    android:paddingEnd="25dp">
+    android:paddingEnd="25dp"
+    app:layout_constraintTop_toBottomOf="@+id/filter_divider"
+    tools:visibility="visible">
 
     <RadioGroup
       android:layout_width="match_parent"
@@ -219,7 +219,7 @@
           android:layout_height="wrap_content"
           android:lineSpacingExtra="4sp"
           android:text="@string/select_coin_possible_message"
-          android:textColor="#999999"
+          android:textColor="@color/C999999"
           android:textSize="12sp"
           />
       </LinearLayout>