diff --git a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java index 0d8515317..86fa6dbd6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/relation/adapter/FansViewAdapter.java @@ -77,14 +77,13 @@ public class FansViewAdapter extends BaseQuickAdapter }); TextView tvAttention = baseViewHolder.getView(R.id.attention_img); - GradientDrawable attentionBg = (GradientDrawable) tvAttention.getBackground(); baseViewHolder.setVisible(R.id.attention_img, type == AbstractSelectFriendAction.TYPE_NORMAL); if (IMFriendModel.get().isMyFriend(String.valueOf(fansInfo.getUid()))) { tvAttention.setText("互相关注"); - attentionBg.setColor(mContext.getResources().getColor(R.color.color_CCCCCC)); + tvAttention.setBackgroundResource(R.drawable.bg_common_disable); } else { tvAttention.setText("+关注"); - attentionBg.setColor(mContext.getResources().getColor(R.color.appColor)); + tvAttention.setBackgroundResource(R.drawable.bg_common_confirm); } AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender); diff --git a/app/src/main/res/drawable-xhdpi/ic_message_trash.png b/app/src/main/res/drawable-xhdpi/ic_message_trash.png index a32b67c37..b67229104 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_message_trash.png and b/app/src/main/res/drawable-xhdpi/ic_message_trash.png differ diff --git a/app/src/main/res/layout/fans_list_item_new.xml b/app/src/main/res/layout/fans_list_item_new.xml index 3f5f11640..0bbfe6108 100644 --- a/app/src/main/res/layout/fans_list_item_new.xml +++ b/app/src/main/res/layout/fans_list_item_new.xml @@ -119,11 +119,11 @@ android:layout_gravity="center_vertical" android:layout_marginStart="10dp" android:layout_marginEnd="15dp" - android:background="@drawable/shape_bg_add_attention" + android:background="@drawable/bg_common_confirm" android:gravity="center" android:scaleType="centerCrop" android:text="@string/add_attention" - android:textColor="@color/color_FFFFFF" + android:textColor="@color/text_title_white" android:textSize="12sp" android:visibility="visible" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/ic_search_main.png b/app/src/main/res/mipmap-xhdpi/ic_search_main.png index c95f1c123..8d7ddea37 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_search_main.png and b/app/src/main/res/mipmap-xhdpi/ic_search_main.png differ