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

# Conflicts:
#	app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

app/src/main/java/kr/co/zumo/app/lifeplus/model/MyCoinModel.java

@@ -0,0 +1,38 @@
+package kr.co.zumo.app.lifeplus.model;
+
+/**
+ * MyCoinModel
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public class MyCoinModel extends  Model {
+  @Override
+  protected void destroyInternal() {
+
+  }
+
+  @Override
+  protected void startInternal() {
+
+  }
+
+  @Override
+  protected void stopInternal() {
+
+  }
+
+  @Override
+  protected void resumeInternal() {
+
+  }
+
+  @Override
+  protected void pauseInternal() {
+
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/Event.java

@@ -65,13 +65,14 @@ public class Event {
   public static final int BUCKET = 37;
   public static final int MY_COIN = 38;
   public static final int MY = 39;
+  public static final int TOGGLE = 40;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({
     NONE, CLICK, BACK, SIGN_UP, LOGIN, CHECK, UNCHECK, JOINED, TUTORIAL_LEFT, TUTORIAL_RIGHT,
     RETRY, INPUT_PIN, NETWORK_CONNECTED, CHANGED, INIT, DETAIL, ERROR, UNLOCK, RESET,
     SUCCESS, FAIL, CANCEL, EMAIL_CLICK, SPECIAL_CODE_CLICK, CONFIRM, RESULT, FAQ, DELETE,
-    COMPLETED, TUTORIAL_END, EXIT, START, SETTING, BUCKET, MY_COIN, MY,
+    COMPLETED, TUTORIAL_END, EXIT, START, SETTING, BUCKET, MY_COIN, MY, TOGGLE
   })
   public @interface ID {}
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/IMyCoinView.java

@@ -0,0 +1,16 @@
+package kr.co.zumo.app.lifeplus.view;
+
+/**
+ * IMyCoinView
+ * <pre>
+ * </pre>
+ *
+ * @author 하세미
+ * @version 1.0
+ * @history 하세미   [2018-10-17]   [최초 작성]
+ * @since 2018-10-17
+ */
+public interface IMyCoinView extends  IView {
+
+  void doClickFilter();
+}

app/src/main/java/kr/co/zumo/app/lifeplus/view/fragment/my/coin/MyCoinFragment.java

@@ -10,6 +10,8 @@ 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 java.util.ArrayList;
 import java.util.List;
@@ -17,7 +19,9 @@ import java.util.List;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.MyCoinBean;
 import kr.co.zumo.app.lifeplus.manager.ActionBarManager;
-import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.model.MyCoinModel;
+import kr.co.zumo.app.lifeplus.view.Event;
+import kr.co.zumo.app.lifeplus.view.IMyCoinView;
 import kr.co.zumo.app.lifeplus.view.fragment.FragmentBase;
 import kr.co.zumo.app.lifeplus.view.fragment.setting.SettingExpandableListViewDecoration;
 import kr.co.zumo.app.lifeplus.view.presenter.MyCoinPresenter;
@@ -32,9 +36,12 @@ import kr.co.zumo.app.lifeplus.view.presenter.MyCoinPresenter;
  * @history 하세미   [2018-10-17]   [최초 작성]
  * @since 2018-10-17
  */
-public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
+public class MyCoinFragment extends FragmentBase<MyCoinPresenter> implements IMyCoinView {
 
   private RecyclerView recyclerViewCoinList;
+  private LinearLayout layoutFilterContents;
+  private RelativeLayout filterDivider;
+  private View viewDivider;
   private ImageView imageViewFilter;
   private List<MyCoinBean> myCoinBeanList;
 
@@ -48,7 +55,11 @@ public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     imageViewFilter = findViewById(R.id.image_view_filter);
-    //imageViewFilter.setOnClickListener(view -> {presenter.onEvent();});
+    layoutFilterContents = findViewById(R.id.layout_filter_contents);
+    viewDivider = findViewById(R.id.view_divider);
+    filterDivider = findViewById(R.id.filter_divider);
+
+    imageViewFilter.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.TOGGLE).build());});
     doDummyData();
     recyclerViewCoinList = findViewById(R.id.recycler_view_coin_list);
     MyCoinListViewAdapter adapter = new MyCoinListViewAdapter(getActivity(), myCoinBeanList);
@@ -74,16 +85,25 @@ public class MyCoinFragment extends FragmentBase<MyCoinPresenter> {
 
   }
 
