From 2b36296a8d1595728784e2e30e53a9a0076f4897 Mon Sep 17 00:00:00 2001
From: huangjian <huangjian@xuanyinyy.com>
Date: Mon, 12 Apr 2021 10:41:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=90=9C=E7=B4=A2=E9=A1=B5icon=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202.=E6=88=91=E7=9A=84=E7=B2=89=E4=B8=9D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?UI=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/relation/adapter/FansViewAdapter.java  |   5 ++---
 .../res/drawable-xhdpi/ic_message_trash.png   | Bin 885 -> 1219 bytes
 .../main/res/layout/fans_list_item_new.xml    |   4 ++--
 .../main/res/mipmap-xhdpi/ic_search_main.png  | Bin 1204 -> 1228 bytes
 4 files changed, 4 insertions(+), 5 deletions(-)

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<FansInfo, BaseViewHolder>
                 });
 
         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 a32b67c378c2f961eb5d9a5a3939437e8591c779..b67229104558bf01d0e911443901f24fe1954b2a 100644
GIT binary patch
delta 1210
zcmV;r1V#Jx2Ez%E8Gi-<0028MuA%?{1d2&SK~zXf#g<KM6;%|+|7Tu5_*j|1%xi5G
zsV-b;Vre_)7Kj@^u(HrtqA`*-nh+NnDj%8{j4l+kg=k!8{34pDDbYoRU}6Z`cJ9!R
zg<X^t7KPHjdBsE$3)=S0G56VNAJf;)^CRJ|X6`-r{O&#XoPYnlgd5bTRIb+9+llaC
z7-CJaIYgKy${lyzs-H{oSrS<5U@w5z0hA>;odu|a*?u<(o(S&mpS;(ytWyAlh`Is!
zrI=F@)B$*Oeyo|<(JR3d!M-1SCW0pcyvFRjvXV334-Sf8KY;g{on8M4tab1MfGr}l
zRVll7C1;*D^?wjicpQ)u%;}ayu;*p(wk+%yk&OVVV-wZ`s01)$!kut-7Jza9e*m~#
zU^_uXV_}FxO4&b}{(Pvl4qgRtASogKhw+8ung?H8EmD3T5p4yq8^BKhdgeh6QGUn&
zq+Jui6oBnOKIx7S$@e0&-!a!-Ti9{r(enbA2pXUvW`Db(R8n`hq*_}k7q{0sI|#@o
z5wKE@UpRhURu2wds-2rFy8vL4*}3klJumYzKy}P^I}t6Mbzk3aH>Fa4o)y6<r5uy}
z3r*`_0zegzs$pJtX<6{;(^6JhnKg+)6&3cX`g)p;jI|EV1K1#v+n`kSLM>}O*#KAr
zfDALIH-AO;!^2WOGn4lfj*r``;t^R=$DWtHKqR$G0l_eUdqlzprK*M&7nErM=o<hh
znVoG>|G+@zwp@<JMChVY_AT*aSOV5MFpA?^7Hw{7vil2m{4Id{iD;Ya+9wzDBHKnJ
zAB*6qQchdc-`}6zY*}LJ-e-2W6mU0y#{hYPIe+~{0r)6@okY~;y0-bww|O0ZlL%d|
z>+C6r#Nz;c4&WHG(^?An@O(+_V|Lyu$oMWIbckS&QchRY@B2Zg2wniNm)YrzFUXV<
zv(u3X_WjIm5jspH@3?OI`2xT`5gY>0$?TZhD%x>A5+c;Dl>Nz~edcWudX7jsTsM6r
z5r3?8)`Z!F`)g(=x^19!wjGd<;%BLKV9xsi5vxV1^(P7z^c8?d0BU8nk0pYa6A|Cf
zJS;*z@e4rf%n(5JOSAoN@gR~W*G&&3g3p}!wI&SbF2+S<v0krNHLU~l;<z=Hl8udx
zX;bUb5ljL|7ZVR-u%w)f{MFRt3*Raf5r5AM>WFX-z<FlJ++q>nDuC4$6}h$b_0{GZ
zqobo0SFWrxK61sxqbS&PMj}$Ui;<Dc+UaTf9l%v)XRWa-)@S;Y#A8`-BqCu*Tbi5g
zzWDBdnKkB?>Fu4WDk}?(9-m`&?uhJ?#A79JUPOp!hwIwrI|}Oo5u}xJo?R@P?0?Q&
z4r7H2^!>~Z5&CjD@mK+zc>|yqMd(AN>}TQ`ne^{@*$;^1X+RD#r(Y^&U-Yr(`xAGH
zq(;m$Mg%>UB?Dn-ExB*w4lOH8g&{Q(<sSfZmKEOB)Kqo0WUw*RI(Q1ednRL(c35QG
zyfSt%JD)B$cg5$e)|YQ4%54ursxz@HNhK{H3@K+>GA@$piC_Hjxry)UB-p<lzhU6N
Y0AOVrJtPeDy#N3J07*qoM6N<$f;5*u_W%F@

literal 885
zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z6#fVDt^}32_B-|NsBLYSpTShK89l
zX95|0eSJX2qD70QO`8T}OrJh|_UzeHr%s(SXAXo76a=z?f-`2!m<0wvaiAcC3uHi~
zfDE7{goH=|NjMkCM&?3P0%akBaJ_I5pg2$svMgLXPz^GGtAR6svT*aUs)WlTYe7~?
zB>Pd<o=jkX=9L8b1v4-*v#_#pa&ZevO3TQ~D<~?fXlfalnweW#+1T1SdV2f#`uT^3
zg-6E4CnP3i=HwO@mz0*3SJl)twzhY4_w@EnoHk?j`~{1bEM2~8^_sOCw`|+K<KVHA
zr%s=_edpf&2ag^<d;ay?_a8rh{r>a!-&;2KE?|^qdb&7<NJy?dm>DjV$k6sMTIo{3
z!Beb9H?>~5BWfDB=%NePnWcvcy&VE2AO8F=KilH)>lLMb^1Jl@-JCr0XxmG@e+myz
z1kZgo@A=m#y{j8S*Yg*Ihk4p));?M%FLlUxO>ED+J9Q^ZSFZN<4;5b;lxcsxS$pMv
z&qrK)H<si?#_#);vNkz#y|al+YO(Tx{B4UWtU```wY$u;Wp3@U&@hSf&99>beysFc
z;Lq-`;TcPY)+%9(5d9B9)ebJMJxy$l@2ePnG?<Ts95|6Ja^s4{ga9dtP`SfFOg~mw
zDy*$kP~=Vy%RbO#$1r;q!!?s`!RuxQD|tTn9zL+`kwoCl1KMwy*k7^cd`;f6n&-<&
zHa}6ub0Wt$EVe3?yk=SPLeOT7HDjKLXk*x1=hf#LJGy>|h%jq$eT;B-@L{d_RK=~c
zp80*!fsRi<)?_j7=Uw~g^OjX}mmXcVRMztR2kF%()*BtmeYkRJ$mLTZGyXpkpKqJJ
VLTuYZ4q$XMc)I$ztaD0e0s!!Fx^w^l

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" />
 </LinearLayout>
\ 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 c95f1c12327d87147775bcb9a9eacbd5785885fc..8d7ddea370e6cbc7f6608132fd2a291436ca93e9 100644
GIT binary patch
delta 1208
zcmV;p1V{U{3CszQB!81hL_t(oN9~twXdG1(hTk)@*~F+#=|@^c1yO4KLa+*2wX`bY
zLb9_r?TYwA3)Qqco1h?yh-gqm6cIJaY+OMxB4Vf6nc3Jb6e>YXTA|vOS`gG9idgH~
z##*iE?(7_y{fL{myE92eTk!syx$imWnRCy%_YUC<8+3;8;D3K0uN67_Gt{}hXQj+e
zlpU-A;c5U20Z0Ij0r(QY1Th<?nfS~r8@1+rXQ;C)c9YD~^9;V-XP`aA^pt51?((TG
z$~=KWq2A`^mcok+^p-O*7yqtyI2b@&*R|jL7&Zh7g?bkRTM8zCbyd!ofsZBP5n|fM
zEFZR;@>794Eq@2Fia`npch7>~pAR6kL)U)vf~pG?jYflcyFD{&iFOlnuUCBtp<d}Q
zUI*dMDu9EzDf!k+rvKMQP<4SKLVcBihpUX=Shm#eO(v6hudgi6lOoh70X#Qd8jKGt
zQ@eN0KyCp`OcPZ#He?xE%qPeUnIhCD0K8Cn$;3)Jm48Ur^HnoL5fR^2wN$%<f$Umc
z*K_j$a&5vQHcFt5vi(8J(5?f(zS>?<HeUrvK2#PnOU|nF$k4v|!W4nRu`5WXF8~CJ
zt<BOp(;OJ{1r&~`&k&)nv?tI<rZITO>A+NM6`|??HWZ&3nq_KnUqCaKix9U`n)Z(X
zb;a%j(|>zqUxzG1yT%ugBGexMTu@3a-{95aeqj|wy%-X{E9>*eC)-=c#`^5p_J1pC
zMW}9D7uT8#P0Q2i*N*rN>ZMbJI$g+iju&m;o|yClRH*E-GT9fVQpv+!f&9#OcXu}(
z$p)r7)v@iRqoc{6{QzYFEGcG4l5R|o4D9t2(0@zQ5$(Q2wgcamb%orNd~PPwf65!E
zOC1Meby@g;WoW}*!Tih%5$|xoqa`hWV;PCdeHL}>C4e3)i?>;Z7WEU*OQVR`n*cpn
z;^B8KGjYE!pm0~uEyT_zB{Ah>!irRCu##%8xHad6*wXGm`WnFbMIK;%+R#$IfLsbi
zsDB3lTw6o}>83Gw&%8*=Mv71q0JfALzYhkom(@FpYMy0bp>`24Qh{LbqiG}Y%6y<A
zkywO@+-wwMF*ues5<~TT)xCZwB5na3u5<;!4_QXy?YTg8int;HTLBK1DgYBfIlD&J
zb$4s2IT~EhHZ95(nm+|&x*G_1i$ISX#(&_^MqtsXdS1@Pvj85cy27|O%?<Txr{b^S
z6}Gdp=Ta%)>;SN`3g840-XZ2~fk0uut|yPXb89zlY-yWpy&e*U0d~7-aSiAbOj0PF
z8W^8*hAIZpXm{HwJMcaMp*l|f05Aoht<Fz?yF7CB2Q`B7{OfQX_4V~hpC9;X6Mq3u
z1Gvaf9Wjt4_onFZUP$yIfCbf14)I;1sl=YyzI*}wm91znpKp&avAbE`24LAthja|Y
z<K!T9@?@*NbLY#yyYq^ou7-q6H536~nTEFFw18$C3lU$;EG@L<oOF&9{6*LM-E*+!
zC~vrKJytSx)H1Z<nOQyNlp#M$)iFpTMEqulco>W&#I)Ho2e<yGKz=^xU(L{23G^q1
WxS%xfI`&Qg0000<MNUMnLSTa9ra>_P

delta 1184
zcmV;R1Yi5i3A722B!7EJL_t(oN9~t?Xj@ej$G_*LOQiltX`8%sI6>4otunAta^Gt^
z>qK0cZsHv19|LhPw2X-`P!JSRhW?}Y$Mg>o=@7+j>Qw4qu40?}(vdku3qlc5yR|Q^
zwXKS4n)i;}=B0+%Brj>v4ZMHmp7YJ;o_o%@=MgTjMHd(k{(lFmb|V*mgruC_1UL@>
z=myXZpb3BmV1|gk1CRvh10f<`R*S|;`@SPIJUp4uG<pHR9e)0Z2q|WM+Aw0D`LQq9
zR0SFs7z;Hug<k}CzZZ#G^p$P@!UFa6^hAI6<5&?Wot_D2v)K~>Z7C9CfWIKpjuYXG
z<M0Gg;Jl`B%zt&=4kF&cOm~;SpJwJ>(~M=RL6rp>9UTqM&9#17az&P=Y5Nn2$mvSL
zmUZq1=D@1}?kuwVM$;NP6N#4jO1@=*q|Cem@PUFeGhPdYq6gw}TC8?Twa?6yO4&~_
z)AK;S-x1NfLPQ^|8OTduSrAe%rl~*X2c*<S%FL4hAAkD$V7%2dV<*dLtr#IGZB-eC
zYO=!N>D$}e+q3lmDIX~_9|OES@6Tx=^xKGteU*JGHF2ZsYNMVp1Jq#{(KGeJD8J$1
zsp~b({T4t&{_5NwA=*Co1!P(FGt79_Gd^h;`qtIJ6nv$$j{?}02f|??^gdre#n;7*
zKGW0>uYV2D<U;_x?P-k~hJKS@pmPA)@+Z+c>U{!A|LoMMvm0``hM&CO7Z(<yjXgb-
zE4BMaQcG#8vR=AtO+ze^(CxK|P(Hcs<wSOzP;*yT)31JjoI;n)<+SzP-I0m407|EM
zT{fFpuGC=AiNxdUr>g=bllBx5T9u*eYPWWFMt{<40W>sp_NqXj;YUx)nVp@#w72)V
zg{nYO+DQP$QpaHIF-`r*S^!zr<UP#vk*D>&Vd&TTP3o5b9Q4ZbxDfhMsjhZOnRx@?
zM?9S)hN18A1!P&a$&6voILqv8G|lyeP}jwkO4+*WVhq6L-a+pdLVw>Eka`p?EAusg
zn}0orV}_xt39;@arTsd9eV)L0I6Qq#xu>YyTXr9S<r5I`6GFsZu7^lUd#9)6z4&-k
z2wefLxXO+n$)tUP2=^AMf{6AC5q+x`sAO_-2NAsoAn5re$H${vcJC(DT51E5^5<qC
zI0B%k8u(3M@t|RBn5hIdIGDLC6yoOqJbzvoVN}r)VOP1_Dd<%kVMj(LuXY>^0JNzH
zU>@LpAaE=g415)jH_xfP!NDIc356POQBh^aUH~mCK>tRBZ9?d(wbT}&f^~kbUVI0@
zwlW%j0yqyKT;?M{T~DCMw<1*4uMQ=|%$jA{4+Esek}G}Y(G(FMavUwKY5WO*D}Rci
zT$k_a?2M&KwR`~;oYdeyKOfo2%&HA^0nkeXRc;Lt(T9zV?$OPgV}Gc9DQ(sH)dxc{
z)R<xD8&?HX>O3+s-jd6$YYGHN%VwR~?(Vj!a?$e|?m!XLFNUEny_v<UrU?1Gs<LLu
yq%DZh51^HZ_6ZSHE#bcd@^henH5oz|CD30cI+-*+s0$eY0000<MNUMnLSTYMJ3?Rp