From 52b62cefeed1a6d4bad01302e94830280d6866ff Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 2 Nov 2014 19:47:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_action_clear.png | Bin 253 -> 354 bytes res/drawable-hdpi/ic_action_delete.png | Bin 433 -> 354 bytes res/drawable-hdpi/ic_action_filter.png | Bin 0 -> 250 bytes res/drawable-mdpi/ic_action_clear.png | Bin 232 -> 280 bytes res/drawable-mdpi/ic_action_delete.png | Bin 277 -> 280 bytes res/drawable-mdpi/ic_action_filter.png | Bin 0 -> 221 bytes res/drawable-xhdpi/ic_action_clear.png | Bin 374 -> 534 bytes res/drawable-xhdpi/ic_action_delete.png | Bin 536 -> 534 bytes res/drawable-xhdpi/ic_action_filter.png | Bin 0 -> 365 bytes res/drawable-xxhdpi/ic_action_clear.png | Bin 531 -> 769 bytes res/drawable-xxhdpi/ic_action_delete.png | Bin 927 -> 769 bytes res/drawable-xxhdpi/ic_action_filter.png | Bin 0 -> 548 bytes res/layout/exculde_tag_group.xml | 24 ++-- res/layout/history_filter.xml | 42 +++++++ res/menu/history.xml | 10 +- res/values-zh-rCN/strings.xml | 3 + res/values/styles.xml | 8 ++ res/values/themes.xml | 1 + src/com/hippo/ehviewer/data/Data.java | 41 +++--- .../hippo/ehviewer/ui/HistoryActivity.java | 119 ++++++++++++++---- 20 files changed, 186 insertions(+), 62 deletions(-) create mode 100644 res/drawable-hdpi/ic_action_filter.png create mode 100644 res/drawable-mdpi/ic_action_filter.png create mode 100644 res/drawable-xhdpi/ic_action_filter.png create mode 100644 res/drawable-xxhdpi/ic_action_filter.png create mode 100644 res/layout/history_filter.xml diff --git a/res/drawable-hdpi/ic_action_clear.png b/res/drawable-hdpi/ic_action_clear.png index e548000b1afc639f835b7c54fb7193fca5bb3aaa..cce17157b3a7974a47c78a3f269fc5535bbd60f2 100644 GIT binary patch delta 328 zcmV-O0k{7B0pbFXBYy!YNkl#s;4w}W)xZyfO6uRvxgBy@1j z?S{ljKwr=zAJT zd%q(`0uq}w7&;JAi}yf4A+``(D5L;e=v4te$Ra!DEu2#*q$nR`oI;#J{eE8I6yg*L zDZnYjDOCOxI>W?4WUGG*uQ5hvn!PQr(_18%Ymz9iClJ^u@cO@$c$pg`!4YeuNhHAD zfmwjSO@Mtu)Ikn3ku8ZePN!HyO~Mb@8rLpZJ8kjJUM2#O1t$$BfuwR8HlqUu(UOJ~ a@4y2IfRQofEj1qi0000mhi)^6UMB2bz*5($N4U8J0qrE?`fl;Js-COh@pcjqGw}DY)vvm&* z+;#7#w~!5FXJC!X?)`ZTbOJ03ca4^z|NWin2hjT+Axe0^2(S@g8XAH>(@gPWR>lc|J4T>Iz<+muFeEM%M`@4{&`B-e zmmy4rfq)jnWpSYL0=}4xq{6^~F2iMU;E^Frg@J$r!$k`?lc5_uFvOQ)5ct1ku1UbD zmCmt1E;oGE2W$)VLahRxFlU8Pw`9qH-2>Z$fGs;m0@zHEI5`kZ6kcMz1Cdfv38{q0 zZc_$R38{osLVx-e3ev~c*X+$&xzD7`0S4$V4YRK$%Pl(-!a-4{-olX%b&vi zV0h0qX*}@e+_b!!dq25X(^R=aqNh2=y+^F%VOtIPU-e002ovPDHLkV1n|E Bwr2nU diff --git a/res/drawable-hdpi/ic_action_filter.png b/res/drawable-hdpi/ic_action_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..6231bcff8e89fc55fb1af8523e0875bf1e82fb8d GIT binary patch literal 250 zcmVIM(SA@%a}xG(Z7X{;j>wfEnPlxO2PEG-T#r448q+aqlxQ`+^(w`;i*i z00ktc90PJ2SUf@g1{Ux4XL$-(Z3F|y8OSa=wa;gO>_>?$oprKUMfxV>PD#3)s%^5*7 zOcKyw$?99Uz$%VuP2X?L!Up94;}v%5E5Gt={a`;qkJT!{{w5zoCX1QZqJ|JA0q)5H xLivqZ&zW`O{XFcdt zMn*VsEXHL9QBg1;4gkix4A5e0Dp`IMnE0MxGYe-3 z03F~0)X+&K2b2RHuxH3QU|^$wN!-$h^@I7!85Z5C8ytnJ*!OsJDCo0000?$oprKUMfxV>PD#3)s%^5*7 zOcKyw$?99Uz$%VuP2X?L!Up94;}v%5E5Gt={a`;qkJT!{{w5zoCX1QZqJ|JA0q)5H xLivqZ&zW`O{XFlOv5Z|%>oC@3yjq#${4nUPT^RR+z`>g(q6-` uDwb(Wjh&*c%2#dZ~E121ASQu7VRVt>hT>F>-2s~Z=T-G@yGywpj0bMQt diff --git a/res/drawable-mdpi/ic_action_filter.png b/res/drawable-mdpi/ic_action_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..3e5a4c1c3377454a8e8c10c4a9cf6cc18a67a3a8 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJC7v#hArbD$DG~_>EDn4#?y*WR zVR3V2P-gk}|9}0oX_1pBPP`~_^N-`p20p2F2iAK63zj~;aYpVeD~mJ34DA?=PO*el z_nZCg4fz&mL@!FWE;-J_$;*LR0^$b@4ZMSaAc#1=(w=0Jv8%dk2Kp@&ENoX-)tjo<{gw%n%0Hp<`X>Z{ z9Z)#}9D&LkfFxLa1e&Iqq05e7%Zc6gf%T^$gzH4Vq~%2cFn<)^7Ev4o6#yt~=N~Yy zV$Gi7$#=IF5UyaaeKFB3w|#56ziR<_Obz6*9sq2n#vuTyh{<}406RbfTxlPUfENdp zev+R1t4Po@!P2oz0DugqNN}rkl0ExBVD{g%IamRZbN5^uJd@u608pPw1i9wbZ-TrEYsr*aK#N@bZ;)DmT7X)BT7X)>LZlgdsRgJ7 zs0FA6s0FlSN-dy8j#}XFMG1-_iXn=jy2a22M&QCiq(07wtY)0G1H=3^vqTBKL@Whz|H11b}!Kke8v4VRehzB$R$%@H;{AH%k9sH&X{h z02ZVTVf&6CNb#4#KLFr+PypKCxD;*U`z~x9CY)dfw^Nu9p3M9+Y>vY3EQPnexs%M1 ylj|M?z!mNh24e?|@S(V-#13$UdxXKN?|>f|8}32eaop|z00003r$T4}MKa6d0o(VgIJukzvDTH{PcnWYz(ZM`{tzC7!Jg?`91ET0W0) zXFj8Eo=dHJDYr|ko3S{9$(4UE=dNOUa_&BB%#TGs-_&kBuFjCh$oPi!z||x@hASFf ztN{+ZlMernSP;!-5i%$5`n0P8Z>)NqjTtN)_^%4Fwpj7CCk8Yye+keHbXf7YK!S}G dhlJW*rg_Z`k&Z93WZf8mz|+;wWt~$(69CRRhuQ!D diff --git a/res/drawable-xhdpi/ic_action_delete.png b/res/drawable-xhdpi/ic_action_delete.png index 4b6b8fb2268e8fdc883e1393bd8660d904fff6be..75dc29a63759cbd9b0659226701558e15dce5b0d 100644 GIT binary patch delta 508 zcmV;*LR0^$b@4ZMSaAc#1=(w=0Jv8%dk2Kp@&ENoX-)tjo<{gw%n%0Hp<`X>Z{ z9Z)#}9D&LkfFxLa1e&Iqq05e7%Zc6gf%T^$gzH4Vq~%2cFn<)^7Ev4o6#yt~=N~Yy zV$Gi7$#=IF5UyaaeKFB3w|#56ziR<_Obz6*9sq2n#vuTyh{<}406RbfTxlPUfENdp zev+R1t4Po@!P2oz0DugqNN}rkl0ExBVD{g%IamRZbN5^uJd@u608pPw1i9wbZ-TrEYsr*aK#N@bZ;)DmT7X)BT7X)>LZlgdsRgJ7 zs0FA6s0FlSN-dy8j#}XFMG1-_iXn=jy2a22M&QCiq(07wtY)0G1H=3^vqTBKL@Whz|H11b}!Kke8v4VRehzB$R$%@H;{AH%k9sH&X{h z02ZVTVf&6CNb#4#KLFr+PypKCxD;*U`z~x9CY)dfw^Nu9p3M9+Y>vY3EQPnexs%M1 ylj|M?z!mNh24e?|@S(V-#13$UdxXKN?|>f|8}32eaop|z0000FmuxPVo7vg<-R$gsFBf`+ze3^p_XI!{ zP&ff?fx-(wO)&cwh%qjr%62hEjMes5`GpWJjeaKctN@Vw5`R{+LnQy5L$?Og!S3@4D>%s(f1hhP4QU4s|E z90DJ*!4vsy0)M~_JC^{k~5<@IGi6Mz0sX@tMJr9U+8m-{i z(?}EeuH!0v&(7mL21gP29AlhafYa|8{>uRH%Fg2gPX(zC2YxcElYIP<#b^0x#I^L5thtSO5S307*qoM6N<$f?V|G A2LJ#7 diff --git a/res/drawable-xhdpi/ic_action_filter.png b/res/drawable-xhdpi/ic_action_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b336602f18ef26179ee8f91ed51a8ae5530da4 GIT binary patch literal 365 zcmV-z0h0cSP)pLZOn~FcJ`1&UR;DF); zh(K`z&;*G95hzZ82oyH}UjZUO1RMgr_ituMt+m@){cZ#RfCGp?`5tgj-UL6PCYX8g zBelCtq%uygjDbCm-%8^*Fn9X z{o(xw$A*S&<^Th*+%CTdt9=-N)!W=b9d{T2TtuP)IDiNg?*XDD$z?Wcg7V5mf&dVK zOe=!}(r%roa2y~4nN|h|q}@7E;W$79GOY{_NV|2S!f}8IWLlXS-q%h+0hm(000000 LNkvXXu0mjfM{1Tu literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_action_clear.png b/res/drawable-xxhdpi/ic_action_clear.png index 793e2b877aba2f2c39894d64bc35c5a8652131bc..6716b95a362d10b96dccf7adc06fa33b406152a5 100644 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^?OH;uum9_jazKo=c!en{BJ> z3X>cMrHwo;$&4jhtw-20LZqsA6QzZcSf!@AYV>?Q;?d*u@5g!T@-ym{GhP1uDS!8U zZ*jUt+AhmFFV2#st2h6UVd~0fVo_Ky!{Os69|oo_P7(d{7~BWyjTbYvNbkREyxH>o zu6Kv-{CvLanVJIUKZ%fHp;6>s4EtF!^HID@qGScZQPGaQ?CB}BA{@| zrGev&tb4=k6*t-$1ZP$~}*%r^y~;+h%M&@kXsElb_IUcEJro(mQ&x?TVE-@8)0JDa*?|;hblYX{T28yYsWG7 zuL?|d%NI;95V-Dk_;_Ibn=koNe(eqRD;hq|6*+$K)APbDV*TBPq5ECmzW+3R$GgY7 x&f0xeSI^qOc|z`K=394%jg}Z`2V2T|pY>X~AmP$EEnw1S@O1TaS?83{1OQ6DM^^v< literal 531 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V7%q&;uum9_jZP3-ysJc7UTR| z|Lqg+i<~>{)f2rb*r6+1r+k@~uEOgN%|a0wyB@YPJ!p4ef|~m+)*rhpFE4HAxjymV<-2Rc z5A14CF%LSpk|rgOl^X7F_Nb6Mw< G&;$UNUedAv diff --git a/res/drawable-xxhdpi/ic_action_delete.png b/res/drawable-xxhdpi/ic_action_delete.png index 7e13d43aacb3400c67a8ff7ddc5a8716ad546a8e..6716b95a362d10b96dccf7adc06fa33b406152a5 100644 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U^?OH;uum9_jazKo=c!en{BJ> z3X>cMrHwo;$&4jhtw-20LZqsA6QzZcSf!@AYV>?Q;?d*u@5g!T@-ym{GhP1uDS!8U zZ*jUt+AhmFFV2#st2h6UVd~0fVo_Ky!{Os69|oo_P7(d{7~BWyjTbYvNbkREyxH>o zu6Kv-{CvLanVJIUKZ%fHp;6>s4EtF!^HID@qGScZQPGaQ?CB}BA{@| zrGev&tb4=k6*t-$1ZP$~}*%r^y~;+h%M&@kXsElb_IUcEJro(mQ&x?TVE-@8)0JDa*?|;hblYX{T28yYsWG7 zuL?|d%NI;95V-Dk_;_Ibn=koNe(eqRD;hq|6*+$K)APbDV*TBPq5ECmzW+3R$GgY7 x&f0xeSI^qOc|z`K=394%jg}Z`2V2T|pY>X~AmP$EEnw1S@O1TaS?83{1OQ6DM^^v< literal 927 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U{3RNaSW-5dppNITO?5AsIidC z;zd*EA3UZMwbW~J&_yrDgKnL3m;Ms$Nwsp$VPRb>qMN&B&6PvP&L=GWA=RNwRdnFiCWQwn zPkh8KOkBoV!Xg%%$9U1j`dOrdd&0%1VgkNflJ7~d*u3AdJaDS>0k0W_UsS$!w8y5>pFTdfE3;@+%2`)BNKmlT^aTOh68 z_1n@H`VY39UoBQ3aduwPRQ+4WerUztnA_ISzv`jxgZC-A4yDg0?i6!q3Yr?((4{jo zn^8q0bSCSH6O)Fa;9~I&^3t_!r7d>~a#Q6EE@;}Udp0}E;N|12Qx_^SF4yjn4bF9# z^PBI3zE(Al;sYzQg1DWWiQk+#cIckDZm%b&{=mX)L*v%)oq~?v_*2$79f)@P_TJ+s z=Zrd@y9a(-K6PWc+0Rh#J7KqSkp?6C#jj%5CRI5*{?wmXEX-ub{&edx9;JjTuCA8s zi1ZCvwNp|nU7iZB`KtIpT(6mP#$Bc#b2oI%Kc6)BfK^mu57S@UYuRg#GyHd}y`Fzw sKIXuL+0xGX+#cIf2&QXLvj3}JQ8&F{R?NqLS>>FVdQ&MBb@0K_(x5&!@I diff --git a/res/drawable-xxhdpi/ic_action_filter.png b/res/drawable-xxhdpi/ic_action_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..7ea240c3376a6812bb2eee99f90572de8b365270 GIT binary patch literal 548 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V0`WA;uum9_jaaZUbBM$%h}nV z{;U7+joA52;L5B_(GyRL-c-xf(bRe9dcM zN?cE&~6vW86)+vmUb;ZdOyBeM(orx3fxX--KeU=A@hQh+o6Iu%xOeI$~w1g?H zZeY5SvV=(}s&x$$SHR?nTpk&so47O_eBHF*3M0ioeA#bsxj&op&;2z_dL5bywM(Xb z=89mO)fepGm1DWSA$7q^3)Uq^pn}zV8ospc*Nv~||6#V^usw2YC530-^7!4SA+~W;k@L^b2&Md+p-0=D? cX;S|g^n?= @@ -51,22 +49,20 @@ @@ -76,22 +72,20 @@ @@ -101,22 +95,20 @@ diff --git a/res/layout/history_filter.xml b/res/layout/history_filter.xml new file mode 100644 index 000000000..7b8f30ead --- /dev/null +++ b/res/layout/history_filter.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/menu/history.xml b/res/menu/history.xml index cfc8a8393..09e7a722f 100644 --- a/res/menu/history.xml +++ b/res/menu/history.xml @@ -14,9 +14,17 @@ limitations under the License. --> + + + + android:showAsAction="ifRoom" /> + \ No newline at end of file diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index b618f7af2..99b4cbef0 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -171,6 +171,8 @@ 所有历史记录将被清除 + 仅浏览过 + 已阅读过 显示 @@ -343,6 +345,7 @@ … + 过滤 清除 历史 警告 diff --git a/res/values/styles.xml b/res/values/styles.xml index 946158eb0..109e4c22d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -246,4 +246,12 @@ + + + + + diff --git a/res/values/themes.xml b/res/values/themes.xml index ca1c87aa4..36f781346 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -34,6 +34,7 @@ @style/DropDownItem.Spinner @style/DropDownItem.Spinner +