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

@@ -5,6 +5,7 @@ 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;
@@ -19,6 +20,7 @@ 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;
@@ -47,6 +49,7 @@ public class MyCoinMainFragment extends FragmentBase<MyCoinMainPresenter> implem
     return inflater.inflate(R.layout.fragment_my_coin_main, container, false);
   }
 
+
   @Override
   protected void onAfterActivityCreated(Bundle savedInstanceState) {
     textCoin = findViewById(R.id.text_view_coin_detail);
@@ -55,6 +58,10 @@ 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());});
 
   }
@@ -131,7 +138,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/java/kr/co/zumo/app/lifeplus/view/screen/my/main/MyMainFragment.java

@@ -9,9 +9,11 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -116,8 +118,14 @@ public abstract class MyMainFragment extends FragmentBase<MyMainPresenter> imple
       }
     });
 
+    ImageView banner = findViewById(R.id.image_view_benefit);
     findViewById(R.id.image_view_benefit).setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.BANNER).build());});
 
+    TypedValue outValue = new TypedValue();
+    getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground, outValue, true);
+    banner.setForeground(ResourceUtil.getDrawable(getContext(), outValue.resourceId));
+
+
     textCoin = findViewById(R.id.text_view_my_coin);
     layoutMemberCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});
     layoutMemberCoinArea.setOnClickListener(view -> {presenter.onEvent(new Event.Builder(Event.MY_COIN_MAIN).build());});