[마이][Common] 적립/사용코인 필터 레이아웃 수정 및 아이콘 교체

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

@@ -13,7 +13,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import java.util.List;
@@ -41,7 +40,7 @@ public class MyCoinDetailMemberFragment extends FragmentBase<MyCoinDetailPresent
 
   protected RecyclerView recyclerViewCoinList;
   protected ConstraintLayout layoutFilterContents;
-  protected RelativeLayout filterDivider;
+  protected ConstraintLayout filterDivider;
   protected TextView textResultNumber;
   protected View viewDivider;
   protected View viewWhiteDivider;
@@ -69,7 +68,7 @@ public class MyCoinDetailMemberFragment extends FragmentBase<MyCoinDetailPresent
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     layoutFilterContents = findViewById(R.id.layout_filter_contents);
     viewDivider = findViewById(R.id.view_divider);
-    viewWhiteDivider = findViewById(R.id.divider_white);
+    //viewWhiteDivider = findViewById(R.id.divider_white);
     filterDivider = findViewById(R.id.filter_divider);
     imageViewCoinInformationDialog = findViewById(R.id.image_view_coin_information_pop_up);
 
@@ -150,7 +149,7 @@ public class MyCoinDetailMemberFragment extends FragmentBase<MyCoinDetailPresent
   public void doClickFilter() {
     clickFlag = !clickFlag;
     viewDivider.setVisibility(clickFlag ? View.GONE : View.VISIBLE);
-    viewWhiteDivider.setVisibility(clickFlag ? View.GONE : View.VISIBLE);
+    // viewWhiteDivider.setVisibility(clickFlag ? View.GONE : View.VISIBLE);
     layoutFilterContents.setVisibility(clickFlag ? View.VISIBLE : View.GONE);
   }
 

app/src/main/res/drawable/filter_radio_off.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="rectangle">
+      <corners android:radius="2dp"/>
+      <solid android:color="@color/CFFFFFF"/>
+      <stroke android:color="@color/CE5E5E5" android:width="1dp" />
+    </shape>
+  </item>
+</selector>

app/src/main/res/drawable/filter_radio_on.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+    <shape android:shape="rectangle">
+      <corners android:radius="2dp"/>
+      <solid android:color="@color/CFFFFFF"/>
+      <stroke android:color="@color/C000000" android:width="1dp" />
+    </shape>
+  </item>
+</selector>

app/src/main/res/drawable/filter_radio_selector.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/filter_radio_off" android:state_checked="false"/>
+  <item android:drawable="@drawable/filter_radio_on" android:state_checked="true"/>
+</selector>

app/src/main/res/drawable/ic_arrow.xml

@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="8dp"
+        android:height="5dp"
+        android:viewportWidth="32"
+        android:viewportHeight="20">
+  <path
+    android:fillColor="#000"
+    android:fillType="nonZero"
+    android:pathData="M-1287,16H153v4h-1440z"/>
+  <path
+    android:fillColor="#F8F8F8"
+    android:fillType="nonZero"
+    android:pathData="M-2.907,20.808L15.385,2.331l18.292,18.477z"/>
+  <path
+    android:fillColor="#00000000"
+    android:fillType="evenOdd"
+    android:pathData="M-2,21L16,3l18,18"
+    android:strokeWidth="4"
+    android:strokeColor="#000"/>
+</vector>

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

@@ -110,12 +110,12 @@
             android:paddingStart="10dp"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
-            tools:text="@string/coin_extinct_member_title"
             android:textColor="@color/C666666"
             android:textSize="12sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/divider"/>
+            app:layout_constraintTop_toBottomOf="@+id/divider"
+            tools:text="@string/coin_extinct_member_title"/>
 
           <ImageView
             android:id="@+id/image_view_extinct_coin_arrow"
@@ -133,11 +133,11 @@
             android:id="@+id/text_expiring_coin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:lineSpacingExtra="6sp"
             android:paddingStart="7dp"
             android:paddingTop="7dp"
-            android:paddingBottom="7dp"
             android:paddingEnd="3dp"
