From 4c845f2dfbf43ab697977a9179f0d52016f84e42 Mon Sep 17 00:00:00 2001 From: Sam Bosley Date: Wed, 9 May 2012 17:28:14 -0700 Subject: [PATCH] Added icons for the various people buttons --- .../people_menu_button_blue_off.png | Bin 0 -> 1751 bytes .../drawable-hdpi/people_menu_button_blue_on.png | Bin 0 -> 1946 bytes .../people_menu_button_dark_blue_off.png | Bin 0 -> 1747 bytes .../people_menu_button_dark_blue_on.png | Bin 0 -> 1967 bytes .../drawable-hdpi/people_menu_button_red_off.png | Bin 0 -> 1744 bytes .../drawable-hdpi/people_menu_button_red_on.png | Bin 0 -> 1875 bytes astrid/res/drawable/icn_menu_friends.png | Bin 0 -> 1578 bytes astrid/res/drawable/icn_menu_friends_dark.png | Bin 0 -> 1592 bytes astrid/res/drawable/people_menu_button_blue.xml | 5 +++++ .../res/drawable/people_menu_button_blue_off.png | Bin 0 -> 1798 bytes .../res/drawable/people_menu_button_blue_on.png | Bin 0 -> 1416 bytes .../drawable/people_menu_button_dark_blue.xml | 5 +++++ .../people_menu_button_dark_blue_off.png | Bin 0 -> 1625 bytes .../drawable/people_menu_button_dark_blue_on.png | Bin 0 -> 1559 bytes astrid/res/drawable/people_menu_button_red.xml | 5 +++++ .../res/drawable/people_menu_button_red_off.png | Bin 0 -> 1372 bytes .../res/drawable/people_menu_button_red_on.png | Bin 0 -> 1443 bytes astrid/res/layout/header_people_view.xml | 2 +- astrid/res/values/attrs.xml | 1 + astrid/res/values/styles.xml | 3 +++ .../astrid/activity/TaskListActivity.java | 4 ++++ .../com/todoroo/astrid/service/ThemeService.java | 2 ++ .../com/todoroo/astrid/ui/MainMenuPopover.java | 2 +- 23 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 astrid/res/drawable-hdpi/people_menu_button_blue_off.png create mode 100644 astrid/res/drawable-hdpi/people_menu_button_blue_on.png create mode 100644 astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png create mode 100644 astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png create mode 100644 astrid/res/drawable-hdpi/people_menu_button_red_off.png create mode 100644 astrid/res/drawable-hdpi/people_menu_button_red_on.png create mode 100644 astrid/res/drawable/icn_menu_friends.png create mode 100644 astrid/res/drawable/icn_menu_friends_dark.png create mode 100644 astrid/res/drawable/people_menu_button_blue.xml create mode 100644 astrid/res/drawable/people_menu_button_blue_off.png create mode 100644 astrid/res/drawable/people_menu_button_blue_on.png create mode 100644 astrid/res/drawable/people_menu_button_dark_blue.xml create mode 100644 astrid/res/drawable/people_menu_button_dark_blue_off.png create mode 100644 astrid/res/drawable/people_menu_button_dark_blue_on.png create mode 100644 astrid/res/drawable/people_menu_button_red.xml create mode 100644 astrid/res/drawable/people_menu_button_red_off.png create mode 100644 astrid/res/drawable/people_menu_button_red_on.png diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_blue_off.png new file mode 100644 index 0000000000000000000000000000000000000000..919a1e72e1759c05919ae3ec6161491b8c11bca9 GIT binary patch literal 1751 zcmeAS@N?(olHy`uVBq!ia0vp^$v_;%!3HGP_`Uc5q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW zlwVq6s|0i@#0$9vaAWg|p}_eNv z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%kM>iug7jtt1OCwWrLqk_XM?(`+Cu0i( z7eiwsGgCJ=m|mCsATTyVI&@4}VBuAcYVW!}sXs=U%)uB0h#X)V{!ROGB3!*rm5f!RRe z00R$)0RuA=50r~dP`c`9=*8X7?alu3Ev=m>cKP?JZQO#U`I z?l4=x)#M4w*jPRm9Qw!~%w(i0k#*$0^qlhh0*(zAonOg4l%Dha^3H~XD*MxS?KEcL zlrZg*U70Ku9Nj!o&hzt&_c2jwYcnkB&R$ryD*1N6vx)YpUqqhx+m%baS`>4=W}Vf) z*jo#iz0q~v?OV!nDKGod4bg+%&u1-bViQQ+vSn(aOY+=x)~A|w9@=rGVe2-TrH=md z)wz`~#rWTd*leGP>x?s2jDuBC@OtgY^s6`HlZR9ar_-x@#de3|u<>?NtP;-%Ra?rmdEdgc_;!>Vlm z@mcKE$&S^r&qb2&?>OG_P;y$Q+(g4E_G>onY+d)Q;>xn<8%1Yy&sLR*1-10qud>290!hyGWm1y`o+q%dD7+GU_4IRZ(Xq*2PCT?@ zeDV6c=+()BGn!8uoC*}@5s6j%n)hOn=$U_OR^DsTZY?~-q4~VnyY~e5t34-I{ELay z|C2ILacX~#dDFwyOXe6PrEw@acFb`5tQzSS@a;_P{T*VGGEu@U3+LIor?59o+I8vs z#(k>}&+YOFKBJx~&*qglxmi%KrNBjgm1d5Az^0`KG_30tWvVZQMFxwoq?%uub%<3$ z?ra{@!);UMzhAmn@c*{^YZ*4~H7_-06!?EXJTJ#|o0KA}kMFfV&wPU8txwf=ynMBF z!v}7S*%Jl*CE7&qf4rRB&LYvk$k_JS>Tvxu#}tPKMhSrg1~#xDTLOfORZz#Lo>hV& XL};4Ypa1rJpsL2x)z4*}Q$iB}oUN9H literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/people_menu_button_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_blue_on.png new file mode 100644 index 0000000000000000000000000000000000000000..95be72f908c9ca741cf1df1204c3b97a93a4245a GIT binary patch literal 1946 zcmah~c~BEq7*EAfbW}XjSYun)phy&w-H;Fy2{hy&u|zS1L!pdevyhbRZcJ7Z&_bn3 zDMeHeO2wNfHI;&jRm-8$4zXP7KoLQzc$ErTv35YJwi^W7KeXNXcHev7e81m!zS+;h zR)kEQOrK1lP^KysQZ>243gg)ok?v@RQ#4K_^s+J12E`B zj3}N8RGB1*-k?Y|BjKqlG;nGXEYLB60)YUVkR(76LJQbXBW4lWM2rz$A-Q*{*$iOB zgh&!GUIZ1b3Iim#83A}K&=&^%A;6!@g1Df7EARn0AOx}@4jbhALZFbx7lIHl`Y=du zW?h0%EtQY@B2OZQo*+y@Hrr~ovaEhA+?>dU1OfpYEV5P6cx`qKYk)EZ9*^rFr`dY+jm*@PQS!jLE_z}oQRU49$V&2@l5G^>IJeFGM|~p7?Fe9 zsmdLrvc;~*wpZrw^h&1o-~PPocbT(pTVtKN=45#C^?8~B_$G}myp|JqHs#h&&x~1h z#pMNMCBGZC)ov;R!anZQAi9a&a`c*N-1mU zx#+c~`d#~_eOvE@;>u=2y3bFI*an-rcBXTAz>*Hjk@WM&YIU3Lo;s2F;PS-QkBWfa zAM20bAFSFrqbuUiIPuAvqUW@PwV4m>?Z*?Qizh9j_r{B*8BLe6sE2d5_bXF`UfN8W z9W0Aao0{UNKC?drl%N)e%41LJ-PX(x)tQyhnqR^LtzAJ$^=0P=muLNTZ*NLu@t*Ca zwLU%j=^N$`*4+FWEQIpC-rV)*OjQ2GJ;&#sO1r)UtMWvfZkKp4%{NLq3qlU1E{RNY zN3QSKTV9uypqDH@m)f5&JP)1cT)M9>iiYJ)2yWX#mB;C8DxzXS{>XyH@w`J0q_0Yw zn(QaO#hfzn@!53e66#lzzMTAZ#DlOB#==;lqH*@(^j!I3g(|wNGXmdi-yC!7^I2~l zI3az^T$k(RXs3%$QSsc0uDW(EyE9kR+;zRLtUJ4OF*mq#P4lkY0!>FDM}48-HKe!>XV4(21 zPt3AKagU!)U-ol6D>FHK&i*-Yr@^$&F`}pSE@c3PXar zdt%*q{ku<_=QEX#wTt+lRyj6*ax|ee>uT?`4ENx-??=!jSUBZ_o5OLO;q2UnsJC}{ zvRh<)X0ZL1$BJW71NNZEj|UD7SqJm%kJP1KJly}l!R@C{YZ#JvZ@QB9G&Z(nXx+v> z#ti+8+4;`KIiVfPgUxkz@R8}@j6zP$gP0bM9&q1=imcw^Z|r>&BJR3WuKuFgx<=+LmoOKc&oip?kWbMGrLi z?#QXNPK?k#=?ZDd@y{^c_~T0U;Xq!f+!5PG|GxaFGTW|LZiR+|ntQ|l|K=&~bvEE{ ZOrR`+3UX{o$ZXf&QYl*@{U&&A#^3(B4q*TQ literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_off.png new file mode 100644 index 0000000000000000000000000000000000000000..a82daf39b4c2821d281efed3abd069e29b2924aa GIT binary patch literal 1747 zcmaJ?c~BE)6c1oAVi2legBH6a9%v=m4LQh4jF1DO1{6?0$4W>RvXW$DvOqwn6sQVS ztQR9yix;-Uf>^E*tp{ScL=-QOqopE;wxc7$hzE9qfc*ozGrQmS-n`%M{oecDH=D64 zz|Y=pmK}*ivX}XbgNRj0yz9ue#P^qg-e<((f=j~iU@QucR~QhIj|z)K0GU=1jRYYI zRl??4#G6F2nTv*m;bHQXuoBZU6qXo!Ai;?NA z5IjaedoLm^^ew`WS;4 zF)9tH9!D`9U}025VzIb@Mksw>f>u9Ht22(aiD($pq|h@V252d1EKn~0|4^-VJlco{ zAs_TkNNfyA&?C$s#E8Wjl*GYB(JiU;u*iTYaLf>bVVbcnu2N$-W>jN(KorbjK!9AK zM0FO=2tqE0WjZ6S&?ym_SU@8<7$~ZOK`z^iC*^YZERGihNgyAH&GGg00>zLgi_4Kp z$FO2d8LLHf_!w680n7a;)-nuQJ&{?A7|=LGB{g7LV5Ddmoj{9^l*JYEcosh1#9H2C zRUg;F{-_ovA%bQv#h&NR6K8eKL;*70(aA^THp#%536E!OLJZCo;?i*3U@Cl zoGhK`;P&UcOIxC=t@|=^J4Dk5AN^(WwyUw%>Zg!wtSOgMNH!pFnM5IjW99@-O|NsP zr1Pg-?%Qd3$=TUAU!Sr=^GnXW=*Y~(o`$-(I5Z94jA^zqCs3O1>;Qhe;Wdl~EbE>m z+V#>et$)rE8X2_pZ>J}v^(Voffd{)BR`MLS0ahm@8T8oe%1tp~6CIuNcEj@eyfv=X z)fBB6j&nuk3*ZXKl~%lbzNNttE6>}AMnq`dAr&jFKF`7MZKie ze)ajREVbsgHZZ&>gc>@lD6)R_EXs?7GLY6Vkls)_b$erRS|?A}Jikx1IQLao%X9Q$ zSoMZ!0jS)nzXf&iKvBlH8IZMq=HTI ztcA9x%qvTT>bjhyujcN2Tm?1SJV;*J8CbfO8XnjaxZ!YtqQbqe&DeSW(Rc0B`evgE zjgoeklJY0t96ayn9DK#S@j?P`;Of!eE*j1GSX*%AGfI6`N)5ICi?uCnzM)&ZH{JH| z-h5rqkT^IqC_PJP_Acsb>;>=CWabA~thaLum&Mo|acSfayOT4H3AgN$?J$DY){ge% zfmcIP!9&^PE`2VEGSIW_aqX1rR}kvJ&r_wDjD3ma_^m}zTO-Z9N6Qt5LEpNewjlcR zy)ecy3%U2EUdoB~AE37uM7&(IaKX-W7hiuz+NoPflI$7#Q_nqJf1j2nf_$h?T8!d2 zz&+>7FzJ>4R zb)UXpS;;)AkxE%g>e{60z}>FXBS^NBs98^}--X-mv9hv_Se9Z%bsTY~jG7ZU&$8Y+ aN06Fqvga3(KR;>t&B!DH;zHku)PDh;XO#^A literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png b/astrid/res/drawable-hdpi/people_menu_button_dark_blue_on.png new file mode 100644 index 0000000000000000000000000000000000000000..9b7cda0c92dfe75d8947fba6f1771580d70b23b1 GIT binary patch literal 1967 zcmaJ?X;2eq7>@AwB*d&Bg9%80U<{E{r>w~m0wx=iMFMJ7DvpAq z;!zRhu%ZqW@v2;kR0RPA5OL%Q?se#bn|^B&*(&2E+kEnryK zSkP!RhS*OeqecbwMvS3TUwfCeN2q~C`h=0eL^PRz>2aF3l30cVVhyIkWjLlxTv3aA z&}hRQ)bcPgOcIDH2n~dpF_2NCqu4Z>hnG=@DdKPvSca?AT2HY1OeF}Ym7ZWIPr{by zgm{eFFG-IFCk4qBNpT8+67-q}co;?8vzC$kn*NiMx!#3 z?|?6AxZ9XuhHiqzwNS?{|d_ z@%`;keF71i$$Iwr2(ncO4Qqz<1XU!xdIN4k03sXH^Sx3cbmf&A#NOZp0Dp9S41e{ zHMo`>In_-C23SWbS#`9^#-`gp<{6yk_%J8z~-a< z&ruIdBW8+4-g4ue7nzcU){B@M12n-`76^Z- zmPN|hOaB;~V;Nq1;j({74_wN>o}&FQ68gY$YTjM0Ca-OTt;>N6$?jn@^YS(w8ny*) z+|J2jb=})rT+-vYw_4dzU#7}lbv4V-omF%f_9~lAf9OQt0Xp}ag*ctrZz*|xsRK6K z!AItBXupy9%HHO!*Q%*GEY_d3)zzy{oIPIluID)#6w!t4v6y=>|LK!`jis9}q`i$z zLfW3TBse;aVdgep&)Xh%%x;#5dmv8CI$#b;@*Xyr#Y{F zn)!0mv&D3DEqT1AvuxuVS+7y?F0}peHs4uRW5al93pg#w9lu?BG=pIp^+EMlh(OSK zTi{}ATQWMoN*V>RiYn+~c9oj$8FJ`%Q+P??8i&TteRgSbWHIjERaZFqq?dnz%5KT6 zDAW?EOn|J4w$0rvZCbLvB_i-Mhm_!To0GbsT-zU{gv5uxD4X6!)=RgZXuGRM^@htXb`W?=5C7_R~+0P z{zFd2y(anC92?SyKBO@r`^(J`+sIzGa$m^F*KW{1wZNF^$i}=YjfX zJ^s_`qYI=XZVv0t34iar%sRF_Fuvg#nhQF&hI0IO28L|ewLY_`#kbIryJ6S0N6oI8 zjET%DzsXx-S9p(ZjEHA3OhMz{JrAnssIl*T*xi0~&5?8dP8!Mh(THK?an~BZ0~4&% zX@|Q_mO$oM*R8VNsd#$Vo$RQ{D6Sg^xZSKT%4mgZPq#ZbleV;_E<|brqry*~)Q=1=L(x*l6|X9-)lZd^}qcHq*A?w6Qzr9pavWdkf` zbatetj{2DYG@}BiO-Qy9{5Y?VZvA@9fko&^-hlwP!=bp_@zk}eGsG@WayFUl9USQs zg>%M_sP@--&3b=|zJJf{GkY8yOOp0Zw^*0{ak5r=X}z3&jQ9L>>Haqj|J?EcuaEF@ z+BS)AS0&t+rr1GZ3z?ZZf2g%vFRFp(6_P9$&NLBs_A^3 zIKVNE(&?#|3q^jxdc{l1T9hTHR#ZU!W(FhN`A8%25uR$zPK!NwbIk8dYhlrkrl zS{WLxYhSE-k1u`Kcjky2gg*|c{M`F~v5%r4W$oYGJFHK*L`Ge%g0zdfJF`M_Si$x4 pzIOxXn?e1?+yUlC*ZwqY6m3df#^+E*C1U=CihY7aMf0PQ{{?|x5|#h} literal 0 HcmV?d00001 diff --git a/astrid/res/drawable-hdpi/people_menu_button_red_off.png b/astrid/res/drawable-hdpi/people_menu_button_red_off.png new file mode 100644 index 0000000000000000000000000000000000000000..0cf8523b5eac4ab54460517867e1e66df77f4a22 GIT binary patch literal 1744 zcmeAS@N?(olHy`uVBq!ia0vp^$v_;%!3HGP_`Uc5q$EpRBT9nv(@M${i&7aJQ}UBi z6+Ckj(^G>|6H_V+Po~;1FfglRhD4M^`1)8S=jZArg4F0$^BXQ!4Z zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%ftjI#nTejE ziGihwrH+D;fuVuEp^?6Uxvrssm8rRvfuRBvC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR zmzV368|&p4rRy77T3YHG80i}s=>k>g7FXt#Bv$C=6)VF`a7isrF3Kz@$;{7F0GXJW zlwVq6s|0i@#0$9vaAWg|p}_eNv z%sh|?Sck8#m1kaYNn&1ds;7&s63`62%*+%k12Yo~b2l?fOCwVYLqk_XM?(`+Cu0i( z7eiwsGgCJ=m|mCsATTyyt+&2G}>$=`_%i?|mvpf6veSS~9&1bNTJyG<;)`J2M zUx;sidgA-JJNIVtMOr23*vz`WO-Mmv@8+W{>--lv{?~Z+vCECqt!>e@z9)$x=E768 ztEvv^t~vU3PV~)5bxRleOgz5tX{5)$ki-ot_2-J)6{VgoOkMQ%;M*%7-mGmay8WqR zM{VAWemkK(XTlEO;0q4q?#S9wVtd(8YW9~4pLJ$w_v~ie5H`&{bIFU%+YKf){^pGC zGX42RwkI|B&@@i~*R9E!VM=dvTJM#Pf-h%VX_T zPra^QKBwx@JRvuYpFNsAJi-4mrk0j|}hH31u>F4~2So zFIO9i2(#RsZf)tPY4R+xK*IW}Po9bSJifIYO)GalZ+YVqU=;q!?&@+YHK&UaoHyq0 zs5Ou|w5M^RKud*_yi?TAyMZsPZrQQT6mkpw8U5^ruXJhG47ESXy78xX9^%N%lrr3| z`lsgnTVCDXwG10;&Az^1?D+qDs(W;+t{Mm9zLT@=oAGnapUEEIwB6&)ruVyretbKx zdjEfzGy@wjm4eV2KDHwa%mxYv7$%_z(G-hAhx&$1YscAgoMD7U?5^M$l^5tRY~sFL3pVwN){K2vzU}%EMY@07b!yqa%!36s-tGg(@m&Hwf4tr8{@`KIWYBefQq)%w~j# zEwQn7vL+A+Ho_2|1n*(|jUrm$Ul*@!C3rU%kWV}Sk)e=mRz(m*PWP6b)sG!SC4Adm)(J!CwZ zPO%P>@C0MA@EM03i(y)bN=-~mq$K)KP@R%W^Y{0sf^;gK?u{e7^+_5`Zt&LVUB(r7 zh#uCdw3rIj0A@vb44Qy($atn-wxHHd$ZGUs$Aljk)gaeWX%x`BrE#EG{Qpq3dIGJ- zB*@o%|5I2mP0}J%38F_6bTEE#>s-vCv{0}Pkz=S%ilXbsPcb|e#ZY}Lss(~0m=qcy zmcuHId1aI#7DGaf9+PWeM9AZiaSe(}rGP+Rh967d%k!r*{b)2kEr`Zoa((_oU8cCWy&~ljjmV zDVK^TLp5LRzpi?G39ldXaH4SW$wcWR8ob_hcwr}d?c9a?rBTQWk{a&!9cWwT6hvy` zSFGmQ6g$ii$K?v@O5Lk7-0Pl;(cU%Phsh7vy=#CaexWmIjdE|$0bEYb{ zfdK(E0ePnD&T9+iqk$hEv?lu)>%+p0iX37{rtwQ#hM9KsS`^o3Acw5&MUjhw zs@`%J5tt%(#NJwCY2T$j@%qxN4G|51L`G*9x%dBBkm4lBPH}PFR90;?Sxpe5YkrPm3!!R$_MF-NEL8MxX3iMX4n(;vX6x_|Ad`kBeH3wZVZ4 zhSuj_-}=$vz`bKDlaTIrfvL?oi#d1W>c6wiPdjV*zEY4OE!nRmrrpT3d;d#+{`a}Y zy$jM)?n#N;BkF0Q@6CIh*VXmp z_3*09yrs-0O@rT3Vp<+t@OaM0=1%FWN(*tQsnGq5x3O6B+;QWnjmKjWcQ=M9W7{6i zw(^D>Mb;);)s{=)*|h;fk(8N~SM?!(xAhli@mngR@-sW#>^w@PlyrybcSf8xZ|k(6 ziv&5Oc0%?W8Avk~1bRu@{Z@NTWrGceZZ&j$suzK2NmCg%gYCVAddye>S=OFR{mD3x zG*n*u)8H}V^7BsG`1pOH*6(&^8n+AI%Vya8x;d~}7=1VYWMogYgdwf2S?1BU{HVPb zaaYP=?GCzg^=yO3)$X`!=?Pi(?YCT6xrP1xtxt>R?B7)=Wj$$m7CaI?^DlUy@wUy8 zlXt*31-8PVKKhBg&pPxVZj&*C;2zmaN*i-hNG5m8NjNx9{$|DYDTJ=jx;XFIeyQf)oRA;J JJH=g_@(%#v>u&%6 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_menu_friends.png b/astrid/res/drawable/icn_menu_friends.png new file mode 100644 index 0000000000000000000000000000000000000000..d04d6058e8a444dabd0e150cea8482b69999476e GIT binary patch literal 1578 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBM!3HFm*DSr z1<%~X^wgl##FWaylc_d9r7D>r5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi>#nr;l&CJcx$kg1>(ACh<(8Scq*uucY z(Adb#)Xfd1*Cju>G&eP`1g19yuGicEr(RHE$SnZc?2=lPS(cjOR+OKs0QR(1CT_R5 z;4}}aHwC9#%v^Em)dxC89~8AnQ4JFUrXLU!o^XL2c+yYJ1E%*PV8UJ^aKn^=foYDX zi(^Q|tv53_<{dH+aNs}kU}B!+X4B}GF551xRhGW%wZG+?H&?X#kEXPim5HZkOkCS@ zbA@i~DvqNYljjRBm{TGYB=h^-(|0vya}Pgc;O#nJdaSf%fA^%K-W~fMzjs@5S)oDm zI{(>?>tmk#N?f&de9m~>PhXYEWkr4Q+v_#?=fB=7wK5T8G-iIzcz@>HY8DRlI-Tb` z4rW-K=8%|sLMG^?WX;6}ZS5zShfF8;$P3)icoyL`&v1*n|3;p-H+M5A@JM=hT~)sx zdvdci6T>D;n|0?^zdq$`JUT`5f#;m_ix<6;bd}Ydyz$XYcTR;X3?>cFQWiW+@ZeOq zaOeH(oRyk6*O)Hoi`Y&MDBZeuRm;ns*FsihSqu$a4eO@3diogTuh}_mvzte`zwT|e z?JQ<_rq_)&%@uNpG!_wL=rFln#Ky2;w~^%JsAY~imb_{%W|J9DXdTnhVbIZfb8;4o zfVS8gql~n#Sn(4-Mod(xPNrs5bC3ABh zu48SGv}5k(C`dg&|HT~+)`|@QU+*u9TCaU*{kyBd$2ZzeWssP+!^vRxnI12$#k>uF z9wnz_oR11S(a%`%qQv1s-m|GzPRc$EUoK{PRbM;mXT(0?^4EqqiF3b`E-=5zDyc0^ zneM)lL7^z~)r%u$M?#Xs;(c4*vE8}DbDp(9^J8jTe;@miV`>~qs&kA*8SZtcNiTS; zcj<*ijk$|^?gmx|!DkoJs=n~t=e|%Ve@nQ{I;6Wx2cgz!RQ1_IWSVLfRGgKaJV$%l-QB1#ydi?bjA| xhH!@eF?FmG3{Ot)T%Ezerv@s$Jzf1=);T3K0RTosOJ)E7 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/icn_menu_friends_dark.png b/astrid/res/drawable/icn_menu_friends_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..3a698aeacfd4a6f9e81134c8555a69f5a798e30b GIT binary patch literal 1592 zcmaJ>e^3-<7~TU!KtwG^4n8M$Ps3}+pM#AU_iD~U2P=7=_v-^GDJJ0jH@B6*a z?3-50^64RSLjVAnZcM^#{JM;PB|(Aw*FP|`hhHMN#B?r|&f$u14*|qG>1+ZtQg|+5 zBXDPN!6_n^hdxW%)46oB33bpEg!?d%mtuG}0K~?58QkF_I53;YCEYsFz|pTnAnDYJ z(o|;H%;lDQ;1!KJ^FF+9-4tlA4H;a08qETIx-}}Nc5jYCr zTsqN{qSDP)P)~aZPzAwK2dqXwwGu*BMDO>F3aIe(OipLc&f^~RE zh9hY==u^bA=|WB?;wyd90>wKpfoAjnLn&$k&2l#4pL+jO zn6(!(gv>^;bfL$=4=zXSOU0mi4}o*E$4=Av@Q^PPPJ@T0z|p2ra`IY`N%h9K&dF<$Ps)|?#mIc4{nx0+ zL%e@{+X>_HhY9NwZr<-6-q_7o3OWJ6?|>1Dw|l$#x3{`az%$D-w=EPqnsQuCIpQ@6 zu(~e4p;|*e42Vtm`qHdjA5=9|NY_L}L?|xRLbmdr&ZTQZ_w3{(b(>3vAKdx#;?ZuV zeaWVC_cyyjcOU%hR?Dv=g57mV=l0%H)W;283_n&obVLGF=y%V36i3DPt_pdm?ODgh z@8iOjy?w8=ZFpqxn#I3&-iEuO!2{VqTey6KHL`6}U`FO2kJ?o?cT5}E7@(fxSTcoz zI#UhCu%XB+fK@23f3Oa@9NwWfUl9v{3&I5*qnke4GSlj!JH8--bV97;3ZQMjZv$?J>0N$+>zgC1{g2(?D*6s-OmEl+W46w^YzhSF z-a|0Zkk_#2^I)*r)akVDWz})P*8>D!$C)be+OfRy0oGu-_`L8NM0){2!u zz~YL-3hC9=K!$UkqOz>1|3XXHROZt>^wk<fsjWGomF!7_(|?*G=WjP#pZxv42KM zdFz@FZNFh_yS-J1bH$RMEoU3mXz~5yJ1?HBPHr{a@%tqmc}*u4F7g*{Oa-Dcx4`y; zFO^4V1bQ}mU4n2}mOMY`9Wq7JBrsL3YVA0^{!3M*=z_nco9%%|($b!ZoKd+_>US1s z+jag@=fYP`1s^Zi(kK@63YJ+j8cT1T!QYyGJ-q(h?7nW{$KRG+E}fd6yhT^m-W6cA z#56Q_p@k4<2IXPuv%}-OFo6kHxY%$e9`p4VZYf9<9 z=s~FO-r1JL!=}3f#nnNTFNA_09T21~)&LsduZ;Cmgn;_Js&G_?&GG%qjfoblJ|XM% FzX79{NT&b* literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/people_menu_button_blue.xml b/astrid/res/drawable/people_menu_button_blue.xml new file mode 100644 index 000000000..25dff3d5d --- /dev/null +++ b/astrid/res/drawable/people_menu_button_blue.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_blue_off.png b/astrid/res/drawable/people_menu_button_blue_off.png new file mode 100644 index 0000000000000000000000000000000000000000..ccf838127c547c83b5e329a6d7353034a474fc0c GIT binary patch literal 1798 zcmV+h2l@DkP)i>@klhbnd1Ri$pasMJN(D6?o}Xd^{c9}6NXnO77Di3m-384^N? zu?;hG&-d@bckmlC_+nVxpX9}yIsWc9U!X!f4z18*-cBC*OH2OVerawnEhNa z0`7D6QQCx6I#wl?{A?+6%Uwj@JMVSveEaH(XKE+QGrt?>&Fz5JPhJl5A%NJv?X6E9 zn)yxtf#K>ze9Vf!7;>96`hR!06xa5=nE1m_G&FAIjuqoO2G9TN@ORgqZuPN%KA461 zs-cBq1cY8IReAti1Ax7?S~%VD+zSS6YNRn#s-yL-`*HBtYwJ(sk$-L#k$!p2HhSCz zqQ}V9pnnzQYyE#a^QBvzoU2IVg25z!=mJn}HGP=ue9EYo1@s!Z8VDQA?A6VK|5=kq z{<(-Cz>;wr+#|$PP$aA&`byoXJT=+z?xv`{HH1=yTSPOEO+gV-li>2sP}!Wv7;+Ku zHxU=pv*UoqY;tB`h<05w?j7as4IfDU9_FbECMD40pSADBbZYy*%SXpZH6~Lw zNVu9;{)-ktfSU*3U$eSv{mTL#c22CHC67*Q-SL;R(z+Nfg5-1zp%6az;Jc$U~P=!Znxpj)J~R5*0F)*@)klH zMe6|NoKgX5l`%NtNRP#OICcDcz2|rQ^}-vWqwD*Ab9`1@>+FJVjO`v8JNWk{jzk|ETVNJ$y8|@?+(!frG5RStTrwCW&3%V$ z9Sk%Q=89thr9Te6+H>|!$JPGsGq6u`C+PDn=LDu82zqCbJqd6d$aM@M5h51chPwmg z3Jax|q~^1PK9+P?&;rgQ$^+`$B;O(57Z1N-E0Gll<3ejL;p2v~R%X+FMa+LG$QU+4 z>WA4{hNP;PP7FwkcsT9eI-oIxN6GN0+&_o>48=o0{7mAkONQ3oHQ&Ang3#p7Fl$UH zJPYy_h9r^u#M#Ul`Ginf=%$5krRi6I#$+@fxriWf748>xkM9k0A&+1Z>x+$( z%PT+r5;pMk;vbjYEw#PynY-L}xi2q)A4H1ZM`RQtG71qHg@}woL`ESZqY#l%h{z~J oWE3JY3K1EFh>Su+Mj;~O|C#Ii57rQ&7ytkO07*qoM6N<$g5|4D)c^nh literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/people_menu_button_blue_on.png b/astrid/res/drawable/people_menu_button_blue_on.png new file mode 100644 index 0000000000000000000000000000000000000000..48521e6c33bc4013f4a04d61e3df09f5fe0b497f GIT binary patch literal 1416 zcmV;31$X+1P)Hfhl+f{GUNig}Oa^PDZ2R#}hl9ImP2-iZ-PCByWpI={9%YnJf?WF+EU*!(r9ci?yAi5fN9&AQ(`rvtc#snv1Kq?CDG-I zkn>wthNc9e)i)$jsEE7Y%K5^JpH=Z?FnrPLhk!r|FcYEB81gVHmTR`v-~*4kHZ6uE zND+J2iY{kq|*UXcxQ9$Cm*#92c6d z(>(+48cqOG(4(T>so4P*9v-$T%hL7+Ym?sDgm9=I0ed z1Om#2Z@;b`x3=l{_UoEQAV51jt(e1JK|tN|ld|^W&s<}+zZX?gF|B+MMB5b;r8@x2 z{KuPmNxQxa@9j757Mh-*$oEdo?rSFq0EnrK@b*`Vl$^Qs{@IU#8!9og|bflfQ25;qqTpPf;UisorqziT)* znwa4-7*GPAXZ@A5w~&;QTFtwY=-)unl{5b3oGLbXCEefh*B=GvQ(n%G%AvoVj3=(= z{mWVPrf%;a=(G!6`0OnaMIwV0I2(KnPM5Mep+mILoVyO&k- zS3wt=?r2zsGLnqLnKZ&OHnZyH;z{nmm#h-mtiK$n-(J^t8y_m6$MtcHlnFJ<)%L4w zIOWmx`NRY@9Fq0v%e-%xD;*x2?fy7`k)rX-^XlQ>Rl`4QW+xelZk7UhXSZ>0zp2`} z#SC@acGhMj8J)YkWh^95@yIkODUf6tGR{mg&JCT`3FZlieWXA@QM=v7pl=i>WRzm) zVR#qsv*r{IVLRdYL+)7TR3|&(I}K*PZ%h+28Pmi}#xyaLF-^>5OcOI1)5J{1H1RJ= W>|BNYG&xKF0000 + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_dark_blue_off.png b/astrid/res/drawable/people_menu_button_dark_blue_off.png new file mode 100644 index 0000000000000000000000000000000000000000..e78e8af092426ed7211a643fb688a0b40f5f27b0 GIT binary patch literal 1625 zcmV-f2B!ImP))cbHZ=HK@6(u1DuwOcXUkka2lw3qgE+Qotk&=r@ z$wj2(B2sb@DY=N0TtrGPA|)4*l8Z>mMWh73RL6bKj~%DnDL{uo8YB<#f-L#l^ou9X z3TWwz61Muq3<36@9Q%uf(aZ8af_%-72AY+8Qa(L>`uIpIWwczx-si?12J8&z3Q$rf zBL~Wth2(crr%(K|Re80vMvx$6r|5$E5&%F6;9LmVDUOV^EWgZa1V_fB9rGWCvp*I~ zdhJi;+TZp*`%a$_9aQb(PzT8a&p?xOefZCnMMWM9-EzkM|6{HBj5eBkYINg+`B~1V~*Lx;tx6?>_nNtvy@zJRZ63 zCwdpZdb01?GY=AA7Wro;V&^lXw@0$$6#8J=WlsI(3dj0~-rinqL-;NbZA}Fv+T^vh zde}eo_V$qOggN!Yw2MNY$lvaKX7u(f^3O~}f^F49k?S1BTF%cY*oHMzoB*<$PmdNhkoF2P z5pgpR32=2g@akMXNc;}~mYNK^MB|mZacU6YwseKfJ#N<_6A_nj^CE$|^PzY6srq-x z{Feac8rL@hz?^4rzFwSFEt5Hv7uKKkN-`0l;UlqV->tbpi6Adl55K+P{IrCLMo$Py zNSK(OoS&#Uc@fg83klJ_)9_=Po<_4nK|Y!B zrQ*5T^Rt~dU4^+x!Uq5#z#RDf;@rYi7Wro;;__t_0eug!64MMIiyA%>*S4GK8ovbT z9D=ZZpdf_6_h!1rFV&vb@R8Wd&%>%I)4byOO23;YlTBC8)1%#t+7A=D8^!`82`~xs zCjW7%7=Ci;)kiK@+wXtj?4J>~zv`FP);McxhhHqdGWF82zt+aLux(K01^{&t@F1zg zmq7cVykH;I#@`4V-fQrw*Tde9Z9NL30gDQ^3F?5+SLgalvgj1-p|IT_-aT~YQ%n5k z|9$26lOFQdABvUD$ljr`eP!@BK~y*>prcZKQQ4?SA}td1VA$>ldrzJjm-)|Tu73OV z>OD?V_p{y+!9R?;J^KoSMjR5k(||S!3D_WzMABjaR|Gw3L3B*<+I$&=P+Wc=z~8;t zO(Y@6W@0;el|fvD_v6!3OaHDdwvAZ#h}eCg{UIjF!=htlsjK)p%K}lBh&~`~55PMJ ze-G%QdJ+IYaT%c9PbK#nZ~?Rn9{R>)CDA+7TZE7j6oWJoeK70YeV{!8@ULd?YuzG( zL=T9TRF=2(+t4!s02vE{KVae^8Tx20QUajCHXQO0EMnm9m5&EZoDuv-5GE-ufRb1z zcS;0eu#zW!P7wk_Tw@cy20_;(kwLyNJ|NUk=Umhg|(hksTFW|={o)@*Lw{7db zn8KA6Cj`NgZpa-4*#_Tqq24$Wpai0Y5RTIP7f3h@Zv1UkCJU;4&!7DxEPO*gzE=78 zc_2Xxpm^zpsh3W?xS3Gd>^`Bb45HRb000RLB8YCsWmMWo~+QgRU~xrmfpM9TjG X?+Bh?u+?6=00000NkvXXu0mjf4!r-3 literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/people_menu_button_dark_blue_on.png b/astrid/res/drawable/people_menu_button_dark_blue_on.png new file mode 100644 index 0000000000000000000000000000000000000000..d1a6afc28d7342535daf62f8db96b773936fedd5 GIT binary patch literal 1559 zcmV+y2I%>TP)(RA_GWo;*M9J^`S=GLYWDMaPcRup(e zAR!e#0WW+6BzWM3@4+MRMg%%>T@sGqcBd=JOxn{}21G9XK8aGWv;ujDBJuqn{Ya=qCm;`iX&zeqtb_ zBZA1~ga8cD`y&8{3p$zUFd(){1L|8bjnl%w^*; z>$HV4dN`wpiiX7qB?(_YGc=RYB?h)DZa*rmY*m>56CjWbp!r<#t;u0Q1OSK-4=dl_ zwki!*5DZ1s&cmasq$v^+2%_`p__gUYLm&W#kkFKpX>V7pj_c5dAW0=LoX_d55L^%! zK~p6nLd2qBbqjbl)-%(6rqHry~&DltR=httDtqgl}rpzgSY*xhISZ`ek{mTzA?Iyt7fd{kY`yR16_su9r-QF$4fa%f19TuT7+u zH_HzTwUuYpqqZp*q{`B4CN?*wPo`t4%$iLh5hOJA-Sg?iiRAr!Wp&%wt~R(JsfRMs zT?P>-GP`^xIg^Qv>LG2Blh#_n3d=o%F4`fHOQdh^`yJF{s55Jw~~dCM%ZTrxa2rq5;L z9nzs{xl2#VtJ}4mnuQ2Qy~z+5L&M@X?`*CY&CW6D9u0XljEQyvZj5lp9}3**Ub zA{mqSM3#StAogeMx4C#?n zL`_B1(<$wzrTli)YFftDp66(KDt~pG8x}V$Zd$z7aAP6)+SJG~YG{&*s8=S39hYi* z(-{`Gdgv5;ipICMHk$t%w)@ow^O_nwkvfx0YQH_)`D=Yw*}DWHAf;QI)su|YW7g#~ zs)qx6*%eKZG)3ZqBtIV=L3*kay1;xHd|xRbLb+~lR~jebjfd_3v#EO(KTLoN7+(aq zc?)vE6R4FwSq8sv^b-Ra{lq{ + + + + \ No newline at end of file diff --git a/astrid/res/drawable/people_menu_button_red_off.png b/astrid/res/drawable/people_menu_button_red_off.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbdeb11d5d437c73c715b1881ccb715843abe9c GIT binary patch literal 1372 zcmaKs`9ISQ0LQy=E(k4-&de-B3bQt9xEhb0NCNBwr}yo0?w zWM>7G)A$`JklgV}0HBEYA1R=Mfdl|KCG1hBfY_|X@{>gMKxFTQm*tBlo>*-~soQF@ zMo*@^tFsmVM#_5T3uDBnbvgI^;9lGoj6BhigX4DpQMOn8ZR=LyEkkDDF4xnz)R+^$ zOp96*QaPMO7U^t;6(?zWAnASDGhSC5~wFWA((wz>T{zlN|Lr9)9Y;y|#T%9I~A5^wBT&v$@~q@wx- zTF`MDWPS+aTBfX#0tFqNa{uJnRV&MV3ML=N$^aD^8>C98<9rCETsfd%*sOj{1EV!3L;_)-3II8!eFlO z9FA!>XbtVl^lN%}h<@ghKMzAAyBg_H58@jQ%C&r{Bf5;Wip#vI@HMXFt5cf`z(@Pc z`n3WgrrrRK19M0eQ)^Gy&`NQvfYa#swx|+qn=+qhfxF z*jh}2=4Lt4w_q89a$Hfj1Y;H*UnOVh>u+43*oDkSqFeRhUy#eTtre6Q_uqi+{LuJiC>jD2Q@h>AYcpLoM})OVd0{6RH()tbay{awdTw z`(0P1OaqH0U8?=26vU!ul1)ieC?vHt_g8aN9;<)`wKtWf6~B%i>dp8d)*%tX{+;{0 z7)*I&TR+%9b%RTBWPjEOH@LEHZpicyrP}xUZ{65DSd;C~nbvwp7I8%A|z1d(OXadR~fuKxbol0XhW7lhkrVl$2V9gj4 zwjS|LFlxFsHFzQ)2mKV4xnamah&0r*tU_Nan+;m)XIX;%pive_Y533}gFbJ%;ZSnv zIdrh=)0eLEUUVa_#zyijy^I`vqy^cMdKNsXv>a&rQEqiaOp!e>Dbb7ElNHZn@LO^I zHG!i2%;8Ddsw&kI6OnODRuz&3MIv+&qGj*06KW&wpPuR@I+A$8E`Bo2h95TGGW8&S z70$H7wEf1$W%qyq;yU3IDP$fNK5Ogy1{TD5&%Y}FB1l-omlmT4{NV=Jtl`Y>7-wTh zhh&28MtV_uCC1zPQHa_+!5qoIqrg>re2)h|b60(I;0c|0u?JLg)n#a?vzH~DS`04q zK{Z1zA$a0i?1$`gN6up+21L)N*;;cS>|wvs@hnxy$8a)y+qfdVL!;@Khe$R>eb&^_ zoaerv#9wNPI~8%UW$#UejJIBPiEiB&ZdPr7pIT$6MPEFCoKSEjQ&p?LALh2qOS76r U%jEBsJ9i0SUA&GqJA>5!0Eg3jOaK4? literal 0 HcmV?d00001 diff --git a/astrid/res/drawable/people_menu_button_red_on.png b/astrid/res/drawable/people_menu_button_red_on.png new file mode 100644 index 0000000000000000000000000000000000000000..edefe1fe3020abba577ec3525a2fe67d0db39913 GIT binary patch literal 1443 zcmV;U1zh@xP)ohN`yon@_zMk=y~kD@1V6jEamjv;%!L3 zbkNg%)>_}U_gZ_eUHk^e0p$NCP#M%@R1<14stGk2)r6XiYC=s$HK8V>ns7{HNJr;d z03afeUo*v+0KlV(byPA?(;9By_TRlLwX^^L*mgD++kEmwfB*hS!d3j*Bmjud_s`R( z{yTT}59#{Sy?a~FpI3ZMj-)pJx^?S!4FG_e_V?q*YB*f+h?SQ?>+1s#A09Xw3I!fK z5S0$C>!S?~dq`+n&W~$(E=wF`S-WyY>F5ALgs$r! zK3Lzs=Z4g16eulWOHZAWnwpHwO$0zny_YV@;V@Dv3}bs_#Qgfz1s|6()ZSiga1b~b zLLjAee*f0+FyGn|05lW=ELFqA=Oda100Kbi>e8-W1xf|yNC*uClB=us(o(s6TqPBv z+S@A_6SfVE3DYEvjY?NnJ|%?H)F70qk%%BfSQaoQEQ{3FE8X2LQp=4DQddVB8i4cN zKhj|E*YIIJ5%bF>Nwl$Xj~_y4D1;>!vpA)44FCYW-hGh}F_$L@z?PRwF9=VicqRh? zKnT&aJueG^vRpbRi^7czo=SG6oz8vF#$v*aTUpr?o^!UafB*71TdDL5k#Tu=EQ`HR>h?ZYif!olezFn zsW~~BPj>(Tkb3);Z)_Ab%#Mz3kBsDqB7i+N$5vPKy8?~VecEQJ`46f@ulgWoi z++8gQU`|XJO9v-*)_*Jn1=ij)X$_n&w>T?DTGInB(JI*UP$`IF%s)h@!}+ zPpgrL+Sv&n4{)B}D>6%r#_}%< zK>`8a&70nf7qjuWl}OkN3l8Zyx^JK)c?JfQa9C<;LRl7tz(rm~VHj*}EpY$7(%t?0 zcyf3+8;j9k5GXC-1S#d|v^6thjE$L-la-O-y?ohs{W|34vS@4}fH6=MsinmejVh4{ z9^4)BWHLK8W+oDBaS;Fx>>~+5LU<;VeDR|64h{~JN{vPZ=fzJY+Xh7RdgZfcJ-xkB zOAAVe_#}S6HZS#rYiri@bar%!Ot zx&5OIt0Q9bhv6o_`TDy3^Jm4W6d(+vToYG+eiGv1o>>M8-I`;#+HK0eWF9q+No~|* xR1<14stGk2)r6XiYC=s$HK8V>ns7{H{0qLsIAp#Q^6~%x002ovPDHLkV1g{NpE3Xd literal 0 HcmV?d00001 diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml index b25ced504..4d049fd58 100644 --- a/astrid/res/layout/header_people_view.xml +++ b/astrid/res/layout/header_people_view.xml @@ -8,7 +8,7 @@ android:id="@+id/main_menu" android:layout_width="51dip" android:layout_height="fill_parent" - android:src="?attr/asMainMenu" + android:src="?attr/asPeopleMenu" android:scaleType="fitCenter"/> + diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml index 31d0ffb9c..15e8fbdc8 100644 --- a/astrid/res/values/styles.xml +++ b/astrid/res/values/styles.xml @@ -27,6 +27,7 @@ @drawable/task_edit_background @drawable/custom_tab_indicator_dark @drawable/menu_button_blue + @drawable/people_menu_button_blue @color/blue_theme_color @drawable/lists_disclosure_blue #000000 @@ -75,6 +76,7 @@ @drawable/task_edit_background_white @drawable/custom_tab_indicator @drawable/menu_button_red + @drawable/people_menu_button_red @color/red_theme_color @drawable/lists_disclosure_red @drawable/taskedit_arrow_up_white @@ -96,6 +98,7 @@ @drawable/comment_dark_blue @drawable/comment_dark_blue_filled @drawable/menu_button_dark_blue + @drawable/people_menu_button_dark_blue @color/dark_blue_theme_color @drawable/lists_disclosure_dark_blue @drawable/icn_edit_repeats_dark_blue diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java index dcbc1d61b..dedaee407 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java @@ -723,6 +723,10 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener private void setupMainMenuForPeopleViewState(boolean inPeopleMode) { mainMenuPopover.setFixedItemVisibility(0, inPeopleMode ? View.VISIBLE : View.GONE, true); mainMenuPopover.setFixedItemVisibility(1, inPeopleMode ? View.GONE : View.VISIBLE, true); + + TypedValue tv = new TypedValue(); + getTheme().resolveAttribute(inPeopleMode ? R.attr.asPeopleMenu : R.attr.asMainMenu, tv, false); + mainMenu.setImageResource(tv.data); } public MainMenuPopover getMainMenuPopover() { diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 4211aeb8f..5ffc35635 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -138,6 +138,8 @@ public class ThemeService { return R.drawable.icn_menu_sort_by_size_dark; case R.drawable.icn_menu_search: return R.drawable.icn_menu_search_dark; + case R.drawable.icn_menu_friends: + return R.drawable.icn_menu_friends_dark; case R.drawable.icn_menu_lists: return R.drawable.icn_menu_lists_dark; case R.drawable.icn_menu_plugins: diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java index 7553a1c8f..8c9db62e0 100644 --- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java +++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java @@ -101,7 +101,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags), MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item addMenuItem(R.string.TLA_menu_friends, - R.drawable.icn_anyone, + ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags), MAIN_MENU_ITEM_FRIENDS, null, topFixed); addMenuItem(R.string.TLA_menu_search, ThemeService.getDrawable(R.drawable.icn_menu_search, themeFlags),