Jelajahi Sumber

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

hyodong.min 6 tahun lalu
induk
melakukan
ed1c904f7b

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.constraint.ConstraintLayout;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,7 +19,6 @@ import kr.co.zumo.app.lifeplus.bean.api.CoinBannerBean;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopGoodsBean;
 import kr.co.zumo.app.lifeplus.bean.api.coop.CoopRecommendBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.custom.category.banner.MainBannerView;
@@ -58,10 +56,6 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     mainBannerViewCoin = findViewById(R.id.coin_banner_view);
     layoutCoopGoodsContainer = findViewById(R.id.layout_coops_recommend);
     layoutMyCoin = findViewById(R.id.layout_my_coin);
-
-    TypedValue outValue = new TypedValue();
-    getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
-    layoutMyCoin.setForeground(ResourceUtil.getDrawable(getContext(), outValue.resourceId));
     layoutMyCoin.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_DETAIL).build());});
 
   }

+ 6 - 0
app/src/main/res/drawable/bucket_selector.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/rectangle_background_pressed" android:state_pressed="true"/>
+  <item android:drawable="@drawable/rectangle_background_pressed" android:state_focused="true"/>
+  <item android:drawable="@drawable/rectangle_border_ce5e5e5_corner_2"/>
+</selector>

+ 9 - 0
app/src/main/res/drawable/rectangle_background_pressed.xml

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

+ 1 - 1
app/src/main/res/layout/fragment_my_coin_main.xml

@@ -33,7 +33,7 @@
         android:layout_marginTop="25dp"
         android:layout_marginEnd="30dp"
         android:layout_marginBottom="25dp"
-        android:background="@drawable/coin_border"
+        android:background="@drawable/bucket_selector"
         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"

+ 6 - 4
app/src/main/res/layout/my_bucket_list_card_view.xml

@@ -5,14 +5,16 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="@drawable/rectangle_border_ce5e5e5_corner_2"
   android:orientation="vertical"
   >
 
   <android.support.constraint.ConstraintLayout
     android:id="@+id/my_bucket_list_card_view"
     android:layout_width="match_parent"
-    android:layout_height="84dp">
+    android:layout_height="84dp"
+    android:background="@drawable/bucket_selector"
+    android:clickable="true"
+    android:focusable="true">
 
     <TextView
       android:id="@+id/text_view_bucket_title"
@@ -21,11 +23,11 @@
       android:layout_marginStart="23dp"
       android:layout_marginTop="23dp"
       android:layout_marginEnd="20dp"
+      android:ellipsize="end"
       android:lineSpacingExtra="6sp"
+      android:singleLine="true"
       android:textColor="@color/C000000"
       android:textSize="14sp"
-      android:singleLine="true"
-      android:ellipsize="end"
       app:layout_constrainedWidth="true"
       app:layout_constraintEnd_toStartOf="@+id/image_view_bucket_check"
       app:layout_constraintStart_toStartOf="parent"