From a98cd0bc79453a43de23fddd3eaff0ef1d89a4fa Mon Sep 17 00:00:00 2001 From: seven332 Date: Wed, 13 Aug 2014 23:06:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8E=9F=E7=94=9F=20Toast=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/toast_frame.9.png | Bin 0 -> 1573 bytes res/drawable-mdpi/toast_frame.9.png | Bin 0 -> 965 bytes res/drawable-xhdpi/toast_frame.9.png | Bin 0 -> 2090 bytes res/drawable-xxhdpi/toast_frame.9.png | Bin 0 -> 2323 bytes res/layout/detail.xml | 80 ------ res/layout/detail_normal.xml | 105 ------- res/layout/material_toast.xml | 37 +++ res/layout/super_toast.xml | 61 ----- res/layout/user_panel.xml | 6 +- res/values/styles.xml | 37 ++- src/com/hippo/ehviewer/AppContext.java | 4 +- .../hippo/ehviewer/GallerysDownloader.java | 8 +- src/com/hippo/ehviewer/ImageLoader.java | 2 +- src/com/hippo/ehviewer/ehclient/EhClient.java | 2 +- .../hippo/ehviewer/network/HttpHelper.java | 3 +- .../ehviewer/preference/ColorPreference.java | 5 +- .../preference/NumberOfColumnsPreference.java | 4 +- .../ehviewer/ui/AbstractGalleryActivity.java | 5 +- .../hippo/ehviewer/ui/DownloadActivity.java | 2 +- .../hippo/ehviewer/ui/FavouriteActivity.java | 12 +- .../hippo/ehviewer/ui/GalleryActivity.java | 24 +- .../ehviewer/ui/GalleryDetailActivity.java | 45 +-- .../ehviewer/ui/GalleryDownloadActivity.java | 13 +- .../ehviewer/ui/GalleryListActivity.java | 26 +- .../hippo/ehviewer/ui/SettingsActivity.java | 6 +- src/com/hippo/ehviewer/util/Favorite.java | 14 +- src/com/hippo/ehviewer/util/Theme.java | 3 +- src/com/hippo/ehviewer/util/Utils.java | 258 +++++++++++++++++- .../hippo/ehviewer/widget/MaterialToast.java | 64 +++++ .../ehviewer/widget/RefreshTextView.java | 7 +- src/com/hippo/ehviewer/widget/SuperToast.java | 126 --------- 31 files changed, 454 insertions(+), 505 deletions(-) create mode 100644 res/drawable-hdpi/toast_frame.9.png create mode 100644 res/drawable-mdpi/toast_frame.9.png create mode 100644 res/drawable-xhdpi/toast_frame.9.png create mode 100644 res/drawable-xxhdpi/toast_frame.9.png delete mode 100644 res/layout/detail.xml delete mode 100644 res/layout/detail_normal.xml create mode 100644 res/layout/material_toast.xml delete mode 100644 res/layout/super_toast.xml create mode 100644 src/com/hippo/ehviewer/widget/MaterialToast.java delete mode 100644 src/com/hippo/ehviewer/widget/SuperToast.java diff --git a/res/drawable-hdpi/toast_frame.9.png b/res/drawable-hdpi/toast_frame.9.png new file mode 100644 index 0000000000000000000000000000000000000000..a804a8a9456438adfa3fc1ebb234b2c19be684b5 GIT binary patch literal 1573 zcmV+=2HN?FP)OBUV$;j3oneum>9Xy#2CFe24lQYi9sQ# zDA4kD+Vbj4TWYsJ-O}CSwjD2?Gc&vG%+AZs?9ADnZ!#A~K{PsD||M~yV|9PZo zYKW=Kc?}(Dni^Yzi>$_l*o^D39b551TvB{Cj

