From 83cbb60cb7e550ceb002001f1814af3459c57741 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Fri, 12 Aug 2016 10:00:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E9=A1=B5=E9=9D=A2=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/view/Concern_LinearLayout.java | 4 ++-- .../com/gh/gamecenter/ConcernActivity.java | 5 +++-- .../main/res/drawable-hdpi/concern_down.png | Bin 0 -> 1977 bytes app/src/main/res/drawable-hdpi/concern_up.png | Bin 0 -> 1984 bytes app/src/main/res/drawable-hdpi/delete_btn.png | Bin 0 -> 1927 bytes app/src/main/res/drawable-hdpi/link_iv.png | Bin 0 -> 2964 bytes app/src/main/res/layout/activity_concern.xml | 19 ++++++++++-------- 7 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/concern_down.png create mode 100644 app/src/main/res/drawable-hdpi/concern_up.png create mode 100644 app/src/main/res/drawable-hdpi/delete_btn.png create mode 100644 app/src/main/res/drawable-hdpi/link_iv.png diff --git a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java index 4621938218..5f52c8e691 100644 --- a/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java +++ b/app/src/main/java/com/gh/common/view/Concern_LinearLayout.java @@ -32,7 +32,7 @@ public class Concern_LinearLayout extends LinearLayout { if (concern_rv_recommend.getHeight() < height) { postDelayed(show, 10); } else { - concern_iv_delete.setImageResource(R.drawable.concern_delete); + concern_iv_delete.setImageResource(R.drawable.concern_down); } } }; @@ -52,7 +52,7 @@ public class Concern_LinearLayout extends LinearLayout { postDelayed(hide, 10); } else { concern_rv_recommend.setVisibility(View.GONE); - concern_iv_delete.setImageResource(R.drawable.concern_arrow); + concern_iv_delete.setImageResource(R.drawable.concern_up); } } }; diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 7b3c4271f6..ad5b27a862 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -85,6 +85,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { } concern_iv_delete.setOnClickListener(this); + concern_rl_title.setOnClickListener(this); concern_rv_show.setHasFixedSize(true); GridLayoutManager gridLayoutManager = new GridLayoutManager(this, 3); @@ -99,7 +100,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { @Override public void onClick(View v) { - if (v == concern_iv_delete) { + if (v == concern_rl_title) { if (concern_rv_recommend.getVisibility() == View.VISIBLE) { view.hideRecyclerView(); } else { @@ -392,7 +393,7 @@ public class ConcernActivity extends BaseActivity implements OnClickListener { gameEntity.getIcon(), holder.concern_item_icon); holder.concern_item_name.setText(gameEntity.getName()); holder.concern_item_btn.setText("关注"); - holder.concern_item_btn.setBackgroundResource(R.drawable.textview_red_style); + holder.concern_item_btn.setBackgroundResource(R.drawable.textview_blue_style); holder.concern_item_btn.setClickable(true); holder.view.setClickable(true); } diff --git a/app/src/main/res/drawable-hdpi/concern_down.png b/app/src/main/res/drawable-hdpi/concern_down.png new file mode 100644 index 0000000000000000000000000000000000000000..0a99d9c512808d8763719d395daf871cdc6b2852 GIT binary patch literal 1977 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 ROhfPwnSpN7pGkS8^uH~66tDmQ literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/delete_btn.png b/app/src/main/res/drawable-hdpi/delete_btn.png new file mode 100644 index 0000000000000000000000000000000000000000..dea64cd095d8816ffb56358469dc6be46904cea6 GIT binary patch literal 1927 zcmbVNX;2e)6klzWq7;kuM8IugJ&Cj}Z(l!u>KL5AER401y-Fao|KI$%5&mjj}8G9hKF5kg_QG z3lM|Y;82qpR6?$koR@1f6S@Lish=Uqlwlg25WBydr!JuE z7RK$G<}XxV+#1qJEhjDUPKE}1GmTNN@gg0y;<9LYx)8Qn5g~4oSveMM5h{puDJdl+ zC<1dC=)+t7Zw4XGDahY0|7o9rE3PN~+gHQD9bSzSY3F9h$qmcim|@4b8QiJU#F;%! z?c3%ij7kbSePc(DK#X`-e}icnV=G6;t41EWl)QFuow}I)BKTQHGS9kQX})tdC=lcA z|4FkJgw5Fyi#75xwn$BwH$3||K(`+-E*lY zWd?2Il`Fdke~#RYR0I{-icj+rR?fNk-HlDRpZMCk>mq$A0YhijMRk^jvq81Tjp9(v ztuef*xdK3!X?ARnoLxq~9L@`e&*xnZxl~#iI&Nzh{+PEVqV3m;yyM9RthMKZ$TIEL zgSIs2`9o=;_9lGwp`atNAt|rx{7lo61IJwRw;UPOBb(c{S`_-D_=lR6r&NJ0O9pL7 zBe(lL=DBM~+2pG6XD#1MD*05H^Ma@vTzT&TT~Fxh?DV9jL|}KuTfdcW+6w&u_W&=? z!S6psYrh+wX?_qI#MCT*q`jlJYv-#+He@LVpRpW`ql|3S4y z46@Y-A0wOF9aoEPxAJD_Y4P_FJLPvz#8f}{t5ogw0(&;cjie!<@tHpL@ERsH>a4V; zfR>V~*Nd-fbkh+MJc zp*O2oYkDGoa583AJwh1;*X#3lp{+@xv4W7%NpGf9{nCr3K^v#Hx>7qQV_ARd1xtzG z`l_UPQ(kP@wrd@X^q{r3#M+Vq`@4vqQ4LCo&gZgOHmE+m<751;wf(prXN7mbeo0eRv+DxgDh&2+M*L5zc z$h|HU`FL^jmWhok457+#3Qh^`7JMETUdDU;Fs9Gk*1I_`eozWJdvNvgGxS`>x~Et2&kDn tx;^Xftbzw!SHM8~yy5k29f5xZiUGU#{F!``~$Xa?pOc- literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/link_iv.png b/app/src/main/res/drawable-hdpi/link_iv.png new file mode 100644 index 0000000000000000000000000000000000000000..aa41c809935cda1829c6d3f3409964149d2aedac GIT binary patch literal 2964 zcmbVOcT`hp77x7yPy`ksA|a4Lg%A=TkN_$WN+?l73yMk_5J@u$B=jnFET~k+S)~O* zkx`^5MU+)hkywZVk{L%GFd&Qw3<&OvZTF8kbN1{z?|t|CzI%VS-*evn%|w5FU2|O! z2&7L4z>@$Pt^Bk#f%WA(DH$MULSM2llp8A)QTPmy7oAIGKnZM09D~H5(35xHVR(Q* zYGP&>Sx62E#?iQJ2Z~b0LCod>Xb{L_gP2F5B`}0gDkF}`@r1o=>wrO-bWd2MONe6# z&xaAu3`pTKLQ{xgw3GxImJZvn9_k^+0Sed*Aq6UCvp52r*c0|yFAmr%uaPk5XAxn7 zC+v$;1hAob91#M-&F>=!`^R5hy1d@H#s}zdkU) z8lN7EBjNqN+5%3Vuy~=6heIMoB9Vj0$$`s{1F%>u(h-eBqY;1vLXgZ6Qp5<3!1|j8 zJVQX^GkHQLmjhL5q)@quLQfdr>6Z}LypWLZiaCO>i2_oF6jOLel!GIZ%~r;k2^59G!gFbfYz9Y2z3lo41{Ye8WT%#L807YW54P7E4(k>%h}P}8SmnU z!J<&U7&l*xD<0+RhjMcE@xoxdzhMa+fsn$XF}~Sm0=B3PZ;K+*> z!Nkj8f(Rv1WiNfu1FB#6{(V*PM#yX~=d_;o_7^wql~PdA*J zwqjb3K3AXX!sJY2C8vaEyA}+ruW#CAqfg9=8{a{48ZB2nwMDWmHM~6A(r;@(>87!9 zpX5bC@0#C>&Hd$B+c%Z2*!Zl^X!_Z1RZjN>g9d{mza@-DsJ8utxL#YFy;rA+eNcN| zPF0^UnTe3TtmsdvD3RiR6uNA+8#OILN}msX3NYz<_yWw*%USI$>{^L}NlSuDeQ`uG z(M12xB2ypmtm;CdG^#@L^<QIzDr&7F9K zszSz^`ES!<_2nl|VXCP?0VC8Lp4 zfI+q$=nss6T=EL;Fi`Rz#LSO3tdRLB_*ElK4WLbvoEPQ3ZYr@@I))T8AjYnv=9?v$+(=YRH z^_73x`f#_no5c%;5mUm?oXT>8mC3OeZ zQmD+2>@9p@U8$C(Uq)?IuW0{q(iF{rCR3ny)dJ_G+XjaFsbPcY=EDM*i@f>4oem zuLadrarohJBi3N)G^qNKwc?)#Iv~61bvu`|JPPl`RMIZ=H3Xm{?)VN~o+t2tJH}(I?GU{xB zSh?CZ+y}kuo@NKdK+1zCO*c{36?-MUdVb}pPK;W4+r6+7C3Syu2!8d24(na# zfMdGWm z52upgbG_oW5VcEZjLUC5msmrBKkcY(^uHh8To*@=3F_!HrdT%e7QnqKGD%?41w!4{ zq}laDOTwcQ9#;4dcI#wXDg*h*-^x#Q&Mb3NXh=hKSf8@&EUu{cOA`*5G#T;QDy<>n z>Sc*uDgR2ZNIhVJ(P|#9e(Bz84kj;Kx zeaDVy@CF<9Ta?Z04$~~Ce#_hPgC^cm!s<~o@U98%nh;GrNoi@W3OcgJs{C+HsF}l- zXBRzhn%TOwcN5)iY2^fKDxTjUl*kqidn_cGgf94Jsesy$D#4m?)THu1ncz#rU+|8} F`8O(p^AP|5 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_concern.xml b/app/src/main/res/layout/activity_concern.xml index 1d27453951..6ba5fb547a 100644 --- a/app/src/main/res/layout/activity_concern.xml +++ b/app/src/main/res/layout/activity_concern.xml @@ -40,29 +40,32 @@ + android:textColor="#ffffff" + android:textSize="15sp" /> + android:scaleType="centerInside" + android:src="@drawable/concern_down" />