From f4bdbe1ed1f5a18baa4efeedecc4ade7ec927289 Mon Sep 17 00:00:00 2001 From: seven332 Date: Wed, 7 May 2014 01:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20search=20bar=20style?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_action_panda.png | Bin 0 -> 1472 bytes res/drawable-hdpi/ic_action_panda_dark.png | Bin 0 -> 1710 bytes res/drawable-mdpi/ic_action_panda.png | Bin 0 -> 908 bytes res/drawable-mdpi/ic_action_panda_dark.png | Bin 0 -> 1092 bytes res/drawable-xhdpi/ic_action_panda.png | Bin 0 -> 1985 bytes res/drawable-xhdpi/ic_action_panda_dark.png | Bin 0 -> 2328 bytes res/drawable-xxhdpi/ic_action_panda.png | Bin 0 -> 3261 bytes res/drawable-xxhdpi/ic_action_panda_dark.png | Bin 0 -> 3719 bytes .../textfield_search_default.9.png | Bin 0 -> 14998 bytes .../textfield_search_right_default.9.png | Bin 0 -> 15419 bytes .../textfield_search_right_selected.9.png | Bin 0 -> 14979 bytes .../textfield_search_selected.9.png | Bin 0 -> 14981 bytes res/drawable/textfield_searchview.xml | 7 + res/drawable/textfield_searchview_right.xml | 7 + res/values-zh-rCN/strings.xml | 2 + res/values/strings.xml | 2 + res/xml/settings.xml | 2 +- .../ehviewer/activity/MangaListActivity.java | 143 +++++++++++++----- 18 files changed, 120 insertions(+), 43 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_panda.png create mode 100644 res/drawable-hdpi/ic_action_panda_dark.png create mode 100644 res/drawable-mdpi/ic_action_panda.png create mode 100644 res/drawable-mdpi/ic_action_panda_dark.png create mode 100644 res/drawable-xhdpi/ic_action_panda.png create mode 100644 res/drawable-xhdpi/ic_action_panda_dark.png create mode 100644 res/drawable-xxhdpi/ic_action_panda.png create mode 100644 res/drawable-xxhdpi/ic_action_panda_dark.png create mode 100644 res/drawable-xxhdpi/textfield_search_default.9.png create mode 100644 res/drawable-xxhdpi/textfield_search_right_default.9.png create mode 100644 res/drawable-xxhdpi/textfield_search_right_selected.9.png create mode 100644 res/drawable-xxhdpi/textfield_search_selected.9.png create mode 100644 res/drawable/textfield_searchview.xml create mode 100644 res/drawable/textfield_searchview_right.xml diff --git a/res/drawable-hdpi/ic_action_panda.png b/res/drawable-hdpi/ic_action_panda.png new file mode 100644 index 0000000000000000000000000000000000000000..7c3faf68aa6180294f75528faa6576a04b8bcc8f GIT binary patch literal 1472 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 Ef&(ujmjD0& literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_action_panda.png b/res/drawable-mdpi/ic_action_panda.png new file mode 100644 index 0000000000000000000000000000000000000000..6a0dd805f7247a3381b2b3a17bb432ec06070551 GIT binary patch literal 908 zcmV;719SX|P)Yghk|2pH!z2o80GefqmFawd)h z`U{y~4_w2qRE|;G762Ul^Z{k+)&2<0I(n?C1tIFn%?O zKotU$K`p}D0;}21|18t5W3D`C2uI2r?Y-J%<~Ig(?c5E<*Cr9DLtr3K!suVCo5E*z zK=Cni1rC9;^z#E_>yT+M`g8ei2JaZNB-=&9azOj8aO>E-Zw$DnV?A?a4uMMgx&v%W zpL#4{B7^%u8+tY=BMFFgAE4w@1t>(B;pjB%dTF_H8(=99l zGBO6#Abh|O(7~h?{s7f(B3WxDfmOmvxH9CLjD88_C=%@lI{SN-7V1QCR^4Kh-2Roa~VgV iBbNy2>b#Mb1E>D9%FI<00006SYaJiB%V(RjP?}NSd?@tq2Yq1+lK`LQofVKu{bvqN3ua4xl1+Kpa*g z3c651q;}zev`LeOg4TeoxUgzlv9&en5WiFM%JVgOX}YNkA3WY2&i|kPo^$Sf*Dz^< zAHxLupY&hAzZrp|qM{j@nVB0527{X#F~?%D&$OTVd_MnJYR2pJdcdp&GZ*^^?LdEj z|D#YS)TPCbihwvbnM{WP*)_&72=5}|g`NnUuLQdZo4>fhc0{AmYORP-0z4kiR=~@W zIEf4m4IK>x0zVSXyWQ^T85tR;Bx*_Uul;`iE%jU?0p~HWBwHn`d&yicE3)yO7PsqT zyhHkoFV~4s4+8e<3Lu0vkQv94>vU}pH%JP1rHa524CW^x|HinFFt;G`OM83!FR{zb z&9yK#hx9o3dK1)-Lf1wFPU{LNDJdyMX_dN&q<|oQ(Ad~0yI?5A%8k@f88#bvXQ*t^ z6}t{cgRTIXBn=f9uah?45UaXD=z7x$xx?YGS}c|-@J_+8h$nD7)N&*`hztlg0B|v& z_W&*e>`%wJVw<0zZ_dfd*$3A`xLV*jCu>So16~Yv@J1t%$g$?;=FT`kgq4sA+u-2f zo2I6w;ruI4adB~$(P&)Cd`B=C3@DBY3kzqP&F15Xn9SH!YQUFDz-|m&vfaqn9mSYE zUPUS-xAN3ObX`qE-lcAa=MhoQSurxNnhS!vtSf*bJWIH;5pYc@7{*+TiLl{^_7}o= zOie^|PJ)@EjM2UfJ}CXt($aE7ZDH&uV+T`3;HvoGtwwEFj3F0rxk`W^0ar8vc4FgE z*}TH$w)9;tR{`nSOEU(iq<7>QRfIUZ0MS%dc?p7$R)8EP{8*}~fsbk;YG46BF!_fJ zA7a>z2#9a(?Tq!oDMFG9AYX@=T|~$plgCGK0rU9E2{wR(huT6?*uZ*mQbAt|t_EkH zWRCGlKC5{@fIX8+z$y&nZ`Q>wILa=FssZV?^YZeh*zNYy2)Ba0i-1~P0kU_kR_k$A zG851Ig_tL|+wzISId24IyZ@u)T6rg~mIJ2{}3+XT6mHUF+ z8I>E6{3+!|)P|6E6kAAJY~zl=c#1C_%$OsP4rw~J{{>8V1pWZBujDW_f)U050000< KMNUMnLSTX;B>jy5 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_panda.png b/res/drawable-xhdpi/ic_action_panda.png new file mode 100644 index 0000000000000000000000000000000000000000..3403e594664af049726987986e7322690af97725 GIT binary patch literal 1985 zcmV;y2R`_TP)1K#2`UpLsX221r)`OLI|3e*g#Pc zd&D3{46(PUSW)ozi|_RDzE}3$`|iYiH_7DQ-J6}6{qOGV?CiC5>EzVb$@|}>1wd;C zbaDh*OQ4fafL0J}ErHe&D2c$5B}+D-NjLZicw2Zi_y_m{_yu@!TU*;tCDjIrV|#T3 zPl#;qz~@@<&+tc)?J3y)I!IY0RB8#}z{#{b3tlhB$S1rTg(J_DaimBV+eagFKD>F3 z?6^wr)61Aqf()2M%-;y;kP0Y@GVl+P8zb`JzDf>#LCcL%n|gvbT~fCEnX zA#jjyEr88@wV@r6GXg2wMrAY7Zd@h6?wa?)Nv{^`-D|vSL)k|-p=ZvZVJdXmM zt(U%|;ivF+@G5~yensv>cr$q2z&2@O3jyHBssI?o3TH|MCmY#xF#zme6@X_^V8Zc# zq#pp_sHyTn}n1l1KL#hX?PBf2t+VpcX@>OfRBNXgVzjh{I8(N*u<&;I5H|RdWVn! zPx+}B|1qRNkqls%dY=gQgguLdkh@85eE7Z+05*>D@DV)brJ_dehv2&!co(2gleCy0t_wYf1OpJw zgd6zmny_eq8;n7NThj;-cEZ>w*uWX5=kO&sW(5O)!F{oE8*Ff@(R>~TVeqr2^*m+> zpSI`g&G5#tpa0}}AU@3w@hJ!Z47p8>huxlPT)%YP2^Iayy#_Ps$om^?Q|@Y=!`&*gOdj*cbH4F_I26~;JxL#IQ2*V^{N02((#xQ zkFDL(9EoPjO}uwqrqM*&xs&7pU<5b&Oe1H|dFXJfTZ*vlQQJX@$AWRlj;;#8SQNMe z)Mz?NEl##0oJflmak-ha70^5YbT|t@+hwk8?BC1#U1Q2;V=p-?ma-kP1gz$47;AM8 zO5J*rBOvltV?E4d(G1!eu<`(K1|60oV&2gsE&ikwP`*OWs!}F}0Pr%cSBz;GiPHO1 z0Px`A+RdY?OQ5FPSn_s?56R`a2)To*0$}ior@z;rv|YJ7svKLw$|Dn$R|{sq0lYWi z%A=v^X;<-034|R|5J{HAMq|9)NMqa^8%yU|B#;7-dn`tevr+)^Y7myZC#TGSWB~1u zl9(qvQ_dQ>AGfR2;&|Q?@L24$^$M$y(B+kzAZOJ8vX;R0w24=M=3&z#bS8zwfMK*Y zp{dbal=ezN-(@lqK0NWxM8=b1P;Opp3kc>P+D_IXrt{l{$*mB1vEyy0iyIT@Q zh9UbzRRGpUfjM=&H2xThuP)uA1~veIyDq_R06=pDEA;_l2fDKc`cmqQ7 zjnV)_Aefywuh zUqv&-1jL=9!zilyn3H(j?fpQU{A1Kb*nGFF!MXs5X2RBdniB7vV$|sSApB(LTFi2s zj+=iR4;$#VNRgYvZ~h6xV{&P#8-NG|opVI2;H2FeIU{DkPRqA&(zH02qQj82z&&9z z%0uDgh^xZ@>=m3hQ6@cgQ6&Is7IE4=_)OSyK-$fbq82ADj+#7~8k^46B6ae1*ma(z z$5h<&z@2owa!I~J0EhvxH_ztoj#}tn+CoRp5q}YOw|OJ9QITAS0uTdY8=kwumbRQ7 zD;GJE@!mk{D7%cj@|s_#p3G(q0U&OT<>5}Tdjy2QIK8bgru|9EnBg^>9kt`{(CJct zeJu-6!vQGkP_yM*05lu%WzAk|1}tkM(rkZPGoaasFKhN%GhkU8k!JhT>1V)S?~Q9; T5bKMG00000NkvXXu0mjfwu8cM literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_panda_dark.png b/res/drawable-xhdpi/ic_action_panda_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..006bc6ea425067faff30c1c42e9f73e066097ec1 GIT binary patch literal 2328 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_panda_dark.png b/res/drawable-xxhdpi/ic_action_panda_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..eec1113593c5dd292833e5a04342e959c68b247b GIT binary patch literal 3719 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/textfield_search_default.9.png b/res/drawable-xxhdpi/textfield_search_default.9.png new file mode 100644 index 0000000000000000000000000000000000000000..69bde4e86ba0f471480ffdea2bc35b5d7c35e09a GIT binary patch literal 14998 zcmeI3Ply{;9LHZ#OU{F%;!Iqp2*Z z^Mi8ezkIwE1g^reolYm&5tEL$%JQ--vz)*RLINog{)QcB-GuEQ?wdqDD)e>FbOY0| znb22jIBP*Z9uEr*KZEPC+*)l|%Jv8J5J$GFxh$XLSj%FkW%|Jq91U`6reEK1A-e>9 zXU)?gk{_OKR9Q!(8(i%+j4JEU4yIb6IlH~lwEBiV%yHMeb`P|nv#<>LB%b8Jf*xiFTt#DvAX8;U)W~RZeIU_CX>8JJ9RDY^-2uiJ{obXJv{I#~~=xgD1 zRn-FONE)W0%$FotRApY3g>*X0^TjkT&KJvNIhztwMXs1*XIhL_)S%21drpvfzEYIS zX|99s&?)V{-1p?W~kNsG&7c zcbqoiO2*ZrA&rcnss(VwH(eJHTv?I0i0{y(uN?EJIfmKX*y=GkN1+F%9QQzXZbJ*S zZMooD%*W7`rsG*!P%tfR6|%0qnqx<>?Cw0yMQ zM&WbpMBBK2B|NIyYdw8N;LwNV!@q-6yn8(L)a_I8?(x)7<}E@; zdRwU9iXP6;b0Ir?FxL`1lN;=*YVV~UH22p3RX zI1OSar$LMJqf0Qlz?`u!DvH4cE^&H$ji4Zs2C_0wO?BkgllwOH@|@W)$P>^!sk!jE&W zes6vH)5b$jUjO|>v337kao3^U*RK5e#+7RI;>$l zO?E*kiUko-N|B<12X6{Jc=4cM6+MZdf(HxY!BdN%2mhYdH&Md+sPW1+XUHO$Ai%nRhaF0hItxBXv<_l8+2fu05aew z0`S({&<)nyDJ6&Q7~-VDq1~DSF!D@I13i06TIA`c#dE4Z)CCBo(a@goZ8-gnw(gqi z(R0n~CFsanwx!i8k}B#dud9MAD?DG8d9hxuR#hb@=E_{Tz)qDI&8R_{3G$qv)Kpoh zRb{Ti^EIxVFUxg7sL5(hl>|;qjcMUitxKrmCPGY$HGRJA0tmULfIYr~R zq^oh%bdkVqgJ}+?a#q!bTAT{kqQ%~Si({40%lzGgt!;&zlhBT+LqFY5D#!+~a1|?aN zM5(}{&1lA=-2?3v-G-NqAlmOmSSijy9TO8zj1u{zSe%%03=;cmBz5PF_q~2Ayivo; zJUhJ2k8O#=bLM*f7(LPTR7JE%5d;X{B)IT=5HG=n0KuCC7oHE|CAbhEc$475^Fh1> z7Xk!t5?pvbh?n3(fZ$Dn3(p7f5?lxnyh(83`5<0`3ju;R2`)Sz#7l4?K=3BPh3A8K z2`&T(-Xys2d=M|eg#f{u1Q(tU;w88cAb6AD!t+7A1Q!AXZxUR1K8Tm#LV(~+f(y?F z@e*7J5WGon;rSq5f(rqHHwi90AH+*=AwcjZ!G-68cnK~92;L;P@O%(2!G!?9n*l{U0Jw;L41&Z41o;&$@9mclj_40D>@=wRUn7PF5I(+u+D-XFpoPX-_ z%i(Pwd~@-uCvPsl;yzxvcmJF9a~FQUiNF`@7=WP literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/textfield_search_right_selected.9.png b/res/drawable-xxhdpi/textfield_search_right_selected.9.png new file mode 100644 index 0000000000000000000000000000000000000000..475466dcf96df87675bfb2f0f75ca9f1632c5d69 GIT binary patch literal 14979 zcmeI3Ply{;9LJ|9{@Gd;dT14dAw^JZGXE!;AxTLxSvO$nvQ6pk$KYfez_yXDd_Py`# z`+M_we`YRoe)0Iz2j(7~V;JT@Wx-g&zbyVfbl*Mr@42mS4&k5s+Y2iJ!|Xp8efKf% zTsq7!+UrhjIb5zjqg!4pW!l~b#~43Oo2D@^d)K`gUDk zGUf;6@PD~PBMjR*$8|cLR7XmA{u(D}n#S=WCyGg|NCq2jXm*osaHMY%`xq#&e5V~c zp36qQ=Bl?I<`Rjh(C{<3u2#ER9hP!~0X@u->zZv&Nby{&#ZAi$!X-2sO^-$Gb^WV%uLEFRt9YWHANK8xINsuiBI+Z#=*Z(GBh_PXEffwnCUHBk%K2`~d; zDu8yw3%#J>%_uqS?m?VZICSbW07gAC(@@u$krwsz(|T*FKh;?brCQaW^&PzY&8Fd5 z>(O;pj6Cj0*^aHx7Zpu1G{MkBRm})OK^3I=LaC%>WJxaYg)BGIVzi*rk7saxw$(kbaQfv=WCu}Qj5Sp%q2BUWHs55dV!=t*Ll-2rb5~XD& zsbz$8QnNCv8Hv|aRa9eZkUn8;Am2HQ?0Mg7^)^e}^aB(v+*~4Fxx?KxAlh5{x-&T@ zLoH|0C0Q=0q85=Xs%4{CR+OSqOc&Dz9?wMTXgt_F+wZpj&m2vpj+|o*;8G_S$bu7u zp1%P)q5(z6#|iZO?$)@Y>Fkl%kQ?6Vx@koRQ$8>;^#}-P8x6Ui5f$nSroi6Y0+>jj zU8B=LZXTc1a*|h)e7eT-Il@akd5^ig3AZ?b&<*030#6l|%) zK5@!%ZLbqN85{1-nC)yeOm_|0c`iAmpd9zWcW&DZ%{{q5 zE%31|z3%xfGt4_Ja}9BAcP-0}8i8_n2hdAi)ARALP#&Ll)0#n6boNK5HC{euZ=(oV zZlY~mzZ@M^&Gnu>E%Nxo3DMs{D(oIlUAcWK>>f`YWuA1MFfR_OjWvU;=myn?aRNV- zp}eXnl9J`do5wR2oi1uF8xFp21<}zV;Yz)n@s6p9E2BgqF4ju~9fQRF9s!R}y)D#l z#SdrrxsV$^81CL(!}ID62cs*x!^Y5#7J)Q~F~vnh1O*fqq(O`+E+Qf*ptv9nVoY%n z5kUdP1!)jtii?N{3Mei}gBVj>L_|@`DX%J(Ii--scC@x5Y7*kwC zL{LC+K^nxE;vyn~0*VXLAjT9I5fKznT#yDarnrcRpn&3nG>9?9MMMMz6c?mHj43W6 zA}FA^APr(naS;(g0mTJr5aZk8nj5`piCp}CWe2}V`ImR|H~bPNYb`8Q8D{fwhS_?V zVgB90zqoy!XPDnlGmQQ=!yNK1KKIo;);blVQ0xBm#~X#YFW3j}?p)Y;ab-uo{QZR= zN*^`$r(W55SUP{@@M7(g4+~pgb}BcvU%h%gweRY=_b$C~@!P+Dy|(&(`bzHBt;-L- z_Q8!GAG^*xvQ^ps=fd{EqxbUHesSMD`SY96Yot3ncQJoT>erv{eD@aqm#LJG8y^=> Gzw{sFus^;4 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/textfield_search_selected.9.png b/res/drawable-xxhdpi/textfield_search_selected.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a8878b3644f79f1a5c909992d9bd20462d5675ef GIT binary patch literal 14981 zcmeI3O^n+_6vwB6R%KCz3Q}7kfvgk|h$jAs?Zj4+lEhhd5h=?yrMsendhOX=vxyyS zZVu0_%|Q+CGX4~dwSp0gHs5heX}#hJo)Cx`@X$<$miQYNPFL@ErbizXLZYKq)gje!l`znNz@4Cj<%bowT44(39mSAKJnK#R}-9L=MyKD zs!(l~@v1Yk>Eq*@$7f2U7r@8LeJD_cg$93Ewbppab z91Ebi>V;mg>P;xw@9sbxS2%Q*Cjg9kCZ^%GGa)VN>85qoRClU#1WL84Kj%AS`I~ja zv(}^Qnl%cfBV{|bK3!6@w4sTHCaG#x6pN~uo-UTlT2@ZWMWLAECt3_vRIkh!dqK)p zG*v2=RiPw`6``0Zs?(BGQ8igpBq1H!gVYh*SvLqx*TTI~J7m;Lwj$%KY9~!wHIo{a zv&pO~FDErcSdvvSE82=0TZ8lwYXkev8EjAcUZb;Fnx-G%XyN7)@yhM*t{&0O($}5Q zF&Szln<>k3QI)iaWJ#?UrHZ1Ij8dkQG01pEQU~K9=DBXS{eR|YBz52%V*r;rx|Z0O#*K@Y?(eTu8>Vu=-wLU;*)|a zm$}DJI7e?J)AnoJmETFLF!c-Y6e-+ z4XO*{IC&_;1yxbfN{%0H9?qC^+PJ=8IOM(+L`O%ORO;jmcZ^M393+Zyu}&iB=p}ad z2zY$zY@u!|c{n4_g?#_PaQp7+pI3J{7+ldEHimYr2&6%c87?X!C}6lC4QkAAQ4v7_ z!v$$jV}^^02nrZ3NP`+PTvS9*z;Hnt)R^I-B7y>j3(}y*3>Os<6fj(n1~q25sED9| z;es@%F~dbg1O*Hiq(O}tE-E4@V7MR+YRqs^5kUdN1!+)YhKq^_3K%X(gBmkjR76m~ za6uZ>nBk%#f&zvM(xAo+7Zni{FkFxZHDIYL5&$MDk3Og zxF8K`%y3Z=K>@=BX;5Q^i;4&e7%oVI8s8Sz)Znj{*d_n3Y>_`we)-GubL3B$oHa9F zMQHO;gwDQ&(5)@<{VPK20z$u?Mo9kvp@ZIgFMm5tv}?0QvDW_Sk8{PTYr@{UTjh^_ z+`4+{_46-nUODhe>H5cudmny8pZ;V|?cAUL+<((QGJEQU6Ni4@f9cfsk6pjE|FwTF zpohLb`1j||l><-xerxyT-B;1gPlF4U%e#Nrb@9d + + + + + \ No newline at end of file diff --git a/res/drawable/textfield_searchview_right.xml b/res/drawable/textfield_searchview_right.xml new file mode 100644 index 000000000..79ebd93bb --- /dev/null +++ b/res/drawable/textfield_searchview_right.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 514ee28ab..097062f57 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -203,6 +203,7 @@ 下载失败 未启动 等待中 + 等待上个操作结束 上一页 @@ -233,6 +234,7 @@ 默认 首页 + 模式 收藏 下载 diff --git a/res/values/strings.xml b/res/values/strings.xml index 001dcd81f..25e43b24d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -207,6 +207,7 @@ download unsuccessfully Not started Waiting + Please wait for the last operation Previous page @@ -238,6 +239,7 @@ Default Homepage + Mode Favourite Download diff --git a/res/xml/settings.xml b/res/xml/settings.xml index a69b064e1..9e98c39f4 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -24,7 +24,7 @@ android:entryValues="@array/start_position_values" android:key="preference_start_position" android:summary="%s" - android:title="@string/preference_page_scaling" /> + android:title="@string/preference_start_position" /> diff --git a/src/com/hippo/ehviewer/activity/MangaListActivity.java b/src/com/hippo/ehviewer/activity/MangaListActivity.java index e2eb20dc8..cdb0c575b 100644 --- a/src/com/hippo/ehviewer/activity/MangaListActivity.java +++ b/src/com/hippo/ehviewer/activity/MangaListActivity.java @@ -2,11 +2,10 @@ package com.hippo.ehviewer.activity; import java.io.File; import java.io.IOException; +import java.lang.reflect.Field; import java.net.MalformedURLException; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.apache.commons.lang3.StringEscapeUtils; @@ -25,7 +24,6 @@ import com.hippo.ehviewer.ehclient.EhClient; import com.hippo.ehviewer.network.Downloader; import com.hippo.ehviewer.service.DownloadService; import com.hippo.ehviewer.service.DownloadServiceConnection; -import com.hippo.ehviewer.util.Cache; import com.hippo.ehviewer.util.Config; import com.hippo.ehviewer.util.Log; import com.hippo.ehviewer.util.Ui; @@ -36,42 +34,36 @@ import com.hippo.ehviewer.view.TagListView; import com.hippo.ehviewer.view.TagsAdapter; import com.hippo.ehviewer.widget.DialogBuilder; import com.hippo.ehviewer.widget.FswListView; -import com.hippo.ehviewer.widget.GetPaddingRelativeLayout; import com.hippo.ehviewer.widget.HfListView; import com.hippo.ehviewer.widget.LoadImageView; import com.hippo.ehviewer.widget.OnfitSystemWindowsListener; import com.hippo.ehviewer.widget.SuperDialogUtil; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; import com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivity; -import com.readystatesoftware.systembartint.SystemBarTintManager; import android.net.Uri; -import android.os.Build; import android.os.Bundle; -import android.app.Activity; import android.app.AlertDialog; import android.app.SearchManager; import android.content.Context; import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; -import android.graphics.Bitmap; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.v4.app.ActionBarDrawerToggle; +import android.text.Spannable; +import android.text.SpannableStringBuilder; +import android.text.style.ImageSpan; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; import android.widget.AbsListView; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; -import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; import android.widget.BaseAdapter; import android.widget.Button; @@ -83,7 +75,6 @@ import android.widget.LinearLayout; import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.SearchView; -import android.widget.SimpleAdapter; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -131,6 +122,7 @@ public class MangaListActivity extends SlidingActivity { private SlidingMenu mSlidingMenu; + private SearchView mSearchView; private ListView itemListMenu; private TagListView tagListMenu; private View mDivider; @@ -280,8 +272,10 @@ public class MangaListActivity extends SlidingActivity { mTitle = t; setTitle(mTitle); } else { - // TODO add tips lus = backup; + Toast.makeText(MangaListActivity.this, + getString(R.string.wait_for_last), + Toast.LENGTH_SHORT).show(); } } }).setNegativeButton(android.R.string.cancel, new View.OnClickListener() { @@ -1119,6 +1113,7 @@ public class MangaListActivity extends SlidingActivity { // leftDrawer final int[] data = {R.drawable.ic_action_home, R.string.homepage, + R.drawable.ic_action_panda, R.string.mode, R.drawable.ic_action_search, android.R.string.search_go, R.drawable.ic_action_favorite, R.string.favourite, R.drawable.ic_action_download, R.string.download}; @@ -1160,28 +1155,32 @@ public class MangaListActivity extends SlidingActivity { case 0: // Home page ListUrls backup = lus; lus = new ListUrls(ListUrls.ALL_TYPE, null, 0); - if (lus != null && refresh()) { + if (refresh()) { mTitle = mResources.getString(R.string.homepage); setTitle(mTitle); showContent(); } else { + Toast.makeText(MangaListActivity.this, + getString(R.string.wait_for_last), + Toast.LENGTH_SHORT).show(); lus = backup; } break; - case 1: + break; + case 2: filterDialog.show(); break; - case 2: // Favourite + case 3: // Favourite intent = new Intent(MangaListActivity.this, FavouriteActivity.class); startActivity(intent); showContent(); break; - case 3: + case 4: intent = new Intent(MangaListActivity.this, DownloadActivity.class); startActivity(intent); @@ -1224,6 +1223,9 @@ public class MangaListActivity extends SlidingActivity { setTitle(mTitle); showContent(); } else { + Toast.makeText(MangaListActivity.this, + getString(R.string.wait_for_last), + Toast.LENGTH_SHORT).show(); lus = backup; } } @@ -1423,18 +1425,18 @@ public class MangaListActivity extends SlidingActivity { SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); - final SearchView searchView = + mSearchView = (SearchView) menu.findItem(R.id.action_search).getActionView(); - searchView.setSearchableInfo( + mSearchView.setSearchableInfo( searchManager.getSearchableInfo(getComponentName())); - searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { + mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextChange(String newText) { return false; } @Override public boolean onQueryTextSubmit(String query) { - searchView.clearFocus(); + mSearchView.clearFocus(); String t = null; if (query == null || query.isEmpty()) t = getString(android.R.string.search_go); @@ -1447,38 +1449,90 @@ public class MangaListActivity extends SlidingActivity { mTitle = t; setTitle(mTitle); } else { + Toast.makeText(MangaListActivity.this, + getString(R.string.wait_for_last), + Toast.LENGTH_SHORT).show(); lus = backup; } - return true; } }); // Make search view custom look int searchTextID = mResources.getIdentifier("android:id/search_src_text", null, null); - if (searchTextID > 0) { - AutoCompleteTextView searchText = - (AutoCompleteTextView)searchView.findViewById(searchTextID); - if (searchText != null) { - searchText.setTextColor(Color.WHITE); - searchText.setHintTextColor(Color.WHITE); + AutoCompleteTextView searchText = null; + if (searchTextID > 0 + && (searchText = (AutoCompleteTextView)mSearchView.findViewById(searchTextID)) != null) { + + int searchCursorID = mResources.getIdentifier("android:drawable/text_cursor_holo_dark", null, null); + if (searchCursorID > 0) { + try { + Field f = Class.forName("android.widget.TextView") + .getDeclaredField("mCursorDrawableRes"); + f.setAccessible(true); + f.setInt(searchText, searchCursorID); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + + searchText.setTextColor(Color.WHITE); + searchText.setHintTextColor(Color.WHITE); + + int searchImageID = mResources.getIdentifier("android:drawable/ic_search", null, null); + Drawable searchImage = null; + if (searchImageID > 0 + && (searchImage = mResources.getDrawable(searchImageID)) != null) { + SpannableStringBuilder ssb = new SpannableStringBuilder(" "); + ssb.append(getString(R.string.advance_search_left)); + int textSize = (int) (searchText.getTextSize() * 1.25); + searchImage.setBounds(0, 0, textSize, textSize); + ssb.setSpan(new ImageSpan(searchImage), 1, 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + searchText.setHint(ssb); } } - int removeImageID = mResources.getIdentifier("android:id/search_close_btn", null, null); - if (removeImageID > 0) { - ImageView removeImage = - (ImageView)searchView.findViewById(removeImageID); - if (removeImage != null) - removeImage.setImageResource(R.drawable.ic_action_remove); + int plateViewID = mResources.getIdentifier("android:id/search_plate", null, null); + View plateView = null; + if (plateViewID > 0 + && (plateView = (View)mSearchView.findViewById(plateViewID)) != null) { + plateView.setBackgroundResource(R.drawable.textfield_searchview); } - int voiceImageID = mResources.getIdentifier("android:id/search_voice_btn", null, null); - if (voiceImageID > 0) { - ImageView removeImage = - (ImageView)searchView.findViewById(removeImageID); + int plateRightViewID = mResources.getIdentifier("android:id/submit_area", null, null); + View plateRightView = null; + if (plateRightViewID > 0 + && (plateRightView = (View)mSearchView.findViewById(plateRightViewID)) != null) { + plateRightView.setBackgroundResource(R.drawable.textfield_searchview_right); } + int closeViewID = mResources.getIdentifier("android:id/search_close_btn", null, null); + ImageView closeView = null; + int closeImageID = mResources.getIdentifier("android:drawable/ic_clear", null, null); + Drawable closeImage = null; + if (closeViewID > 0 + && (closeView = (ImageView)mSearchView.findViewById(closeViewID)) != null + && closeImageID > 0 + && (closeImage = mResources.getDrawable(closeImageID)) != null) { + closeView.setImageDrawable(closeImage); + } + + int voiceViewID = mResources.getIdentifier("android:id/search_voice_btn", null, null); + ImageView voiceView = null; + int voiceImageID = mResources.getIdentifier("android:drawable/ic_voice_search", null, null); + Drawable voiceImage = null; + if (voiceViewID > 0 + && (voiceView = (ImageView)mSearchView.findViewById(voiceViewID)) != null + && voiceImageID > 0 + && (voiceImage = mResources.getDrawable(voiceImageID)) != null) { + voiceView.setImageDrawable(voiceImage); + } return true; } @@ -1508,7 +1562,10 @@ public class MangaListActivity extends SlidingActivity { showMenu(); return true; case R.id.action_refresh: // TODO 点击刷新，pullviewheader 不会自动出来 - refresh(); + if (!refresh()) + Toast.makeText(MangaListActivity.this, + getString(R.string.wait_for_last), + Toast.LENGTH_SHORT).show(); return true; case R.id.action_jump: if (!mHlv.isAnyRefreshing() && isGetOk()) @@ -1670,15 +1727,17 @@ public class MangaListActivity extends SlidingActivity { } public boolean refresh(boolean isShowProgress) { - if (!mHlv.isAnyRefreshing()) { + if (!mHlv.isAnyRefreshing() + && waitView.getVisibility() != View.VISIBLE) { lus.setPage(0); if (isShowProgress) mHlv.setRefreshing(true); mGetMode = REFRESH; getList(); return true; + } else { + return false; } - return false; } public void buttonRefresh(View arg0) {