QUBN77a1@8}Z@h***oR3>XIa*_ ze?VUZOw)8s2(ukK@d;du4LBdG`*GcZSscTE@I0Qz-*Eu%XIa+Mi}g&vA{4B_CftNu zu>+UtuVAg1!G8P^zr_nU-YX${B4C=Pt8f`^!#%>=#(Ob#52@e?9>*{6e3oS=7CY#o z1T4I6JwAu~g~zR1tWkZYBI4z*@H6})%d*qm4%W4Rh1YGzmxSk?-|bif;xuyn0FQO+ zjU5YEc-=YpJidZ$-HbCtObJi?5sq{k8`pGk!3lg34~Utz>`aL7vK8OL8=d@d+n!T+ z-bQ>4so{@xol?QGcnB}Hn>)6ZUKHYO#y4@7&Xe9UFebj^$MI5@5OJrD?xC*xvJM1;i^uUd{Tg1Q-^BKpT zxP0!LH35rl_)p`8rM0V6Y{SikR+#UB7l@uF3;C-FCM+np*;K=Ha4AJZh8^HsS<+qga7d znI~W|nLHux^AYoT6Th!c9#tA0usn$G;H{;wsw5o6_eC}QT*l54uqd|MEpFx6zMD4u zoWdXQM598)W{1qD@l!lyNE<#ZA$#$N@WQibSmu!Dxg<%B;a}p&+e$t5F^O;Esb@#Ac_%$3G+V*$N zNYiw!sP4H!y#eDEQJZqH5OrL4w|un$g3`qxD>|@b+Jw!x@0NhAUG(dP||+~bhHpsI)osm zO`0|i=gqyz?M-fO?wk9^FJ!s*ec${0@tmCVywCF}ib9vzDE|(eq9`2d@Bv3~3e$KC z0aKX37=~Ir;su^!8H;#;KQNDnF~+t1YHQnA8R1F1gAeg0PGDreA{to7BizO;e#26X zv8{)+WvnQQaeRPJaTcR({aX91;x4Y^rx@cud%bZ_#)_gC!Z}>Vdk)@EBdhoo-{MY; z@kOf}hFe`w6vY@m#@F)yQdLW?9Y$~(@8jPP!e1$+_1$jR)mXXoF5?TlQkBXM7{|L9 z3n9#>ly=-)b~IL+`VtrA9j;$EEU%p7A%t5ynQLmSD2h=zQWtULz$EUUVfkno2_ej- zl%6-cU>oH|@rk_r`YBS44C4$QhY;?kl(rrI%?{Ab-S1cz#C6IsS?jsRFSZ#gcfd*1rI%X7PT_pdBvr?G*-OpXwEXHZ=$w$f)Qnw_QV+wbWjtSrU9l?nA9~Lsf^YD0^m&U%XVi zPbqDL5dM_Y|LJDe^a*RYhHEj#m-dCGqEkxGLkROYF28E`o4GaofGaV^rYmbl!6~J+ z5W+3F%6dls6nj?WNL|^jC%tPVwwQY?M{c}QiS4t1Z}8ntk=mr?5=$wqhY;?|iSny> zP50~jtM~<9;pZ4*%Y=Qu;}D+HUM6ikA(}W n89ADhUp@ZrWaP;Ibx7<#2)Xa=vVI9v00000NkvXXu0mjf@qW#4 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/toast_frame.9.png b/res/drawable-xhdpi/toast_frame.9.png new file mode 100644 index 0000000000000000000000000000000000000000..77e69c72ab9afccc0afa1772c9087ad3333189d4 GIT binary patch literal 2090 zcmV+_2-WwAP)4>Bp-m){Nm_DgYHl-Wa(q~OE@yJ)GaJvv_TlM|*!x$Sb3-OK#!Jfgt@Iv+d#iA$%Zmk0q zs#<1m!d`qBAHr^|6P7YE7GBX1mUj+^a1c+R#L1#41~!nsPfR7wxLDTq<73E#V9Sw{ zcou)bqnN~WzeVe-P?Qmjf5qXVD6aJDhJBf^N}!wZ zapbs7Sk+2o8qcG^LwLC#g4Hfmp655>E_?;=!}@;QXT)gWEdGt3KD)^L&-?;J%GdVq+cGU8bxTuNv>fD_NFJmSx$q zSUn4s=lPrQS$qd~U{$ZzTmh^SPSgi+KFhMhWm!)3a=|4peU;n23HRdj*wV{DRxl^< z8~hBXm+HnZ$)c*r!Y%j~z91qAiPo$YE6rxSkY(Bb%ChYGB3%nriL_Nbk3L-uB+;H5 z@D98cPiI+nu3NFX5~^D6b_kI^BjR<5&X^Hv3;vU3*=ya1)om1dGw#DDsv9S|;|4Kz z_ldden2s%~^6u`%7p3K{7iKK$N|t5McIpjwBvkdDbPv8RISzF&Bi4y5%gRpPv#u#r z6>+#ryeDn%d5DP_){4EjGRv}wvMk%~adq;H+KI2?Z8Z!o(abIQnwaCZw6&-z!1_%Q zyGs#=`WX|e)L52f|18V$^~L^hQH!dUygP+Rt7{)(VusaXj_<7Iyd~|HzKtU4u&w5S zC9YtbJF|Lpx7Y-xKFikEE-o?R26;LC3a_1AZO*CK79l~CKo{?ba#aTsOB#oS-@zS<;IWpa0mEY-wt*n_(l zE`JLxYO~0@TQ{IVC9Y*%l=w^!QCTGY%*zw~?>9mYibZ##2B?exaY6(41`ip|9)i+UsHi;pTBEwHFPhIeK* zu{hU@!+*0v?HJxz64zh{NvP#OlTe$6IFLkpHZdnuawJBV4TMk)+&J8^B-*f+Ig3iW zxueTCz1I{<42T(_riVI;L_4Mlp~g^aO@u_PoM+CWULE2<674y|oKUBSIFLkpPBSOe z(IE~b(Vn9up_T(pLcJ&|KPERlrKr$`qcdv}uamwM8-r35Ur*lO@Ms7P%K5D& z7H%A#!o!kNF-*=04NlGfvPr0_-sz(vq?8yAFXGXKwP#yx#ZTgQ(ys3?m=<$Cx$qaQ zgqp@9!d*|#s=?6^bN+}HMsk%d@Y_y1w{?7Ow=B!4 zEX$q~-9FzgiM3SDiw2elilXQ^p{U!_9H;PO@nW{9hmu&7OJeR0SP*o*7G0f$FUwMv zWoPj;-Xc7~WLceY9)H01aID*gUtO0hsKlB{hIx~4-IG}DxgdhAKN9`tyN;nQskTHV z)@!1jX+u1-k~i3z6QYCY0nwv(Nf+t)1vby~4WbhMH$*v@^imu&#QV`t@L*9CXL`9< z&(&HgZ?MF3BHXlH3O7yRANVf*R7dmVTFUBF?^zQfH}E=9#A1CN*ItGk7wyQuFA^wg zIed{?kk`Zf7UaLc!I5o2KA)<$$IYUJK`tufuT;@6v5voYJ2Y%RyIE9@pM2#B$}KPx!?!!gb?avzr~r)P$s6TkiSM0 zWZEm7j?7%i)D4DL=<%}1!#^(e;+_>wLRo!(aVe37UKyGH;5^UQ3%7o!SSI&WKW`JI z&^8Kj$Ms$s=!&qEiy}|qw8&eS5DAbo2m6i|MRB&rd(}g$rc%q8#)8j^AkTCE2cO&t UA4kTif&c&j07*qoM6N<$g6?_+uK)l5 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/toast_frame.9.png b/res/drawable-xxhdpi/toast_frame.9.png new file mode 100644 index 0000000000000000000000000000000000000000..edecb6320de52da7e822c84484454fce5ed41a59 GIT binary patch literal 2323 zcmV+u3GDWXP)-MdCZ{3Q-Vlf5m5s%0D zM{AnDj=)R%L_=_VeMwcMUZhG=H&U5J?c{YGvb~uE>vWpGuDAJ_E|FSD&7=z!otF1F zPC7=alh+}50Vg5>t0oO54Itf4Y8$Z6X$^SS46nONIzl>3+D|$tfow(a{HL5Wl2ju< z%Zunl;uB_|=n?s|2GTCl4*A)D;OV1+G>$ZpbQj48QP+r1tcOI`N#Bt+leUn~A$ac7 zMq0Hgq%rdQu)`;&n}!gU3SywWM{V-pGYEdW+|^%Exg} zzk)YT&b$Ya1K(ipcS|jbK6pG`w3PH-&^o&zrA%tERN0uTF4W-lBW)#3M!f^aWT{QR zVhi2`(w8bRi4THFmDFfLF$9lSj4ULr)ZLVWoV!9RrDl;r4IYmdE!S}nz>~&eh4OIB z&+zcf;Y;?1QOANMCN=C(D8b`_%8yCIQM-a?xYV*!(1T}&ZV+l#Gz{`0d~ODh=LA0> z-GN#a9bD73%EdW!w}Qu=P+kKz1T`vJ_&%2R-MZj#BX|+HdL4<{6g?xP){!6t?`f5| z2LOZvuJwGsgEyY^B5Dyjo|D@95J97fFURX^RqYfoB5>WCVImQu+;d!4~s ztTe7<0D+}SvY;h+V@Z#}b0BaQ?)N%)ym<3Xcny+xLpfa7>oj=Wtd_%PkVLuDuUsd= z8%3G~k3kwHNk(j8cMA)iCRqY+K^9&kjaG>*)>0yyTiR~%W~jslhX7=vk7Okqt#*Rf znX~|&0-JDF%G~JV%~QC;AJ~VpGB@AgbsH6lMN$Qi7kXB}AK($Z(y33X;N1yt zfX56*@PHpwrwZNx_yRm;KyvW-a<@Nx0Upyo7K=r#!MlxA0$+f~l$aM7hUJPD03F@;0MsejjS25Sd4$3haW%_4b~R#BK!cFxM&StJ^TQgsJ9011pEM+IAIOm zN%#RYanc&RU*QMP#Ba&Ly8=&u$26OboEbbGP5uSG0FOBmkH=fA!D9}?7vM2JnZK|G z?*M!O9&-S}1AeeSRq*Oa=im+Shz4aDJxN{&x*PrgkKk;zrVHK<_yas*yY)B8!P})| zp&kG(!kOBWDR_U9_Q5CMGMuUNnS#fB0iS@&{4Z0fg13d#04LYDbPAq6W&vrF@19`GqrMYK2(-syVks9G0 z$dM+=ka8M44&6HV2XbU>riLrqradc3m*F9B$Ysfn$~AbrT4fD<1P)oFvaEEnvrSno z`g*_tjglFaZ}51pi{wTqUAT-2ya0eHrfrH)8H|SRf-8;5PBLU8_KKTap<0h&mf5xoHj_g?E1b{ zVMYV|%X-O#@;Z3tSMD)*9(p(fi*osgxdxA?L}n^HrXb8TNd_+K3?6fo^sKVnD+xkF ztJMBzu5Xa3h_sXyKino|IavpahTki}VEP2h^zO;F>-zHC90j9>Z&~9wi+@t%`<2Qd3vg zWP0(uS~GlmQL}<)uNR^7DtHV(lXNO6j@lJ08>NPqym)gjpU};n(D^Dc&WAzf!hvhW z!zItSbs?cUc;-QH@Me2;<^b2fspgR0^187wG#wCcQ#D>;`FxP6lNx=l<3BSr9vDBs zWvs%6KtW`K)JEGwb_~r2$W8e|(kz9if(L;MQj3MUyF!Lf2h0=9BT1j4_P+6%)L^q8 z|GDAgf%BfY^GMT3zat0QV6S-=Vy;TsmpClJGx=K1yjK-=Ebx*>@tD2d?)Qf=0%8h} z7rjFoMtWP}5vFc(MLZoQ9$yW@hcW_Y65pw`gfx`&uENs#d}tC6hl;0xx-HcRsA*?a z;)bGX((9x%$dPT%h-cN};n^U5$Y=rdOKRmSqDCd=4(}$lLB9S2KRJgV2ewXr2L97do2Wu1M%W)94GwUt?KQl&FfY#JnFfB2L_s}yGg^R#o0~*F33@lxy1&DuCD~L7paoeO - - - - - - - - - - - - - - - - - - - - - -