From b2ee32b4aba9c8acc0e9deef34496ccfddcdcb49 Mon Sep 17 00:00:00 2001 From: khy <18814188563@163.com> Date: Sun, 14 Aug 2016 16:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E6=9B=B4=E6=94=B9=E6=8F=90=E7=A4=BA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0app=E5=BC=B9=E7=AA=97=EF=BC=88ps:=E8=BF=98=E6=9C=89?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=8C=89=E9=92=AE=E5=9B=BE=E7=89=87=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/gamecenter/MainActivity.java | 32 +- .../com/gh/gamecenter/SettingActivity.java | 32 +- .../main/res/drawable-hdpi/app_update_top.png | Bin 0 -> 22272 bytes .../res/drawable-hdpi/news_details_more.png | Bin 0 -> 1494 bytes app/src/main/res/layout/activity_setting.xml | 520 ++++++++++-------- .../res/layout/app_update_hint_dialog.xml | 96 ++++ 6 files changed, 417 insertions(+), 263 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/app_update_top.png create mode 100644 app/src/main/res/drawable-hdpi/news_details_more.png create mode 100644 app/src/main/res/layout/app_update_hint_dialog.xml diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 76dd2594ba..a2b13e133f 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -16,8 +16,6 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.app.NotificationCompat; import android.support.v4.util.ArrayMap; -import android.text.Html; -import android.text.Spanned; import android.text.TextUtils; import android.view.KeyEvent; import android.view.View; @@ -785,33 +783,23 @@ public class MainActivity extends BaseFragmentActivity implements private void showUpdateDialog(final String md5) { dialog = new Dialog(this); - View view = View.inflate(this, R.layout.search_history_delete_dialog, + View view = View.inflate(this, R.layout.app_update_hint_dialog, null); - TextView title = (TextView) view.findViewById(R.id.delete_dialog_title); - title.setText("更新"); TextView content = (TextView) view - .findViewById(R.id.delete_dialog_message); + .findViewById(R.id.updeta_content); + TextView size = (TextView) view + .findViewById(R.id.update_app_size); + TextView versison = (TextView) view.findViewById(R.id.update_app_version); - Spanned dialogContent = Html - .fromHtml("
发现新版本!
" - + "更新不会影响用户信息!发现新版本!
" - + "更新不会影响用户信息!|Wluu9~d_??KtuZI1D1^zRCB`_f6yoUJe|L)d0 z#$BLcPPQDW-17Wa#MdJAsA=GSfJ`S#_v0Z@xgs9QgwwV zNOO5)b?JqMbA8y((NdzxlP6Rv^u2WdH*(3=-VdZ-ejN(#G8Xr3aBiO8+2 cXU!MOu9!$)4@wab3 zyW^f9mgR-49bp^en9yNblL&tpJD9%JC7j&vH-($q`*K^a> QR_XY3dRA2*heOlZ;T06Vi^fEaGm@f9E-}n|k ziBY|6wmGjAnxYQRUwg^ytexPI>7`gZ(nuI<+zOkEHEKs_B`^)b_9XNqYevBGAXom!e! z!t5ax)l)LB<*J=$pY6S-0j&b0XC|v7vDct_r9)czYkzE>wZAtPlUR5i;rRXuRt%P2 zz*mb4j*aE=&%}=Ms;t(yR|PD~?m?)y4=n_U(O<)UocncF*zt<|s)oLruXD9{{V`Y} z18UNMM}%I^RGIlIAq*G2D{&a^@0+VZJ5Q-Sn@WU#qWpR3<@1tC=)al O*p#(kY zh48_hu2*);Z_(`STtPj%Yg&Cs7N418@+iJ|Q(nYuGha(HON@PBIz6hIm;MKajqRrs zV)hN7k&$ayK8zW2#HE3MZY04ki-mpI%IUIB=Q=*eJe rO z1<`0#m$*FyP48Zjke!oJ!ZgVy%s5uNV!vS7S3Yco_`^5ocW1`;FwyqsbZvz(gI+l2 zHY3&&{uwP>sxKRJ2!zYCD~dJ%;ngUwXuI*$2di&QqhcL1*i`F(9P _iu za5E0BIaBdLqTq^Jet*Gu(sY;29jEMObOsBp6SqSUv@vPAs#gk?obnu_E#I>{uLar* z?Iq*O$1xCpK%`BJY-hZaMn~YFpL5?3!(9I!w@|G%wfn$bv#F$<#ii~qdP$e0Vii^R zLbrnOfhAY_SDLhSS!~|12`48dnnae!-cVweo`9F8->Bn(qK&^~SCH#MwKGyu@DP$^ z9Ft#cjAEywP~Pgc{lXz!xm$%$l0Hk(?>_KU0G3PJys9T4krryBt6w$JDB6|SyX#y# zGOjirI^F{+6f~s|!lS}j1tU0Iwat!a^jz-g#NUzlWzv5g&SB3M>0&Q%u$A!fHobht zu0rid>U?XgwHN@yGb5|@)Ad(DW$4bW3->R@J%C9XO_iGViAMj% #Y9#xdTJm5Bv2$AL zA064)7BeiGTor~TvY!jji!TChkdiU<=jw7DTy$0p*Kzhc)S1=Jlb&=(HbCc;ygAh- zr}@?T%g>xC3D!tKSG5E&U?Y5~CKg#mMLxz%{On4Nu*@a9O~!#np|EMIpw(oUt?Z3s z!PQg~Cu%1kQFf(yH9=sj4O7G0e4xBK?Ot^-JL*lzb?J~Z%gjpHvFC94qZD_5;*E-> zNvm@c50^MTiH`CrLcJRZX)REib{|JEe|5 A$EDEd49XGI2g>Btb_UWT`M%4XMhwJrIrw$zO?|DY9aS~Upvsc;3#-E zFNXwU1)Lt1qe?XH!Pb_kFdqwi!RM0kw_{)2<7e6D1f;UAJV~&rZ7A$0j-IBp8S7nK zN9t81>Tewu8Z?==F=aa1hV^4i_{v`&fFfGyE#P#7c6rPmTQLdBl?x5yn#QJgx{n4| zEQp%Dncl$F)sHTWmzMHv)SQHRH0IW;a2OiVy^bRY%x$|3B2znM!&U%37S(@aZ2mH? z*;XxiG?X}75GPgB(5>jKpD?bxy69dtZcIuvtUdB3hPN?cTC5jZTN&;H+6eJ>yJF>s zWpqi=^J8z~L)ix7mMYbf_25wzD5H>~bT7Mv4bVl{3OkgG91b}+#Lde&VO+^|TcSvg z5VI^b$yu2HL2D@bxD`#9B*s)QCL47(qn8EHDC4j^T-}W>`Qg!h>rqGlg(Ldvh~2-J zFqjDoNFMx92}7@}0REv)+h?i$eITecfb8p0(QaFeTUzB}$MUT3fk4-RqsNY2?MPrC z!T-E>vK5(t0^%(FXf8iOz9wfnX`$WOf$sg(@o7ANGSQ}8>R{}49}%w%)>(2yyqyln z@B$VZ@y*vJ@LBhYT<_QHCJHwuWmXK(w3}R e3C;=RF48C%S@&HmLcNf4AOsjC~St*6D;$KMUwWOa1lcJqY8jW UFwm3h6pDhc7Bo3*=0@l#-%`G2BpXID0Qci{;$`VnzU zEhXQh5tXvPt0gyKp;%4205 $Eua+j~W;!ERo<-0oAJA#|?*fuoDUrfXfIKu3ulJ&r*jOMbo_YQ?Myy&M@5oN!~v zT{fXAYl{z ;?GajcjFMWE_IyBHgfcq6!OkP{6He8)pisf zW2))B*f|l)Pe9wm{Q>>%5H;PH;iV5i+2R6~IuUjr+)uzwrDl1_B}i+T>x(3_6$p+; z6Q+B1TYt0hvrPKcG&M{4^v
kUK5i^i%x{E#vv*tvG%dYS|gCEAiv9FC{B) UI%e(t! Ox~ElzXxGSaRV{Y&hkp4+j1r?g)-E-_`V0yjrLeKHH9mM zXUn4oK#JQ`MY&u3{Mfr{al59##;D8u`4eF*j^E~h_W692V4wI0m&G(! @aIi^6B5hyMzOx4go9JQQ~?=-2FWWh&g#&%IlT- z6!Lv=R6gH8O>V&_Oy>w?flmY-2Gb;Pw6|zXyp-Al0Pl@gKqXUw2h3{{WknD8g1;0( z8T2A{cG_8bs%^@}&88A=+xGV*9B0;1bKrx77p(*6aMy`3=6t-5RttsM96WZ|J4$>` zi)*!jAxGNKD0w=z7wRatIAhADlD26^H)YXm?TZo)KL!XW8F~SKGg>gAFeV#d%BO;( z>Z`fBf^c RWoj3J~du+sjgz3>TK Oyt25X`S*T z?iH0qkXf}5I-?iiS0_-J38p}~trw=kj;wOlzb!Ro%Yi7<%cm!4f?j2*yuQ#Y+!#B} zzTg;ubIJduFWXd-0 &xV1SI# GthDr_ zw3`@bhUdzo^k6h%H^WhP+Wo8Vbot=w8iAN_gbln7d ZA&jp*rs%&k4)fS$#5zg1`D zGvd|Z0LN}1^7xo6ZYD2>$2g?GP@Ufwr8(&$(Mirsgd42FNS6G+eJ#MQHI5W`EP0 z+kM2-7}Vt#m#Y&dMIb!$9mKCKX4+vx{r5C!)?PBHfT~PjD-nDxVd;F_it^LpEkD~V zLRI)?mNDfvdFVZUh1G-JI*zUb8;_lawARs+(D_&prF1|O-0st!`E*0!VuLhUtAr=* zTzOm0T&9R)(sHlWYuP*_r&(qV_BKj13=Z>I`nWp2E}xOneQj>4jh*$2PQOe*XBRXy zdNVy`lfvdcg>MuaKCoKqZiFfqNqjQqiHO#X&sAU8F{(U=w9o9aL@;{~Q%Vb6P{QFl zxc#;}Q{Shq87qlVb_z>>OL~bhDP}%j`H4$Zl$Wn!Y3FUuZ3`{l_ZBHLenuHlvz@sH zW)b&Ozrr@8iqeC#|DmT=pdGK?Kr7h$dX$}YD^I!f;YePYRD>dtPoAQCcErqFDvW83 z-tBUXr7Dt^H1^c8#PEF=$HE{~vG(|-vFNaXSmJnQjiEfR(rW8p!!#+mCs?`|UL3<# zM C*n~3jRtYvtGY#l#~NIm3TELU;1{V#-3%CnCBzO zYUl~5{cF?4k%w4p+DVu{Pd{Ca%Z~)Ue$y~2Rk_t)4`h#gz^g~vB?1$-%bm- --{PNX==%@V0_=>gcb 7t#sF zncFfNeh=k&*W*P$kUFyy+Dn$}yR4xksUvH51*FUW9In=|CR~(`BZ_J4H71Wu6uTE+ z0;fTN)5xbOO>K(h)JV8Q+@vkYk}p}Fuq `cqGoFiX#8$d1LJsq zm^HEOh9`UfQr32t3i20f!6fU9Q?c;Ny~U?)yWUYbP_{F=O|N5{p{i&z!Vavn 6>pTKZNzZN$=In21dJtPP zq!9AuDJ)O!g{^OhrrEGC9OkO2J<%<(KOL<`?eN`Hy4}L_+LL{YEhI=(Q28^9t4*KO znb&J!9GkB+59D)=6;XG!d6nm0IMYp9AD9Rw6orW#Edx#DlnRlUpY=Pr6PV3`n3o1M zkvVswiB%eYl{n_jj4O(AfzP4^<~@p3umFwm%^}epZz!R#&Is)SVdJ&BBO}H3H>=9c zR^{8%(QV2g<+F)u_n8lJaLmvF>X>K<6_*VtBnFH65IU~d94~YAo36eALV91(x&6nA zW4;*PvbpX~hi{D(y*VgMnp~-SOZ3p#(*o#yEUEJfNqGXAFUX};xyk%FG1B(7Jl(XX z_ho^eONXHdbijo&jt>={U`|{b4W4}hJg^b!PtDja@OAforp#j+ecGwm>io{A?CfT$ z#@ Xs&NY;Pi z8vc}fal%Bk)Xd^_qgqlNeCJ13sqIvWT1%$%@hKSW(`eInI?~ZSKB8td#@2{)b#cUv z&mouB|D>Q^FZce^j#b|)Qp Gtz4$atD%L0y~ zos9FlV;nJe=O5J6e;Skrm0^~)60125^gMy^WVs7!@Mi*V66z!Bodp)he!mh57b z{>D3}wm6zSkm0oDpiG+5JW$OYUs^kbv_9hl(qU&~`lY?`5h^vzzDvVuZtGuAoR&Jm zyU+L}Mk|yRpM9U1Frv5r+;dJUf}9Q&kPZV$9V(EF3e(2K)cXN9+e4zqAEF8h?a|Y7 zk+)kTC|L@u;5V3$zHL}cWTGWV5^pi*+#D1kna@F0NK`rdh+ICDH)W%#S$#wOX{Wnn za6QCwq& t19012kY6f(WNl4Aw7R$MF@ui`|s93TF&RSYDWW71@$&}L(JvEiKT_Yzb zmuY-FZ1zqg?{NEi=Jp6@r0D)T0N9?3e@+B?2+w;gg VeN-!FV|s#v zB@~5{jv$X0iDcIAe-11S_a|Hq_@{P?^%1ES9PW^BCzMV=ooE3csKU>80;PQRa3c z;Yun+dN$J1A#Y}m*tSwb$jsNH_PMCKa-j{eZNNu>%qXLPQ7$Y5u3nl5ROFxc(4XDZ z$qk4m4r&+{aOv-M&9(^Zg@f=c$cv>pf6qOdWF}UWX@t$z3ZZywtavhR4`XltOiX>x zH1{BiSR`5hRA%JGxvNbSv7io(BEpPSNJVq2fra)Z3YwQ-!{PP-%WA^LBq+_HUk24} z7Yb~7+JBA$?#(k)9y94ken^_-e2*r#fk?d*4Dx}LmEVfTyCTK?Mfw|+NUwABYD!57 z&lJj8$3oZH)2wA+A$Z~BqgJc)&9UX@n0x5>Xc)OJdZY39n_ESW2e `MvY7Qw z#Hs*`ZN=mDFqTGIi>~${lzC#qD+iS{(qwi*XOFje*;$XHn9Xqn31iCoIXB7?-~n^H z=(b+eH_Q_7E4G}n@+E|7KG3w$2Pv^1t9fv}p9*EZBW!#nwhbC?uVtrwKjp}y^-N36 zxyLJdQ9ZT80w3E<)*RMNa>rj^90uSvnLFduL=C8O2@Uf9G|XeJRn-5PqyTz=;3a{z zEN5epBV-F7K`Fm<_B}jwB?|3 u@s=63r %{UpTE5v z-MF}Rik;`_)U_rGE;Ia6C2si@CzqB>96`cxh@xy38jk)z!dsRbF=lB;4 Nd0&I`wG!2uAC!}W7Xlc9uOq?#UDNo_V z!CbP_1d^ =_!u}7DA3S1^>U2gI z&L>TG5CG*bcUjAbgfU+EdYHYY1Y0pPH*GG=M(i!-$V5Hw(lQroLO4jDX27j-iaby& z>u)4FmlbpTc^<_PybXswA+r+!ElGzBq$T#dg-vrIln*VLs3v~@CLwKs@b!?)WX`mo zFCOxaI=E=ji@C+~wEspEg-;(4l34^qj=wapWNA3`16hnzY0r(u0t5^eK*f$KF0fxz z`djd_-vVR5hG?d?h=|2Z{aYeU+H=u6 jUYtxL&wJOf(m0%{zyAGszKQ$5d4y))w9AzPAouD=T3(3ciSMB~^iD#OQ>7c2eA= z3&eW2l$Zq=d?h!!7G=TEu$2-ApIZhf&@3>pp-w;2$~x4MjzX9vTXL*#mkW#{dD?ls zB&Oe^i`>2a;~_rDz^fAAm9euQ=X4}&tbnUFZEH9^U$5 E3mrlaC@zfWx)y5xx6 z+`l*+XMk+M@OleR)^%wE|23>gT9P&o}3kNX8k?CVCgL1hZrYyT?J_wpA`{kA;M z`T6S6SK=!lahdtbQ`_mhF8!+^ni%ea@_x2tOO?+@K|PTKXnR!cZz$~Bvg?nGkww3> zu_X9hj@P@itrhY6WAx;>1fJ^;j{Dws`zhLIq`w?Jd&f@AUCrpl%2ZsCXiDG3ciZkf zO%!#JfQmFE_Om#jf&v-N;;P+5@8E^?RPAGCfpya t z1$tR}fpN4}O?fEJz^ZutBKU@kP|m(xuFS&PDM}s+@=)W{2F|zdwyU0d@V-#r&7#Wq zy*%JZ`JGp4bknVQ+DsfLkDd~&C(Q1{E6&~s5`n{toe_C@(Vq)Jhf2-d*3503UpvK7 zezN-U320LcBhZ=cJMTI3v|Q>{wPTt9j{d0zSa=?0h3OH$@$JyNV%tn+G?31@1Merl zVK!s5o?m0`_{S$_UmVo!l7w{a*Qbi?O%&uI#RnO6RX(M2IYQIHQ1=8Oc)&Hyd+L!y zD$A22zAQG^1FE9k4Sl=V*{8N9JmXD3>AslS3FcJd+Np56GvqNP&_N8y3T153gEOwa zf=}eNV +$n0bYN`gAWz97mhCi@Vs_ `+j8aca?BX|edC#jE-VqL7+a+OAiY7^C%>;`3xDKv*|22x&P$s~Ibx z8Vk8|)HF3 Lj`m&a2~x`Js{M@PPgL>M1uQ)Su{YK|b5*mpahk?I*G^@X zpVScrL2bXXUP}Y=1BT-8=dmpvb{BiRO{Hkuq@+VIXPzEz7)(e?8)A=i2#Yn24syaI zi&tp%J>^^(MN$@+mag$o!~o7H?ggFEs9>cH(0!fl)G0&VX%F$)y-r1fwT$6sXh9aX zhf!tiP)6!V;AFcP#|>}VhpH<(I?CaLOXrQyrA#+ehc}f#ykr#vpMZGHUupIivr3kM zuFgVbGPyd6ygb!EL;KsKfk?V^ly3L2$!*KfrTi?r$tFw%#x6e?nYF#D8Ss`kmpo>Y zf1?S^3Xt`D0A`;ke)*Jd%dc~&XWP$839ux`+{Fr^vI!Z^6(NUCnRE!VW5i--nKJbH zTP|pQ?$JzrEoj4D1ou)=46MH&NU3wK+26xh;tu@{^3)~uj*DyM0m_A`zzRzuyOhc- zk8sTuAahC6ixKOV&B}q X=AMn3mdxB@rLS5wXwFA;%aL;D2-d6!a&DdqgFO1J7>Zp zeEp`_z}(|Sd$4$E6B&4){|@^>3BT!<`xWT7OL`~rM>P^4R88?9pVUsBS_Qt`N;5k3 z995Tag2`z{_38zNup2#xY~u6D&6xdWRh3H7{Wj3!b_!&5@0HzRPDKk^5CnKA1^_IY zMzXV9ckQF@V!{6AncCDx-CL2t1BxWKuo=vg>NGF>@S$|p`NJy#F7kx1E@+7Gb>;dT zh<*}v(7yPI^C{ZESkQu!tmGjKreJ=B-e?ubV|KHUONE5@Ye=NzJ!9buO>^#zIz%d7 z8OOyW@Uep0_Pdelp!iQDQ461!v#*~E 3kBFUgNc(VUk=U7QH|p!15G z2cGk@y*vTIGl5h-mbeo^WRpLG`d-Avwf~owFH^w`yvN(!*PHZ+@chA{STzU%Y);pg zt@ZwU#53lFI97f`1dS(mztsn&p-qD _=03g4s>E&2+&q*;|F|h! zB$}N{BA3Jk!!Hx76UGiRz- zMb?9NIqb(nOX;Wh)cro Py}n-0`W9p8m+mrIy>z33vm=LxBg<4x(s+U-G}&?iOaO zL^?+ _Q3%pesC%EOYHF6L;C3A?bEe(AfV_s^ zwSMD_?bjf^?_wbHpK*mC!7e$21-{}ypIyrFzuA8$c?hA}#F3fR4D8DHGsR3d#U0|s zeK385`yP5^I7bhlh7Py)naSr{j;8Uei}+20+#=oACyIAYibG<)gP}-}h3ysK{r6#P z;kFO2`7A1I;n&>a5cD8`BAJH)To91P2QM$69;Z<|Ozz+#SB%5`xE|@S2Z`=y;+X3) zcpx2eAh%yYZtZZ(C4eanmU^P4cOUFw()H@!HbeV~(F~aWwL{mc8NEW_DVYL=&zNAv z5m^q!S<=uO#SwF> 2ybOVw{b|@UQ0I%y#|^B%|T*2s~EW! zjBDR=xKEA<3^0+gAzef#@UbK%UqC-qYj||!3ULYG1^(<;I1*G`f!*IL&S5@kMx282j z8~TBEY@sosp`C!}upg2wNFATt8MoauO^0ONOS1(A)Xu`j2|*GoC_)tJaNW~k2_~Az zMExgEG(=XsH1f_m7mLDk8d8WwA5Mxk^pZROxu!9o+KVwjaJ_fi_00{>+$&Y0lHsUsUBZ3b+TEj{+5{ F zCm<8$paS?=WSBuS;8OjG&k~x;@-i1RZUixtk_p4~yuy%;8D!4BpT07u>SBU$L8oI9 zB @#2|0kU7Ob%D`1XL{uO04cbh@!of-B2jfNjdYs%`yh-h|blmdK4@F=% z2bECnJ50gq6HZvur{VTF)dqTt&v0r7--;txb%H8)`a~vdBpLMVK@$EF{S?W%1cr+o znO6BmIo*TUep|9;4y@=2wVi6a!u7Z}UOTOLAS`R!HmVo{RL^~Vh&b5hLU@M&)~~b3 zL=y=)cbF{nu=kR6R~Z E($9NcmtXyr{#?TH zN0=sBER;wNS *$kjfC?oaDx0=D0HQ1%czkNtnx?K`yh~OQBHqgrffUVX+ Jef?ws;F@%e(1NB2`r*x(rc;m+1>oSJ%uMB%dPAH^J1Mc^ z72fUC&A{WOColazO=&Jpvx+$@Gl5JQyKiP2;B?=>5W}q@;&?mnu~PqpgH${bIoJLk z9RyYdY -yBT2 z(wj|8SPRTQH4_`)y*A2u4-KA#m;s$&qz}O>1H$D7OG6(N7&!C&Z}-zlG> W8S?HP1~|AoXn5-LtBG$8d)u%j%>=?kkpAd#K16@^(0;ZOueCKwY^n?hjE%>o0DN z?@lqy_XD04G$nN8Gz=ZqDWpRQ#4Z|e+Bl2VDGAool!71Q7#<*%JI=;vx8IJjl&(*6 zHYg^?trE9(H|?yYCIuP{4kh_A@kX=qk_O)oxH7ys=}#~NilhY&_LCi)Ibz!~HLb$Q zRoNWspXV9&?$7>APZ;R&uAoNM>8Z|pDjpi;g;Ser-b33iC 2=o9}N1Q-u*Oe$r}$cdwWXVrJ5wi!|sBj)VTJ3|uS%WM{&2VP{klw~P~@LG3=s zy^#E))JUgZgvMRixZoK}QN}7-;mRa=mFx4*1*eutBDC8&CWlFk`=m(zogXVxCYW(~ z-Jq2U&bh}aJ@k-)e=K4EqBWm})tTK05(gg6e0VP5IB=zM@{hr3VJ28>1c!T_UiWQ$ z#BI?VWZ>wiGo#}S2BlcOF%HfMkBW_QWPghBx&;~+&~;DINU*&p44-I{09rb56^xl4 za=KNZih&M6m_DM?w_yV76I*p`UZg~yS|PJM$2Q1NQ+J)TbRTD=aA6UL&G*Nu1JyOU z$|He1QCW7rlI=`U(BVy6fJt?I$U8u%f#<-gcSAnDcRBpSNeP$H3?ciD*X5UR7k|bT zn8p`az@)+$=g4bOh8)m_Dygju#Pt2t?=$1})S2uP!OBCVL2Ix|X%P5#30Ug@3tR9g z?8{wjkUGlkrGrqIH7iWMm^~Ry7$_m9rgruz#y12*B59(bebt$|FT_olF94oDg3b*G ziokOmO%xFQE#8XpE}64i5t?jarQTD`BnO%6raQ)Xmc(w5n6KTM@)%n7Jb;2gE%HAdou;$W9gP zj)tH0`#W*AvL1L8?7MS1wW}sha(eJdHR6LDzzLJhz%}&HNwoKr0$pG0HFOMp$z{-T zIr_!YjGnzEej<}J6GVra9Jc$Qg*UkES_AG RtIeY^P-;%yf+dSqmsxV4cpM{)T@@y@ZoD-?di5@j*hlffzF#!W%;l z?t;3>wIAX_`O6DntTV8Km{b79X<`LnrpX|Xg^+(~13l4X%Ry!4l4O|D^d+gVII?gz zXaKYypP)AQ4~p8R1uh$@<6c%wF5{ !fc _Jl0z^DWLFUCHKaBo|ARD+sURZD9KkRbRc3-B`t1Mq~<{w>_^taWkFB#L8P zfwWKq7Phs3xuXUkP2K>8kg*=HXw4+-i@W}z*wAp#1Fyjs7C!wLyXID%cGj~_K!zFn zhZKOKixPP1;*DbI%>F8+fRH%nFd2Aio~H O|VP)e6jqQbXC@drda5(M;c@8$sZ zie>GWBo{9P(0noSTlTeOU9_%)@yzL}jPuUv<=ap|OdO_2H({a9{hud8iSC58h1oku zh9Mkl_{H8h<$+E2qkbBAjtm}q0Cb-xQD<1#^5^6=>iPO9Moqsac4vBmvk#pN7sJ8w zky+U0aa{^Xv2DWa)Z%-IxE`C9$=t1zXdDGvb|A4>6zDLc+<=E96Tj(V%w0RcVPFvt zv9ARs6jJ&(*j3%Be(W(zZD&Ql;)!5Fo5l}EWO*c|{ES#q94xUh1R#(!XQvWu-+nvP z5^5U)Z&>WhQ+_U_V+{5^DxJ@mwzhjzkS6=rA;nYVe31o8?d;~=P7c)M>Rt{tk=pLy z{$7E^gg|zdN1bk_m*!yEH|&{ffOE&j+z!kb)6_C84W6j>{EP|2tUYQw|1d0L+c7E- zGb{Ln5`tF%uxe5VQ$&~B_e3K0pH3(2=#QoPiB5)9uwzf6`(>Ru2WR=!8Y#tuz1iOf ztgffnW++JWq@A@fKv~{JBv3LjkHJ3;9pDs5nw^8GzF7_a;E|$^=NZWSZNP0NHvqu$ z!1xND1?g6^Ys-5~H~@Lp>}`fEk@)FcuCx)C{NyJ)mGo}*MTp6U2zw?~qQGoa^i7=X zYS~#!Xg-H+`p$<8!(S>gD!~_fbqoSlOh5`XK%g!D0)fs4JEFvcsQDDmOA?ki3IF_t zq8wQ#+Dx? $M3rD#-*aaRk}F!NRZ( znhJL9F3acYQnkMsgA%g9>L3s^nd`0hQsic_VTvlLz6J~{^nJzqCn5MUGE^#n9;+o6 z%w6mbu}03rB&g3c{PuT&{45`6BGsMl>VpCW(lThx`E&yHrAAMBbD9~;?!x_~8;vYONgz|tMOWsY6~ zda7BE67m=jFvK7oST~G1jE6l>2dairaT_z!$K5Bu6L}|$@1%4X&q*1Tab!CcWIk@l zEfiWKUi@c^c=ey1;*ZDgXpWC@yrEE>CuI*Nw@4K)lb-}93_u`t(g28oJc2-5n1_84 z;a(~%LJqL#d=gXSumU94i#7Y1M(x#kpUt_BIv`1SmNJkeTL0lW&p%COjEHMV&Q9(D z^@V?p2fW}vm7iU={a26>>#G+zOn~t$KoYBkK@CAh@{PWbrB&bZT|+Nhth8yZ=sXX> zyS{__m$R>FE_V4vF?J|C>+6{z8c2*Bdu}v4j`AGJ!j-jMyqKSk;3lHz)SRb}e^%r~ zXw#&Ti_ebu3LWsQCO=VU1-|=B-UMJTmIO$ooAp#Rgnf(1LQTGtr}l(?yQWhnX2n6g zD$nxMIthh=E#{rLw)H(~A2Oi?RtPQJ&r3WPi?R?&gc6-yMw3yfD#^(Z_Aa8C$*UA2 z3l5PEur+_49HOJ=n$=w7K~$1er@Fx~D3DDsao5@9+I-1lXP15a><+!m%_9FRHtbEk z)`NKuEloqVr3ei#=3M m{{|$M^U)iG zXb!?X`70OdbhUZf+NottmbKPMY2us vHk7B}Ly07ss_#>srh3mK&)JMf OMx$_j;z|n9o;$&wDklcb5E# z4S*PC4900!`LW!1=YZVW=5dn~k~Ts`DBaWUlXQGp#9P<4BxL+Q_=8&8jF7Q%t)#!{ zm#ijz&0MqLW>d_NbxXP735Fh(L1wj^I+GRb%;)Zfq9rs1>9t;ds{jxgJ^GL!(zj zDBQn^_v3O{3+(87Tc4t>!1o0hQ~`H@O) p*4MB{#7Y4 z R1mh)EzQzMtyqWKj (&pnhZX {UODc zwm?F-r;w7K*+T9iNvDkZNjZYG*qZMo_lodqE}|2LyPTp}Vx>J&o`D!qLuRlna`=(t zs?|Y&jeL=zm$qTqW2_Hx70z;Epd0+nZ+fSLCmnue(f@sQ3xT=ur}~QrDw(c&RQFey z7cNb?i=fO)|AfXz6>0k^Nt>qo`m#W;#EOU(C+6l{B7HB!-3uCe9%4^l8287mgc~}v zXlRnoW*uC*;)8C0f!#IDh(`Yu%N}lHWC9Y|Nl6c}``I5CBxE^*P}54O%a8`@hs>^l zu3(X(EqBHxDbKOzTA+h(nGqE{cTTqnp;;8uM*sP0mP}@Y?h83Mi4s>@IK75V=8jb8 zCV5Q}z6!jWH2C!P1*Dy3uQoNm`S#3C Y3H&%Xw>{v+I?e``4VGMbmK&ofwzA9=5FL%goRrsWDG4Qv z1LE(MfdNM{H#_}Up-E&boHIzsaeQ@=825+NV)oaO4=1G@$&P9Dapk0hdp#r!0d%H3 zBAMmB5~YANWsvJ8uplx(XV2HrSmG;o@)m0uKQ?*hBmD|EZB{Z%xA =lp;H0ZVv z6RRmUZyBS(tt6I}>WV_CF2eK++?*GXVQrlK9iV4}eW=;wUCg;_NdN|lUub+mAh!%2 zwz3!5eZ2Lk7(u@dHq_9~>Wl_HZEZ;k@bpW}jJ36OPBEq6tMB+Z(jKhNv;Zs<@*(7? z=_qdn{o)%SbyaOub0Jt4s~4a%$|M2{&mRySre@A-q0olbYoW1btQb$;=}6%*@?SE6 zmppV7*&)*xkX~37`Ha m)1r%&&om%7tTl7gqNJx!u5%BiNqS`AKUK+PCyhVb)xRV3$@cu3Rn*E z4OFe7s4b!Wyda`nI?PNGX;e+FHR1V$(2dtw^C0AC2cZm?tu2=KBi;*)p5MsNpkQdJtfd5 zS8lu!$cvp@?H3oyULO9ucgX?F$T9IimjTJY!e?w5aKq<)&2sbmFuS?cnr-jp&I;8$ z3KRLHM $vS<5z~_`)Z6CY_&6RX(c@N8!bS35GCBgc3ceo2K=b@W*`Ij63#sN zm5oW=H)hq3kts6`_x50~$zL@nwj|>X(rVc#{Qay~K}R&I>oW`0+{ldgeEatD5Q6H% zN!b+=9cd4u&r@^;7EdhTd>=v}ks`K}UI>ikBaK@DuK-XUTEW}Oo6QA8#6N?UeUooU zd2xRQm2&>AEZff992XHQLE0JfHRgK6Y0lm*9I;25G5Gk4R44y(ia+FHm^j@H&WLAp z93Paj@u3$hTl2C`onuRsSv2<>f3@v8mR)3J`g(Vh+sRoy5qPa5>MstMxaqdI?x6d@ zi=B_3S$961yuY#syW5*B!%Gae8(@o-@uxo>|A&gDF=E-(GTfqU;$hjoUh#RCU#1sV zogP#&dbeJCWz$JXhveBst`)ran%HM-x9s|oM1W~J-|l8<2j>c`ILsx)wal2cvElUr zb=mAyUFy(sGgj6%%lB{Mq33P-2FoA{NhH{7W3GQX|7=sD&Y72-Yxwf@mAFuFsWrU| zEY-t%*We(3^sVekWJ5Ey^D`C0&L(%uFZYA|p}tpguYbHMlbPw-ZV2`YyiN@0He)oS skJ8yq`cfp4=mL%knSXm=97q8{$l*d-KK;!J-hn8{sXQpWZ}Rv50mABA&Hw-a literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/news_details_more.png b/app/src/main/res/drawable-hdpi/news_details_more.png new file mode 100644 index 0000000000000000000000000000000000000000..764e589b2273638031f26b1186c8c722e0b04ef1 GIT binary patch literal 1494 zcmbVMdr%a09A86}#4}=w5mee1btJso+r9S<7p!-nga;1Z1TtkUyT9d*yWKr^*X|%3 zdDW=pOq!2qMjoL=pj3>*Bn%JBLaiC$kI;e9X)>b#vq+t!Df=C8)E|t0w6ptrem>v# zclU40*{oWYuna*ERn`_q9-L$0w=-%995pUSI-KH_i~?o5$SDC@0tm&5MF7p>>0*!v zXts3MC6J0B5kZfuKq+u;wK5{Fp+gu=koQA2f~2Me{WRkR3R(n;J%SCp)7^)m9@d8C z8=P9F-wxcKEoBneUY6rx%Djw)#nPTfQ-fA0fCmbV26>+#TZ1-iMy?gEL&rFV&Oj8e z4VyKpz_|^zixNN$8l##abR=rBXb6LaH0w8_q?Rz^T0Kr!)P&9oU%eKcdoZX?VmWJ` zBXdp{+}SX %YsP|T*;VQXcpi|& z-4X-y!6k*sFm{ht6aqqPthtg0CWZDnL}oV+1SQL1!{CjE^{`gL0vNNAG^tq&Ny9bA0yyMi7Ta z;h}Q*Px*w8U`>XW^UVM^^X&u#*h3O*mU|DxRS2@^ZkB^`1xF@puVg<)JvC6=WUo9? zmHvtKZbVnvr4@fgEZcd!zwbiYdB*gx>eq2 {dobzb5p3)GRhqekyxBgUh9sBuUd8D(DirSU(&7@D2)~+=jzj4ui^FoZ0+Yp~H@g`cIewcPw z{pkL@zc!|202zO> +b!`(Yc{6FFo~E_t|Orak_45 z=$Fm$KgGVEi8Qz7azj@iBqhp&k;;nOt;JUcRZ3(}&6?HC{eK_uMR%al9SwUU54@1r z*|^Ew)>D1s-iM=iP8**vG@j#b*0(*J+O>m!dMe+1p#0nX=+;wa)JwnP^|RgQ&vowq zsH~ U??tEs%aoOU%g_B4LVL?v{rZ}NHhi~aGjEngtxF)f#nl8(r= zqp|cWXHSpr8~Q5l=-cZ@O86JOR2)mi9nrU4-(LD|d&OWy-S-_M4JV1W%oNvkc**OB z-Z(SKytJ<<<>1iR$1Brorq0B)T#U)gNElg~u&O!IIedD!_`5$AkLxO?7nkTNMtrBr rI=_y%Ke4 hCJ^lH^VcAg-a literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index f42aed98c1..c27fc266a8 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -16,246 +16,328 @@ android:layout_height="match_parent" android:orientation="vertical"> - + android:layout_marginLeft="@dimen/cardview_mar_left" + android:layout_marginRight="@dimen/cardview_mar_left" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardCornerRadius="0dp" + app:cardElevation="2dp" + app:cardUseCompatPadding="true" + android:layout_marginTop="10dp" + android:layout_marginBottom="5dp"> - + + + + ++ + + + android:layout_marginLeft="@dimen/cardview_mar_left" + android:layout_marginRight="@dimen/cardview_mar_left" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardCornerRadius="0dp" + app:cardElevation="2dp" + app:cardUseCompatPadding="true"> - + ++ android:orientation="vertical"> - + - - + - + ++ + + + + + + + + + ++ + + + + + + + + ++ + + + android:layout_marginLeft="@dimen/cardview_mar_left" + android:layout_marginRight="@dimen/cardview_mar_left" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardCornerRadius="0dp" + app:cardElevation="2dp" + app:cardUseCompatPadding="true" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"> - + ++ android:orientation="vertical"> - - + - + ++ + + + + + + + ++ + + + + + + + + ++ + + + android:layout_marginLeft="@dimen/cardview_mar_left" + android:layout_marginRight="@dimen/cardview_mar_left" + android:clickable="true" + android:foreground="?android:attr/selectableItemBackground" + app:cardCornerRadius="0dp" + app:cardElevation="2dp" + app:cardUseCompatPadding="true"> + + diff --git a/app/src/main/res/layout/app_update_hint_dialog.xml b/app/src/main/res/layout/app_update_hint_dialog.xml new file mode 100644 index 0000000000..aed42d4e51 --- /dev/null +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -0,0 +1,96 @@ + ++ + + + + - - - - - - - - -- - - - - - -- - - - - - -- - - - - - -- - - - - - -- - - - + android:background="@drawable/reuse_listview_item_style" + android:padding="10dp" + android:text="免责声明" + android:textSize="16sp" + android:visibility="gone" /> + + + \ No newline at end of file+ + + ++ + + + + + + + + + + + + + ++ + ++ + +