From a13a405b49d0df965de4c554fa259ca1081c0dd0 Mon Sep 17 00:00:00 2001 From: str4d Date: Wed, 25 Sep 2013 03:38:36 +0000 Subject: [PATCH] Created white itoopie SVG, exported new notification icons --- art/itoopie-512.svg | 1 - art/itoopie-white-512.svg | 132 ++++++++++++++++++ res/drawable-hdpi/ic_stat_router_active.png | Bin 0 -> 1073 bytes res/drawable-hdpi/ic_stat_router_running.png | Bin 0 -> 1122 bytes .../ic_stat_router_shutting_down.png | Bin 0 -> 1107 bytes res/drawable-hdpi/ic_stat_router_starting.png | Bin 0 -> 1103 bytes res/drawable-hdpi/ic_stat_router_stopping.png | Bin 0 -> 1062 bytes .../ic_stat_router_waiting_network.png | Bin 0 -> 1093 bytes res/drawable-mdpi/ic_stat_router_active.png | Bin 0 -> 677 bytes res/drawable-mdpi/ic_stat_router_running.png | Bin 0 -> 735 bytes .../ic_stat_router_shutting_down.png | Bin 0 -> 719 bytes res/drawable-mdpi/ic_stat_router_starting.png | Bin 0 -> 722 bytes res/drawable-mdpi/ic_stat_router_stopping.png | Bin 0 -> 711 bytes .../ic_stat_router_waiting_network.png | Bin 0 -> 690 bytes res/drawable-xhdpi/ic_stat_router_active.png | Bin 0 -> 1511 bytes res/drawable-xhdpi/ic_stat_router_running.png | Bin 0 -> 1532 bytes .../ic_stat_router_shutting_down.png | Bin 0 -> 1541 bytes .../ic_stat_router_starting.png | Bin 0 -> 1545 bytes .../ic_stat_router_stopping.png | Bin 0 -> 1521 bytes .../ic_stat_router_waiting_network.png | Bin 0 -> 1522 bytes res/drawable/ic_launcher_itoopie_120.png | Bin 3430 -> 0 bytes res/drawable/ic_launcher_itoopie_150.png | Bin 3484 -> 0 bytes res/drawable/ic_launcher_itoopie_180.png | Bin 3210 -> 0 bytes res/drawable/ic_launcher_itoopie_300.png | Bin 3479 -> 0 bytes res/drawable/ic_launcher_itoopie_330.png | Bin 3458 -> 0 bytes .../android/router/service/RouterService.java | 26 ++-- .../i2p/android/router/service/StatusBar.java | 14 +- 27 files changed, 152 insertions(+), 21 deletions(-) create mode 100644 art/itoopie-white-512.svg create mode 100644 res/drawable-hdpi/ic_stat_router_active.png create mode 100644 res/drawable-hdpi/ic_stat_router_running.png create mode 100644 res/drawable-hdpi/ic_stat_router_shutting_down.png create mode 100644 res/drawable-hdpi/ic_stat_router_starting.png create mode 100644 res/drawable-hdpi/ic_stat_router_stopping.png create mode 100644 res/drawable-hdpi/ic_stat_router_waiting_network.png create mode 100644 res/drawable-mdpi/ic_stat_router_active.png create mode 100644 res/drawable-mdpi/ic_stat_router_running.png create mode 100644 res/drawable-mdpi/ic_stat_router_shutting_down.png create mode 100644 res/drawable-mdpi/ic_stat_router_starting.png create mode 100644 res/drawable-mdpi/ic_stat_router_stopping.png create mode 100644 res/drawable-mdpi/ic_stat_router_waiting_network.png create mode 100644 res/drawable-xhdpi/ic_stat_router_active.png create mode 100644 res/drawable-xhdpi/ic_stat_router_running.png create mode 100644 res/drawable-xhdpi/ic_stat_router_shutting_down.png create mode 100644 res/drawable-xhdpi/ic_stat_router_starting.png create mode 100644 res/drawable-xhdpi/ic_stat_router_stopping.png create mode 100644 res/drawable-xhdpi/ic_stat_router_waiting_network.png delete mode 100644 res/drawable/ic_launcher_itoopie_120.png delete mode 100644 res/drawable/ic_launcher_itoopie_150.png delete mode 100644 res/drawable/ic_launcher_itoopie_180.png delete mode 100644 res/drawable/ic_launcher_itoopie_300.png delete mode 100644 res/drawable/ic_launcher_itoopie_330.png diff --git a/art/itoopie-512.svg b/art/itoopie-512.svg index fca9c38bd..27dba8c16 100644 --- a/art/itoopie-512.svg +++ b/art/itoopie-512.svg @@ -15,7 +15,6 @@ version="1.1" inkscape:version="0.48.4 r9939" sodipodi:docname="itoopie-512.svg" - inkscape:export-filename="/home/str4d/dev/i2p/android/i2p.android.base/res/drawable-xhdpi/ic_launcher_itoopie.png" inkscape:export-xdpi="16.875" inkscape:export-ydpi="16.875"> + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/drawable-hdpi/ic_stat_router_active.png b/res/drawable-hdpi/ic_stat_router_active.png new file mode 100644 index 0000000000000000000000000000000000000000..496034692ee732a64e3e848dcd96ea715f31ccfe GIT binary patch literal 1073 zcmV-11kU@3P)>%f8IvRE{0TSW(|UrhTYRlArT2mgEH(& z^pHX#L101`NJ}yZ>ZPLVgOx>Kp<(Jn5J)l)W{lNznaI50mC=fs$rzpa^{~Ff98cpu zd!IQ6`ordY`@60GUTb~pTk8x_`9ER!AlFX?9s%Y77X$l&9qCyQbQRuFt>rmOea~$C zuFfgCcP(VjQ(LQ$DWOkY(`Z7UCSixwZw4UIt-hnasP0dFcjeuGXh93#1KbTf0o(zs z25tn}(s(B@6W9fu0&W972HpZLY=jSOQ@5&*slDmzzg6!~?JeqaW!l=UUY|_2y51U^ z0L%uy0PahDt-uw)PwBlKxEa_9908h>)=mP~|j zYy^%GrkGJNw+%Q>IQX#C_X}a(x@o9MJ!tJ%TW_cC0ag~6Ux{_OW);v7>M-@k8nm-9 zuZ&tE^?buY^WuP~AAq_OLcLc#k%P<+>ck>@*GdR=hWf`Di0o6JNn~DC-&b$Qvu}}O z4=@XO3AhND0vrW?170WYuD^-negs$mtN_NQwI_k4z`ONu>QU+|_TOKv>b%sRuYRO% zSHDz$%`jnmJxq3`r=P4|bxAVA9(8gCfl726Cv{MSN?+Wi-lCqPj!`?+mBuYz4b#<4 zMy4=m4J|W{`R1~|hf-g&y0;3MwzTG1b$K;;d6N9sh~#}Sksb5_9l)E(xhH0<-2*I4 z?a$KMY~;{T`7U_FUj;;AdbC@E!0#(nKZp0-J%$ zf%Acf^9U#!he{X?bf@+>;1E%lO#;RPqk!p&%%i}iL{`~dxzT@6&}7q$yn2JW-nge! zKS<-_1~A(WBUjexihvfPo^K_tl?mx7VFmDVmXIPQ8%ady3(|WN5%5a*kci~R riKMKP&{|6(`xl|vOw<~w8-{-Y%anM!lxGnN00000NkvXXu0mjfnd9a+ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_stat_router_running.png b/res/drawable-hdpi/ic_stat_router_running.png new file mode 100644 index 0000000000000000000000000000000000000000..d631b0c6914bc545482538307a6bf413fccf986b GIT binary patch literal 1122 zcmV-o1fBbdP)S9E&2-VDdrj#zX^^ z64g{nNGX**NLMJRpnORv=?Z})L_I{AMq`v_7GzEIpk_f1CNgBhBvCe<(HVa|taX^p zY43CPx%7v{*?V2S^*`VJoPtVDv;eKZvAhTBK}(hO3Ba|$tH1y-0{jge0zLrdHJy=~ zHO^PRG95?NU*hv8YI_AaHI1x=v()|+B7do!>gDQ1>I!vO-J_n?3_@upD**2UGgH={ z0u}+^1N(tC;6>n4;9aV_KwT#5$}p4a)#~BI`$*JS2|fRZh8~EYL%^rNMxYqyZU%k^ zUIJ#vwHb-Cw>PSwg8vQsLEvPdlMrFkfz7~Mz?4X85a=hQf!#nyJUbHi4A;%5Ol7A> z)vs3HOqk+J_3rq5TzyS_Ox>Ge)~St{thJ0^$%Kaq4m=91B;=mnxYioyvM^S+c1Snb zAHaIxOrV?bXqyZ4RgqVW=SJ#gl%lq6(JWo+0z*#fRQIQaT^Tm11@#Jbp*pixlch~A zNnG%&`b`cZCG@B-B;HS`s~ROVLETXUi4s0nJJe$-Yv(pX2z8qIOjN>vdZD_rY`$L| zQ{_Y4dzP2t&aO;-KC=( zKLTCAsf2RzWSn0ETtY|%3oE37>w$LQ>^xClOLaa6SPHxj2uzD}g$ieO0c(MEz^Xi# zlxONnc!!{goxlNL7O=OSo+57ZVEVoGOHhz)^xGp9Xqz-IUYW zzK%}1U7e>sqYkMTWH|GHx>!Awm>X5+sM8ybvPDtgpN4Lr6g6XpvhrQx(jh~pzAlm~ z#|Cv}rTg;u(9-ysblwkvQ-I^ZRltJy+(#&^_Y>ONamx#B&d9twZ^BYr)icxqI!qAFEL+K z?^2&tdkw!-me=D$S)-udqJEp=D-Xpzi`9D!CFnjwnOTUC;aJf1MnO0888)?47?1i25thL0Dh<@td?4qg@c5~zCFIT z0S^N6fg^YBow;uAVUPsCt+BvD&JB?LX13j;j%~s#SY;~Ns%NR!CPFJL zkB`)bA_<+ZzMq2ksE?~(s@>{O>WpMxR3N0fq$om->b^|iHnl^&SA9;sQ(chS-d~1D zr#i3b4Bf5nG*bVJdWU)}Gw5!0kvdX6knyiphp9KH@2cz5@3HFedI*sMU81g0A1ITF zztkr6Z1oBC;nZi0`k4Bp+LB_eRgW7Vz`~&t>bDi@#xjId7pFEO)S2p>L<;qkOjgcN ze@%T}uSKX<>G&4tF5~|J*bBT!DD*a>jC2Cy3H81;t1jufs$LzMs7_H&W-_ziSlHS1 zlSPyIqx!VktZqsE?X|L_)>P_)$sS4>xG`nq9b&st4pV{MMDaZg%t`)bHM2whYX27S z6mWJCG#tKkjx5kuj}tIN{V=Nc<-aeW#11=tB( zU+w*fX*vWn084?@$(Ij#nX9*@>--9t`Bc5e5Z1#b&yE`PZ*r}121DpgquO6qhRk~P z3Zu+a!wI7VjVyvto1xHqN(R}gUT9?*D2Fa}LcN5}t?pCco zAokJKgc6_`*pcq{5+d14WcZ!^(A$i`a*j4hq_ALq#jAW_R@Go5Ngd3nr>`Y`*G0NV^_l5 z(s)Ju`|&pLVY+Vto=^9Egic*oq2E?u2bc@29iaV`x%c zrK6TzZ|HamZ@J^tM{|dgHs6^=&RKb Z;BSU}LPd5xE+7B^002ovPDHLkV1n0S3ZDP~ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_stat_router_starting.png b/res/drawable-hdpi/ic_stat_router_starting.png new file mode 100644 index 0000000000000000000000000000000000000000..e28c96bf93b7e99be1b3e2ac6924a69542b5ca09 GIT binary patch literal 1103 zcmV-V1hD&wP)Rb8KeMULnp;bSB1?2BMo=`Y8P=P$TKXTKS&5W7_vyvC5Bu%e zZ+o_9O%3|OkKgZ}d+xp8bMCq4+~=uKIg>EybQ37X|Ab0mI6}3+lfak2exMs@1D*!v zO(-KZ`%F=vQU5T|qpnw9QGaj%o0D$w_;Ej34^;qf0gnUIfmUD{&;~=zZUWkYD&P&^>=I{VN>RH8_zrk4jlCJz z0sJ}IQ+6a-cDV!jX1{v1`alWq^r`2kcNT}#3ia#MzH>AlD&(Q<>D>=308Ro+fIYy$ z5;nC1i-5C=W4YHC)FEA@ZkOGi|WDT zu?1!_b>35DB4e`&nEe+g>}m* zfQ!;3JCapB>gVblwKZA1HW}2QUa3|l!y1hH)jst%^-aUeg<4q_p<6OuxL3X2D5eh= z>21#FZBc908R~L%nYucS+mIbs4xuG!k#4mr$rh`V)pOPP>U86@X0b?zIPJ&>p*HRC-O=b4aB|tA|n5+BW|I+gS5)R|Tvht}!)4VciSt0{$XuTMN(#3|YKfLZihD;41ljwEP)lGe`ozjtCdwWNGQWKjX-j(bnOc&k~M`s zE((_jF+q}|E|Msr52!4w3)2bUkH2+90N80zXH9$KA?QA36+4|z;(cKU?R{C zv=Ov)0(ckr2b^L3=$~jPZ{U0NlzM~u zka{eG%+KnSNWM=Ut1eMLOW3rG2BACDmFjkNqk6Y`HiOV|b+&p~eK6raM*St)%&wPE zON_=(>P&U5`lR|zip*c?q`2V4>Ns^#oMWPTG}_%%FQJ#z(`sjo)KYb7B)T<0=!2Bs z+UR$Sx;kNZXFY^2RZpt#8T7GNeL=leoo3L;y!gGOKB^v2zf-SJcdBJ|j`~$3bbUR9 z-j0*3SJ$aq4Eh+1{a+eHjQWg2u~(g;9#p&4%hZRXZIjv>`=+VQaYKcK=BQ`lj^9w% zn2l}fVzWj5xq6Ku%DdEs1_>O_usxzauTIV*^hq?_6C=}^L+F)glZThpRR!Z|^qD%= zCg1{KY0Q&@z_-9rU?3xpcE{|Uhj}rJ*Fq1_1xyFF12ZcFV}aAaeBcc5Col$B9SxTx zCOHYT6fDvYJPv$OU~?8&42%Qj0#5^5fscVjz(AhbI}BNOo#8rns1po%XMaxkUsE5c zaYP&A{0ri|y@p(+danhgqtZ(1<%S#dyZWqpWzJ$9YEKP99dX_%>OkzfI(}}`+V3HO zL%?l>D!&Xk0Q6-X#U5(EnPveCfL#P>^iX}Z-WXOKUc#DW_1I9aQh!VA{CGj+lISJ#Q4+^Wl{Ap^;7kJ!<9`EnlTJQ74#YsZTb~)$w&#IZpv7oCytdf#(p%E zn^|hRp$=xD>@Y-~*IqT;64f1s<3jDqSZJBmTB)H1zL{ayRSzN53*)YneeG6jUj_5k z7p=ZJe^77EAar}Zg!0<^sfF4ds<$obeJPs_75_#MYBn5W1v?EzceDDO+GcniRPdpR z>fZ=LsN)?f-u>!ZhWAxP_$LfUIX>xI^t)^{&NbOMtJzvs$?I=Klro_1(7p%LRh g`R~U$#d$~QZwYY5Ts>^0z5oCK07*qoM6N<$f~WNJ8~^|S literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_stat_router_waiting_network.png b/res/drawable-hdpi/ic_stat_router_waiting_network.png new file mode 100644 index 0000000000000000000000000000000000000000..a86bf8376ce77c2b361110db5c0dc10205ff3121 GIT binary patch literal 1093 zcmV-L1iJf)P)Q`@5r{_2wNDg}}jV)?( zHG~>77jh7|o__|xt%RUYpU18r_#=C}Ae+z^Wt_G$zeW}Ui>o1&6ZQbJz%U`uo;hQm z0|$WDiCi=Re3{lG{?I*YVxDL1}TbL)%1>9AQK`x=}BE1AQ5?7}zn?qE~tzr{p;%0tG!HYb6q4yu=_Eotn*BE4)bvRSIGGAabs8*8bdX(C$#+z&hj zTuZF(4q#Ur+fE$B5cjoJz)Pt=nY%!_CG59E_8liKf6LPIFU0m;L|iD}1ik}SB(iTO z`{7(dxfP1Mc>eRKhPfeTar4d8}Ecs!R-ZhkmZJ*aLsinUEfHMmlp zOghDStBz5uf2Cpr3z^T8i0Oas3H%wlCM#{>EAM-Zc6j51bnyp%YS9ccKm+=%v7JK z2h@FPPXO&!_o%zn=jz(50XozpY9Ro(1$`{&f_g~3orF=7LeUD~2k;hH2aE>$dtf6l z2+RhSW+nNK`dV#K8`SF|^ZV*f^`JVcj;pyWEt&#MlSf%wbPAYE-|Sq?+9K48DcL_z zYm@vd2{2u~mH>WBU8Lrd{PQWLF9Z$)9l$oA3n&01Kp(IH7yv#1JAh}^v}nINrcS6^ z)L!+Z`a*pdQ_cBmDmV(91}=xJw*psy6F_~*+QE?d=W0l9R)>PFRX?e%2|To`Yt;2| zSV`No4_F3#1eS;Y1u^TM5>0tMa4!z19Ld8#9k3VZ1kM7pfEHj55xJc}6EGj>jsr;> zv>Ct`U?p$?coPD20jr1xEDy9NBBabfT}i(u)TY2su`Ef#NUPvG@VKPn-@uI`+c0HL z)3g8pXNU%Al4z?g2EGD!fga!z(ePyou$hR&HefaI5|{?OBC75o(F3405vxr9Yl?dP z&FGRJQ_mTl|Ggz#Y>&gqY1wB>GcXq@UepiFBf9CvfuBK-!~y&PIYk0DXFXt100000 LNkvXXu0mjfx0MnZ literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_stat_router_running.png b/res/drawable-mdpi/ic_stat_router_running.png new file mode 100644 index 0000000000000000000000000000000000000000..8559f1725f14b0e67265c666a1d2dc931cb75b7c GIT binary patch literal 735 zcmV<50wDc~P)g$aE@ zDnzTGMF?Wx2efn(6o{n@kq~i{2tp8&U=dLZ3n`_$sdOiYk4q?!4*xOeQC$M=1C z#y?!1_gv0B|9k%D-1814(Fc!UJ#JwPm-{&mM3VLzP4ab;$^4JMl6;?T zz)j4-X$}uHCyB1lJhm+hK5d7~Xo08nB_MIeG zWu&a{vMj!3wCb^pA(?;RnY-m4`I-qT8nesJB#{Z5l&)mWA7!U z(-zfCmScr7x6VyD4eFvMe#Tq4UF{q7*2DM>8}SDoQ)Il0t`bqQ-Jm?c%gVprLA-+t z_^#ift{BGycwCWT1@_`&(~CVFg9cTPbvR|(9!j#f%bA%-MCqK{_@(QC{{SK--gip5 RgNFbB002ovPDHLkV1gm+Q|JHy literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_stat_router_shutting_down.png b/res/drawable-mdpi/ic_stat_router_shutting_down.png new file mode 100644 index 0000000000000000000000000000000000000000..1738099b4e667564c4aad9fe1a5fdffe26faa5bc GIT binary patch literal 719 zcmV;=0xBL2dCL{-|5k&FX1&wpyoN zQY+OHVSaIz6!j1la7seuCg2(Ho+ypoz*XQ4@Br8ktjwYSwOp-N$AW@RwKXWoVYfP@ z&Q;sh4{BMOg0y2g9BNP>l&k{|Cv0kfcfcB83(y3NqzTB^Xxo63fiQ_`;5i_04rrY$ zNIrt&fn-)<{ugi$C;<)-)nnPDQSvlNrFtkdSq}Z`Mzza{XjA7T;}q(|K6NAn_^z&3 zf20J@Ay@d!1dTE0CiQ8a;JxaodO04W#KP~vd|(>Ub@3!E%fJTUH!z*3;A??bg^HZR zTi_*=H4=0HeZXp>H{%-7`$1NM9O6CG0qi2WyH)^oz!BgE(Gea;F$A6A`xQ7vl&;b6 zJqR=tHD&`aIPO)T$jR|Y?NQH%!hSNk=;F9oY?0$w2s{Li1@&FPb)X`w4-owr4E(PG z)Ef1sIvCsan0i-Tp0qDkK^#@Ug0TDhM3>(L`~}NQ*#>XbIPd@f002ovPDHLkV1lZr BHzEK4 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_stat_router_starting.png b/res/drawable-mdpi/ic_stat_router_starting.png new file mode 100644 index 0000000000000000000000000000000000000000..5494104c19198e1392513144009c373fee3a384a GIT binary patch literal 722 zcmV;@0xkWCP)gjkkEV_sI@69ZLPJ~2iYRy=is?t@3YsldDiS-cU{kQ zfBf(3e_hwzlczG7m@=uS1NjNQ`M?rjHt+)Ioe+bX871l^^_%)AjPL3_wJf%7Tq7^! zU@q_&SOGKubAqo8Xau@|D&XyS1IXmyPBP&C~zED1Iz^Sk_g&> z8-bu3C<>c%@rEebanu7RfgeN_wwEYZSp=;Xs-5Z?^?IoPT2z9?9XaLSo>71 z%;?!cr1^SaH`%-Z3;-XA%JM@_1TTSgvF~EwC$N;L;#xC}7ROd#0Wclt0iFY8z%Aea zQGQB*!Em8Xzy%`xUja`7K{L>prrnRJZR*ZY#?|WOP~IEWI<+X+_tjHsmpVfw4Z#U@ z(C9tdr7lwEsXJoYH>veT?^#E%QBytFeVKXyZUd)-gmtksHAG#14mb~7{WFsyg4%G) z*J`0!uGZvK(lfP6?Fmu-^_q@_f{^6)m~Seu9oRtBORb?e%7DrdyHi9k)|jTQRv)Op zLgGiPnJ584wodg*(tH|;(x9BES%-2b{ujZhnDoDj-&E$ymS8_{0RR9107*qoM6N<$ Eg8CsnkpKVy literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_stat_router_stopping.png b/res/drawable-mdpi/ic_stat_router_stopping.png new file mode 100644 index 0000000000000000000000000000000000000000..85363b28be60b612d20da362638f72e0bd863a25 GIT binary patch literal 711 zcmV;&0yzDNP){1}u`K_i3|bXK}Z#Z<~N^JDz@ySUHbojb3i zgS~$^aNqNs=lMV9{Lel2?MR}Xc%!YS4?!>rGulb89Y-;;9Rwd^6)xffy!ko=9W6vY zg)8XBOgzO&9K@4a+_Vz+Xh?=6bz73;Mw0nSPG=w%B$<(9WRi2mx2Umykkw1niAgww zdHA%pwjY0B3;M7S_b}yUC8`sw!q-@jKMPSm_TefvUkzw1>AMq?B9VmB^eF_z); za`;x2=-Wzmzk6BzJr{Xn*>p)&p1BCVLJ!WAOWeeA?7~u&$e&;W?w5;n4`4{rmE@l! z-zC}95Vj}DuMOY%B&(C$OmaJe(UW9OUF4aiB$re|->LEcf{z+mPsL-5!}(Mj+{IbdTYU}-FdP5ktrmM=1&-kRLePP(Rs{VxQZo5br47~CXtw5) z5<3y!;xE-0fxaPM^I~5l`8&yfNxn%kt5N$kNyaDnImyn(+WW6UAW3JEw`;!-)ec#j z#Nlp}dkYq0tl>002ovPDHLkV1oD`LTvy5 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_stat_router_waiting_network.png b/res/drawable-mdpi/ic_stat_router_waiting_network.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f866c0cb0415829337ff05073b861ec02380f6 GIT binary patch literal 690 zcmV;j0!{siP)wz;j&LMRA=J)rqLEfg36aKPq$YA8(Nh1sb-2dmk-}}0+ z>v_sl5||E51jfhT3ZN5M72|yyKLgKGNl=TP?e?QXZB@Uk=hPnct@>?1yp+g8S)zjy za0$2vtOlxp>%bRaIdB)42CM~M0=H5PloIQIfUCetU>z_i7Wo+qv;dcZcAz;)Plh7Y zooeR*sv6W~{)?6zJ!-bV(m}~O)D`OQLFV+8dyMoQ{|O$6ms64do| zq%#0G3H$=;fG5BX-~q4%H~>5)4Eo1tW>8YMs(aNo|Hn~vhFYu6RA;3qN_DUS=mHi4 zYYO6@fEPd;FgL!}6eUW{U?V~Q)djIG0yVdREd=Uj(?6GCQFO6@miOvw^@PFM+oGa+ z)cO=fDJNG0H-LG-d4h9m2(*e&8(dF~LOE2j%KQ^=3ggs#nwrIS)95(Z;Ed z6UqC~IF; zg5FO92MPDUg&1oB76E5~hFtPo0f1LPPyE_D!2GyA6}V4uc?Hm#t&kbedbM5MZ8(#f z<6s}D`_x0~GqrNGDndOTllB%Us8`)H7Mb=vn+=!zKs2dU!`PcVDvB_Na7TXt-VArs YUu~qcdt09v?*IS*07*qoM6N<$f}yl0`2YX_ literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_stat_router_active.png b/res/drawable-xhdpi/ic_stat_router_active.png new file mode 100644 index 0000000000000000000000000000000000000000..ebfeb6984803bd05d24a75afeaaab2982c7ba3e1 GIT binary patch literal 1511 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_stat_router_stopping.png b/res/drawable-xhdpi/ic_stat_router_stopping.png new file mode 100644 index 0000000000000000000000000000000000000000..f60a559e33ecd1faf0894adfc5b23762f61ae748 GIT binary patch literal 1521 zcmV2GPh0TuG1zm2c_pQU=YyK z^VF)Lr9vbg1-zVo-w%8NtN`8t<^ijKzQC72doxIuLM90i{rH)s(?PBaor7MB+61nB-A?ms68J43>?OoT;Ch8=0UM6= z>ST4a`bG))rRpB3{aCeC-6AQlvQBnpvlSSku1bTAP#37f)%FqvZb@xVQdg^s)&8k& zd-aq|_MK)b&|kgH*z@0}SzW1am56nQLF$I;LiKBP|AM|hO0r)zQ-M3vAhQ$s{>IE7 zroP_^`30%%u7<5_nclal>-*y*zoc0T3|3d9LGDwxPW5}LN2&!&KMRZoo+jeKYT!ZOmehVQFap>V_?(ClPo?_r z>b-bR$ANu}t@4L@W}2lB)N9ov3?trG9Z)bE1Jvo+?7nPxpWD-Wo7&ItXxgML^i1mf ze#6*~SI;(F-qMWRZ|bR8yFTi>cEl5gQNNJhXQ_SFtJEn4gf>z)Ut0x6X9FLVW^7ym zsT`A1+o>folMU}x3t|ssV-8X;Q{Ps9&f5H7#G6U#z^V$om36S6I!C>z3k9B3PwqlS zBX!u#aIdP<)E6yx$u+E0?=`k#rwW`{*JuxQzOhZpFjjr70*R$YOz3Jw%kY7bhZTCE zGwW=7e)2G1mDvAE;A`N}3cjK*Fg!gQ!Rm~|UcfA1t6ZRVq`U+81!zmewg6@W8xgK= zU_s|^0w-1^@;WdL_^hJ*H^BA43}7*^H*uhv06YYYq2_|?mn18@8!qr@BQ2=mTf>{2 z;hKnDh84z^yrO~aa;#zaGmM})-3X{PJ3ZF|BQ7fA63HD5*V?WgWSkR7oj%_Mna7Nb zbWug}k7ncVXt-?E$Bj6p`e9WCFw*K;UNbyBUo?zrRQmo!38C}Viz|}XID_Qlf0~i* zpUI81lT@M}zo&f&Fc;VpID#;$2Y{u(CnfD)No}g4H*v-u3|vm!MFITE-|wTs{wl0M zec8_N--`@8KpmFNRF2<_W8|y`R$z{ia$K3!%{P+C+zn5+;ub0@eeIY@jwm2g%XiAQ zSP|Nc1JzzeR57F{>Kve;Du{;dU1iw;jg; z8)P!UeJxiYpY>&FMpoGozb3h9UCj7A^(^%O<2d?wg;jdQibh<9*}yo$$TukXeph`$^qNeYm9E zfp)`)J1hMX*! zsK*ks+m3bl4^119H0Ed_0#YlmJgZ+!B!BzY$*%^+1MmJ-vkq4PBdE33&FC^CK<%L3 zV4THwQV(^FhpS;?eVuUva3;_-&4lPT7pMgb01b&G)V0DUrf&$&bf9`+ce;oc-V146H X>|-H<(N>(#00000NkvXXu0mjf>I2I> literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_stat_router_waiting_network.png b/res/drawable-xhdpi/ic_stat_router_waiting_network.png new file mode 100644 index 0000000000000000000000000000000000000000..87aa4c73326fe015ca177cea43452dcac0d7465f GIT binary patch literal 1522 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 diff --git a/res/drawable/ic_launcher_itoopie_300.png b/res/drawable/ic_launcher_itoopie_300.png deleted file mode 100644 index e7baee6dce92ca1394681ccf8c4d8d3042f4a685..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3479 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 FV1gmRi!lHI diff --git a/res/drawable/ic_launcher_itoopie_330.png b/res/drawable/ic_launcher_itoopie_330.png deleted file mode 100644 index 8a09d40348ab932aa4a547eead38ef0d2b8320fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3458 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 diff --git a/src/net/i2p/android/router/service/RouterService.java b/src/net/i2p/android/router/service/RouterService.java index 0c99d79fe..de246ae5d 100644 --- a/src/net/i2p/android/router/service/RouterService.java +++ b/src/net/i2p/android/router/service/RouterService.java @@ -110,15 +110,15 @@ public class RouterService extends Service { _receiver = new I2PReceiver(this); if(Util.isConnected(this)) { if(restart) { - _statusBar.replace(StatusBar.ICON1, "I2P is restarting"); + _statusBar.replace(StatusBar.ICON_STARTING, "I2P is restarting"); } else { - _statusBar.replace(StatusBar.ICON1, "I2P is starting up"); + _statusBar.replace(StatusBar.ICON_STARTING, "I2P is starting up"); } setState(State.STARTING); _starterThread = new Thread(new Starter()); _starterThread.start(); } else { - _statusBar.replace(StatusBar.ICON6, "I2P is waiting for a network connection"); + _statusBar.replace(StatusBar.ICON_WAITING_NETWORK, "I2P is waiting for a network connection"); setState(State.WAITING); _handler.postDelayed(new Waiter(), 10 * 1000); } @@ -147,7 +147,7 @@ public class RouterService extends Service { if(_state != State.WAITING) { return; } - _statusBar.replace(StatusBar.ICON1, "Network connected, I2P is starting up"); + _statusBar.replace(StatusBar.ICON_STARTING, "Network connected, I2P is starting up"); setState(State.STARTING); _starterThread = new Thread(new Starter()); _starterThread.start(); @@ -319,7 +319,7 @@ public class RouterService extends Service { if((contexts == null) || (contexts.isEmpty())) { throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down."); } - _statusBar.replace(StatusBar.ICON2, "I2P is running"); + _statusBar.replace(StatusBar.ICON_RUNNING, "I2P is running"); _context = (RouterContext) contexts.get(0); _context.router().setKillVMOnEnd(false); Job loadJob = new LoadClientsJob(_context); @@ -379,9 +379,9 @@ public class RouterService extends Service { boolean haveTunnels = inCl > 0 && outCl > 0; if(haveTunnels != _hadTunnels) { if(haveTunnels) { - _statusBar.replace(StatusBar.ICON3, "Client tunnels are ready"); + _statusBar.replace(StatusBar.ICON_ACTIVE, "Client tunnels are ready"); } else { - _statusBar.replace(StatusBar.ICON2, "Client tunnels are down"); + _statusBar.replace(StatusBar.ICON_RUNNING, "Client tunnels are down"); } _hadTunnels = haveTunnels; } @@ -447,7 +447,7 @@ public class RouterService extends Service { _starterThread.interrupt(); } if(_state == State.STARTING || _state == State.RUNNING) { - _statusBar.replace(StatusBar.ICON4, "Stopping I2P"); + _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P"); Thread stopperThread = new Thread(new Stopper(State.MANUAL_STOPPING, State.MANUAL_STOPPED)); stopperThread.start(); } @@ -468,7 +468,7 @@ public class RouterService extends Service { _starterThread.interrupt(); } if(_state == State.STARTING || _state == State.RUNNING) { - _statusBar.replace(StatusBar.ICON4, "Stopping I2P"); + _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P"); Thread stopperThread = new Thread(new Stopper(State.MANUAL_QUITTING, State.MANUAL_QUITTED)); stopperThread.start(); } else if(_state == State.WAITING) { @@ -489,7 +489,7 @@ public class RouterService extends Service { _starterThread.interrupt(); } if(_state == State.STARTING || _state == State.RUNNING) { - _statusBar.replace(StatusBar.ICON4, "Network disconnected, stopping I2P"); + _statusBar.replace(StatusBar.ICON_STOPPING, "Network disconnected, stopping I2P"); // don't change state, let the shutdown hook do it Thread stopperThread = new Thread(new Stopper(State.NETWORK_STOPPING, State.NETWORK_STOPPING)); stopperThread.start(); @@ -509,7 +509,7 @@ public class RouterService extends Service { if(!canManualStart()) { return; } - _statusBar.replace(StatusBar.ICON1, "I2P is starting up"); + _statusBar.replace(StatusBar.ICON_STARTING, "I2P is starting up"); setState(State.STARTING); _starterThread = new Thread(new Starter()); _starterThread.start(); @@ -547,7 +547,7 @@ public class RouterService extends Service { } if(_state == State.STARTING || _state == State.RUNNING) { // should this be in a thread? - _statusBar.replace(StatusBar.ICON5, "I2P is shutting down"); + _statusBar.replace(StatusBar.ICON_SHUTTING_DOWN, "I2P is shutting down"); Thread stopperThread = new Thread(new Stopper(State.STOPPING, State.STOPPED)); stopperThread.start(); } @@ -602,7 +602,7 @@ public class RouterService extends Service { public void run() { Util.i(this + " shutdown hook" + " Current state is: " + _state); - _statusBar.replace(StatusBar.ICON5, "I2P is shutting down"); + _statusBar.replace(StatusBar.ICON_SHUTTING_DOWN, "I2P is shutting down"); I2PReceiver rcvr = _receiver; if(rcvr != null) { synchronized(rcvr) { diff --git a/src/net/i2p/android/router/service/StatusBar.java b/src/net/i2p/android/router/service/StatusBar.java index 27c24fe1b..f6191e7bf 100644 --- a/src/net/i2p/android/router/service/StatusBar.java +++ b/src/net/i2p/android/router/service/StatusBar.java @@ -17,12 +17,12 @@ class StatusBar { private static final int ID = 1337; - public static final int ICON1 = R.drawable.ic_launcher_itoopie_300; - public static final int ICON2 = R.drawable.ic_launcher_itoopie_330; - public static final int ICON3 = R.drawable.ic_launcher_itoopie; - public static final int ICON4 = R.drawable.ic_launcher_itoopie_120; - public static final int ICON5 = R.drawable.ic_launcher_itoopie_150; - public static final int ICON6 = R.drawable.ic_launcher_itoopie_180; + public static final int ICON_STARTING = R.drawable.ic_stat_router_starting; + public static final int ICON_RUNNING = R.drawable.ic_stat_router_running; + public static final int ICON_ACTIVE = R.drawable.ic_stat_router_active; + public static final int ICON_STOPPING = R.drawable.ic_stat_router_stopping; + public static final int ICON_SHUTTING_DOWN = R.drawable.ic_stat_router_shutting_down; + public static final int ICON_WAITING_NETWORK = R.drawable.ic_stat_router_waiting_network; StatusBar(Context cx) { ctx = cx; @@ -30,7 +30,7 @@ class StatusBar { mgr = (NotificationManager)ctx.getSystemService(ns); Thread.currentThread().setUncaughtExceptionHandler(new CrashHandler(mgr)); - int icon = ICON1; + int icon = ICON_STARTING; // won't be shown if replace() is called String text = "Starting I2P"; long now = System.currentTimeMillis();