-            android:lineSpacingExtra="6sp"
+            android:paddingBottom="7dp"
             android:textColor="@color/C000000"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="@+id/image_view_extinct_coin_arrow"
@@ -166,8 +166,7 @@
       android:layout_height="wrap_content"
       android:layout_marginStart="25dp"
       android:layout_marginTop="10dp"
-      android:layout_marginEnd="25dp"
-      android:layout_marginBottom="11dp"
+      android:layout_marginEnd="17dp"
       app:layout_collapseMode="pin">
 
       <TextView
@@ -202,7 +201,7 @@
         android:id="@+id/image_view_filter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="5dp"
+        android:padding="6dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:srcCompat="@drawable/icon_filter"
         />
@@ -236,26 +235,16 @@
       app:layout_constraintTop_toBottomOf="@+id/layout_filter_contents"/>
 
 
-    <View
-      android:id="@+id/divider_white"
-      android:layout_width="match_parent"
-      android:layout_height="3dp"
-      android:background="@color/CFFFFFF"
-      app:layout_constraintBottom_toTopOf="@+id/view_divider"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent"
-      tools:background="@color/C888888"/>
-
     <View
       android:id="@+id/view_divider"
       android:layout_width="match_parent"
       android:layout_height="1dp"
       android:layout_marginStart="25dp"
+      android:layout_marginTop="4dp"
       android:layout_marginEnd="25dp"
       android:background="@color/C000000"
       android:visibility="visible"
-      app:layout_constraintTop_toBottomOf="@+id/divider_white"
+      app:layout_constraintTop_toTopOf="parent"
       tools:visibility="visible"
       />
   </android.support.constraint.ConstraintLayout>

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

@@ -8,7 +8,7 @@
   android:layout_height="wrap_content"
   >
   <!--필터 클릭시 divider-->
-  <RelativeLayout
+  <android.support.constraint.ConstraintLayout
     android:id="@+id/filter_divider"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,34 +19,27 @@
 
     <View
       android:id="@+id/filter_divider1"
-      android:layout_width="31dp"
+      android:layout_width="0dp"
       android:layout_height="1dp"
-      android:layout_alignParentEnd="true"
-      android:layout_centerVertical="true"
-      android:background="@color/C000000"/>
+      android:background="@color/C000000"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/image_view_arrow_my_colin_detail"/>
 
     <ImageView
       android:id="@+id/image_view_arrow_my_colin_detail"
-      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"/>
+      android:layout_width="8dp"
+      android:layout_height="5dp"
+      android:layout_marginEnd="30dp"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:srcCompat="@drawable/ic_arrow"/>
 
     <View
-      android:layout_width="match_parent"
+      android:layout_width="0dp"
       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_my_colin_detail"
-      android:layout_toEndOf="@id/image_view_arrow_my_colin_detail"
-      android:background="@color/C000000"/>
-  </RelativeLayout>
+      android:background="@color/C000000"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toStartOf="@+id/image_view_arrow_my_colin_detail"/>
+  </android.support.constraint.ConstraintLayout>
 
   <LinearLayout
     android:layout_width="match_parent"
@@ -72,11 +65,12 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/custom_rectangle_radio_selector"
+        android:background="@drawable/filter_radio_selector"
         android:button="@null"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
         android:text="@string/one_week"
+        tools:checked="true"
         android:textAlignment="center"
         android:textColor="@drawable/my_faq_radio_text_selector"
         android:textSize="12sp"
@@ -86,7 +80,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/custom_rectangle_radio_selector"
+        android:background="@drawable/filter_radio_selector"
         android:button="@null"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
@@ -100,7 +94,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/custom_rectangle_radio_selector"
+        android:background="@drawable/filter_radio_selector"
         android:button="@null"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
@@ -114,7 +108,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/custom_rectangle_radio_selector"
+        android:background="@drawable/filter_radio_selector"
         android:button="@null"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
@@ -128,7 +122,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:background="@drawable/custom_rectangle_radio_selector"
+        android:background="@drawable/filter_radio_selector"
         android:button="@null"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"