-  public void doDummyData(){
+  public void doDummyData() {
     myCoinBeanList = new ArrayList<>();
-    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" ));
+    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
   protected MyCoinPresenter definePresenter() {
-    return new MyCoinPresenter(getModel(BlankModel.class), this);
+    return new MyCoinPresenter(getModel(MyCoinModel.class), this);
+  }
+
+  @Override
+  public void doClickFilter() {
+    layoutFilterContents.setVisibility(layoutFilterContents.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
+    filterDivider.setVisibility(layoutFilterContents.getVisibility() == View.GONE ? View.GONE: View.VISIBLE);
+
+    viewDivider.setVisibility(layoutFilterContents.getVisibility() == View.GONE ? View.VISIBLE : View.GONE);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/presenter/MyCoinPresenter.java

@@ -1,9 +1,9 @@
 package kr.co.zumo.app.lifeplus.view.presenter;
 
-import kr.co.zumo.app.lifeplus.model.BlankModel;
+import kr.co.zumo.app.lifeplus.model.MyCoinModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.view.Event;
-import kr.co.zumo.app.lifeplus.view.IView;
+import kr.co.zumo.app.lifeplus.view.IMyCoinView;
 import kr.co.zumo.app.lifeplus.view.command.FragmentChangeCommand;
 
 /**
@@ -16,9 +16,9 @@ import kr.co.zumo.app.lifeplus.view.command.FragmentChangeCommand;
  * @history 하세미   [2018-10-17]   [최초 작성]
  * @since 2018-10-17
  */
-public class MyCoinPresenter extends Presenter<BlankModel, IView> {
+public class MyCoinPresenter extends Presenter<MyCoinModel, IMyCoinView> {
 
-  public MyCoinPresenter(BlankModel model, IView view) {
+  public MyCoinPresenter(MyCoinModel model, IMyCoinView view) {
     super(model, view);
   }
 
@@ -55,7 +55,14 @@ public class MyCoinPresenter extends Presenter<BlankModel, IView> {
 
   @Override
   protected void onEventInternal(Event event) {
-
+    switch (event.getEventId()) {
+      case Event.TOGGLE:
+        view.doClickFilter();
+        break;
+      default:
+        break;
+
+    }
   }
 
   @Override

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

@@ -1,361 +1,406 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
-  xmlns:tools="http://schemas.android.com/tools"
   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="match_parent"
   android:orientation="vertical">
 
 
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:background="@color/CF8F8F8"
-      >
+  <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/CF8F8F8"
+    >
 
-      <RelativeLayout
+    <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="117dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="30dp"
-        android:layout_marginTop="25dp"
-        android:layout_marginEnd="30dp"
-        android:layout_marginBottom="25dp"
-        android:background="@color/CFFFFFF">
+        android:layout_marginTop="20dp"
+        android:lineSpacingExtra="10sp"
+        android:text="6,900"
+        android:textColor="@color/C000000"
+        android:textSize="25sp"
+        />
 
-        <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: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: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"
+        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"
 
-        <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"/>
+        app:srcCompat="@drawable/icon_coin"/>
 
-        <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"/>
+      <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"/>
 
-        <ImageView
-          android:id="@+id/image_view_coin_detail"
-          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: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"/>
 
-        <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>
+      <ImageView
+        android:id="@+id/image_view_coin_detail"
+        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"/>
 
-    <RelativeLayout
+      <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>
+
+  <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">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:lineSpacingExtra="4sp"
+      android:text="조회결과 5건"
+      android:textColor="@color/C999999"
+      android:textSize="12sp"
+      />
+
+    <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"
+      />
+
+    <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"
+      />
+
+    <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>
+
+  <!--기준 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="gone"
+    />
+
+  <!--필터 클릭시 divider-->
+  <RelativeLayout
+  android:id="@+id/filter_divider"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:layout_gravity="center"
+  android:orientation="horizontal"
+  android:visibility="gone"
+  tools:visibility="visible"
+  >
+  <View
+    android:id="@+id/filter_divider1"
+    android:layout_width="31dp"
+    android:layout_height="1dp"
+    android:layout_alignParentEnd="true"
+    android:layout_centerVertical="true"
+    android:background="@color/C000000"/>
+
+  <ImageView
+    android:id="@+id/image_view_arrow"
+    android:layout_width="7dp"
+    android:layout_height="7dp"
+    android:layout_marginStart="-1.5dp"
+    android:layout_marginEnd="-1.5dp"
+    android:layout_marginRight="-1dp"
+    android:layout_toLeftOf="@+id/filter_divider1"
+      android:rotation="90"
+      app:srcCompat="@drawable/icon_header_back"/>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="1dp"
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:layout_marginStart="0dp"
+      android:layout_marginEnd="0dp"
+      android:layout_toStartOf="@+id/image_view_arrow"
+      android:layout_toEndOf="@id/image_view_arrow"
+      android:background="@color/C000000"/>
+  </RelativeLayout>
+
+  <LinearLayout
+    android:id="@+id/layout_filter_contents"
+    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:visibility="gone"
+    tools:visibility="visible"
+    >
+
+    <RadioGroup
       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:orientation="horizontal"
+      android:weightSum="5">
 
-      <TextView
-        android:layout_width="wrap_content"
+      <RadioButton
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:background="@drawable/custom_rectangle_radio_selector"
+        android:button="@null"
         android:lineSpacingExtra="4sp"
-        android:text="조회결과 5건"
-        android:textColor="@color/C999999"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/one_week"
+        android:textAlignment="center"
+        android:textColor="@drawable/my_faq_radio_text_selector"
         android:textSize="12sp"
         />
 
-      <TextView
-        android:layout_width="wrap_content"
+      <RadioButton
+        android:layout_width="0dp"
         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:layout_weight="1"
+        android:background="@drawable/custom_rectangle_radio_selector"
+        android:button="@null"
+        android:lineSpacingExtra="4sp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/one_month"
+        android:textAlignment="center"
+        android:textColor="@drawable/my_faq_radio_text_selector"
         android:textSize="12sp"
         />
 
-      <TextView
-        android:id="@+id/text_view_mark"
-        android:layout_width="wrap_content"
+      <RadioButton
+        android:layout_width="0dp"
         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:layout_weight="1"
+        android:background="@drawable/custom_rectangle_radio_selector"
+        android:button="@null"
+        android:lineSpacingExtra="4sp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/three_month"
+        android:textAlignment="center"
+        android:textColor="@drawable/my_faq_radio_text_selector"
         android:textSize="12sp"
         />
 
-      <TextView
-        android:id="@+id/text_view_select_date2"
-        android:layout_width="wrap_content"
+      <RadioButton
+        android:layout_width="0dp"
         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:layout_weight="1"
+        android:background="@drawable/custom_rectangle_radio_selector"
+        android:button="@null"
+        android:lineSpacingExtra="4sp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/six_month"
+        android:textAlignment="center"
+        android:textColor="@drawable/my_faq_radio_text_selector"
         android:textSize="12sp"
         />
 
-      <ImageView
-        android:id="@+id/image_view_filter"
-        android:layout_width="wrap_content"
+      <RadioButton
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        app:srcCompat="@drawable/icon_filter"
+        android:layout_weight="1"
+        android:background="@drawable/custom_rectangle_radio_selector"
+        android:button="@null"
+        android:lineSpacingExtra="4sp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:text="@string/one_year"
+        android:textAlignment="center"
+        android:textColor="@drawable/my_faq_radio_text_selector"
+        android:textSize="12sp"
         />
-    </RelativeLayout>
+    </RadioGroup>
 
-    <View
+    <RadioGroup
       android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_marginStart="25dp"
-      android:layout_marginEnd="25dp"
-      android:background="@color/C000000"/>
+      android:layout_height="wrap_content"
+      android:layout_marginTop="25dp"
+      android:orientation="horizontal">
 
-    <LinearLayout
-      android:id="@+id/layout_filter_contents"
-      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:visibility="gone"
-      tools:visibility="visible"
-      >
-
-
-      <RadioGroup
-        android:layout_width="match_parent"
+      <RadioButton
+        android:id="@+id/radio_button_user"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:weightSum="5">
-
-        <RadioButton
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:background="@drawable/custom_rectangle_radio_selector"
-          android:button="@null"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:text="@string/one_week"
-          android:textAlignment="center"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="12sp"
-          />
-
-        <RadioButton
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:background="@drawable/custom_rectangle_radio_selector"
-          android:button="@null"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:text="@string/one_month"
-          android:textAlignment="center"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="12sp"
-          />
+        android:layout_marginEnd="25dp"
+        android:background="@null"
+        android:button="@null"
+        android:drawableLeft="@drawable/my_faq_radio_selector"
+        android:drawablePadding="8dp"
+        android:lineSpacingExtra="6sp"
+        android:text="@string/all"
+        android:textColor="@drawable/my_faq_radio_text_selector"
+        android:textSize="14sp"
+        />
 
-        <RadioButton
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:background="@drawable/custom_rectangle_radio_selector"
-          android:button="@null"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:text="@string/three_month"
-          android:textAlignment="center"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="12sp"
-          />
+      <RadioButton
+        android:id="@+id/radio_button_coupon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="25dp"
+        android:background="@null"
+        android:button="@null"
+        android:drawableLeft="@drawable/my_faq_radio_selector"
+        android:drawablePadding="8dp"
+        android:lineSpacingExtra="6sp"
+        android:text="@string/saving"
+        android:textColor="@drawable/my_faq_radio_text_selector"
+        android:textSize="14sp"
+        />
 
-        <RadioButton
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:background="@drawable/custom_rectangle_radio_selector"
-          android:button="@null"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:text="@string/six_month"
-          android:textAlignment="center"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="12sp"
-          />
+      <RadioButton
+        android:id="@+id/radio_benefit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="25dp"
+        android:background="@null"
+        android:button="@null"
+        android:drawableLeft="@drawable/my_faq_radio_selector"
+        android:drawablePadding="8dp"
+        android:lineSpacingExtra="6sp"
+        android:text="@string/use"
+        android:textColor="@drawable/my_faq_radio_text_selector"
+        android:textSize="14sp"
+        />
+    </RadioGroup>
 
-        <RadioButton
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_weight="1"
-          android:background="@drawable/custom_rectangle_radio_selector"
-          android:button="@null"
-          android:lineSpacingExtra="4sp"
-          android:paddingTop="8dp"
-          android:paddingBottom="8dp"
-          android:text="@string/one_year"
-          android:textAlignment="center"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="12sp"
-          />
-      </RadioGroup>
+    <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="19dp"
+      android:orientation="vertical">
 
-      <RadioGroup
+      <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="25dp"
-        android:orientation="horizontal">
-
-        <RadioButton
-          android:id="@+id/radio_button_user"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="25dp"
-          android:background="@null"
-          android:button="@null"
-          android:drawableLeft="@drawable/my_faq_radio_selector"
-          android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
-          android:text="@string/all"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="14sp"
-          />
+        android:orientation="horizontal"
+        >
 
-        <RadioButton
-          android:id="@+id/radio_button_coupon"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginEnd="25dp"
-          android:background="@null"
-          android:button="@null"
-          android:drawableLeft="@drawable/my_faq_radio_selector"
-          android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
-          android:text="@string/saving"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="14sp"
+        <ImageView
+          android:layout_width="2dp"
+          android:layout_height="2dp"
+          android:layout_gravity="center"
+          android:layout_marginRight="5dp"
+          android:src="@drawable/rectangle"
           />
 
-        <RadioButton
-          android:id="@+id/radio_benefit"
+        <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginEnd="25dp"
-          android:background="@null"
-          android:button="@null"
-          android:drawableLeft="@drawable/my_faq_radio_selector"
-          android:drawablePadding="8dp"
-          android:lineSpacingExtra="6sp"
-          android:text="@string/use"
-          android:textColor="@drawable/my_faq_radio_text_selector"
-          android:textSize="14sp"
+          android:lineSpacingExtra="4sp"
+          android:text="@string/select_coin_possible_message"
+          android:textColor="#999999"
+          android:textSize="12sp"
           />
-      </RadioGroup>
-
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="19dp"
-        android:orientation="vertical">
-
-        <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:orientation="horizontal"
-          >
-
-          <ImageView
-            android:layout_width="2dp"
-            android:layout_height="2dp"
-            android:layout_gravity="center"
-            android:layout_marginRight="5dp"
-            android:src="@drawable/rectangle"
-            />
-
-          <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:lineSpacingExtra="4sp"
-            android:text="@string/select_coin_possible_message"
-            android:textColor="#999999"
-            android:textSize="12sp"
-            />
-        </LinearLayout>
-
       </LinearLayout>
-    </LinearLayout>
 
-    <android.support.v7.widget.RecyclerView
-      android:id="@+id/recycler_view_coin_list"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="25dp"
-      android:layout_marginEnd="25dp"/>
-  </LinearLayout>
+    </LinearLayout>
+  </LinearLayout>
+
+  <android.support.v7.widget.RecyclerView
+    android:id="@+id/recycler_view_coin_list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="25dp"
+    android:layout_marginEnd="25dp"/>
+</LinearLayout>