From a9a9b42233917121f3b3ae3048692e3472046454 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 8 Aug 2011 21:14:24 -0700
Subject: [PATCH] Applied white stile to filters page, minor style tweaks

---
 .../astrid/locale/LocaleEditAlerts.java       |   1 -
 .../res/drawable-hdpi/header_tags_normal.png  | Bin 1674 -> 1504 bytes
 .../res/drawable-hdpi/header_tasks_normal.png | Bin 2321 -> 2500 bytes
 .../drawable-hdpi/header_tasks_pressed.png    | Bin 2806 -> 2844 bytes
 astrid/res/drawable/edit_titlebar_white.9.png | Bin 0 -> 171 bytes
 .../res/drawable/filter_btn_background.9.png  | Bin 819 -> 809 bytes
 astrid/res/drawable/filter_count.xml          |   2 +-
 astrid/res/drawable/task_indicator_0.9.png    | Bin 237 -> 243 bytes
 astrid/res/drawable/task_indicator_1.9.png    | Bin 214 -> 228 bytes
 astrid/res/drawable/task_indicator_2.9.png    | Bin 202 -> 220 bytes
 astrid/res/drawable/task_indicator_3.9.png    | Bin 200 -> 211 bytes
 astrid/res/layout/filter_adapter_row.xml      |   1 +
 astrid/res/layout/filter_list_activity.xml    |   4 ++--
 astrid/res/values/attrs.xml                   |   2 ++
 astrid/res/values/styles.xml                  |  16 +++++++++-------
 .../astrid/activity/FilterListActivity.java   |   2 +-
 .../todoroo/astrid/adapter/FilterAdapter.java |  10 ++++++++--
 17 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 astrid/res/drawable/edit_titlebar_white.9.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 568f7cbc3..073c77eff 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -177,7 +177,6 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
         };
         adapter.filterStyle = R.style.TextAppearance_LEA_Filter;
         adapter.headerStyle = R.style.TextAppearance_LEA_Header;
-        adapter.categoryStyle = R.style.TextAppearance_LEA_Category;
         setListAdapter(adapter);
 
         // check for plugin
diff --git a/astrid/res/drawable-hdpi/header_tags_normal.png b/astrid/res/drawable-hdpi/header_tags_normal.png
index 671189f8000ccbf293ec6c1341cef9c9032ff8b5..6a6311c28bd140e8881906b1b9e0891045eb9220 100644
GIT binary patch
delta 1425
zcmV;C1#bF^4d4rqVSfWFG2FcY4FCWIU`a$lRCwC$TRl%3Nf>_CJ8KBo3&>!UAQ^Fy
z8+3*OixhVeA59b~1=Xbs9imDTDP_EFXejvyT$j^Hrz_}CgaEsV5C{~3z}7`cu)&97
z2cP4Q-I=Qv5%3zX*)_(@BU!Soof*&L_v3lr*#$T_I5;>sIDa@e?jnS0E}EE_2&Gaf
zWHK4#a=E4@gAf8)meJGGgGeM2wuHdm-rmsB(b3swr_%{SNYjz0sw#@b;@M}9$Ae!U
zkN^JnUw_7HCa|}!FLd<f3;cdRy1Ke>@7_H~k_3mt(UcabX&MTJ0!~j)@%i&-oSdBC
z*T-X6TU`m8CV%kfz;GyaoW#S257F7#2}zQg((=lYNGU}wmqRj{#LmtR0)YUwx3|Mp
z6F4w15c>A*8-|94;C8#4*5a;0u~@|6;UP9RH!(Ibft7dfE|EyeC5-j;bp(S!xZQ35
z0HyR!5=aQa{rmUv{rh+P6E7bMFPT;%kwAZcKRP-(xPL|gAW0IuUaz4MU9!NhU%$fV
z^Fa^<sH(~t1klpbVi^BPIkRnPX|eoY3<Lu3dc6<?!SW4?qKJ<lKVo}(+csA=;-oBr
zf*^n~2FBQr8K;KLJDpCvc<}<0lauJ|>{RTsl595n;ra9DZ!i94voIPjNm6wL>XR_W
zEJ+?CBYz`!^5luq-rjDjo4H)BLB<#~O|yLNN<7#u?7F+Vah|+rG^#|SQN&^~OLZk7
z#1`@@S!G!Qb+%Pi#dY057p6K^S67u#D0C}zWvNuEo<K^eCFEVi*47pr4hKY0#Msyv
z#>dAkPgnqOa&m&j#YH5O$(wOueSp;hIueP1Qhy4+-;dX?Un_Q&hCMw!%BxqeZjM0x
zWo7)3Bngz#y42OOEJK!Mq|<3j2sH9YN4d6+-Q`<7N<+KCP}MTVj*aTls2&?Tzn-1*
zRCHl0HhO-JdXlFr0K3;CwP+tZFg-o3#N+Xr#tsh;V{UE^vMeihg#)9$Kv@}MmmsaA
zv48sd`fBPus;YX{{ID~gR_($@5{6QGZ2@c)8YD?VI2=}TxtwB_2*w!N+S-(hwQ8;9
zsDAzVy_%LWMhn*xkk5~)ltd&+LPtl3r7n1#BvS1-Vz=D5m_+IsBCOJ~rU=vzRqWWL
z?pF0kQ2H8HtYs>Rq|<3oO5t=mEm?ebcYpVX_lJjva5|lruA85qSC*HT4f}3J$mjEz
znwrA&^z?5omuv8RJ-oNKhio=$$)9n0dRiTUc4o6mSXfv<KA$(8s3@iQ^yw3(rl#Jy
zTrOK=OeIbl=Ad_NZ4Hq~#8i!}D}&L|QFy&x<tBc2!w~56`4peehuem`d1B59Y=0ay
zj0+cwMeOhIE21cxZW#Feenk{Tm>t_R1ZtXw2M-?9oCG``kFvM7cXyMBD2jOV<_+TU
zxM?d=RTaTtuz6j$8bTOjc=__Bf?EjNlgRP$@mX1DB$97Ryx$57Tv=Jc)2C0BnVA{G
za)@W)E8KHqV*|6Zvs?$>Ca9`vS$`|b)U6$YAlTkR%VaW0rBX_3Yim#tgrBUQ-{o=*
zE-fut_DF`Qj<h66w)gB3i3FZKdxl4k9=#Vu@x9ga9~>MY8jV`(ss;)05`k`6Mkbv;
zyL-ScB4e=_VzJn*2?s_5Ui$XmR4T0B-dpdZ%|?SD2+%YQrBVrP2KP6L27jg13V?A!
z$en$}K~EmVViBS!B9l&sO=V%XETd2;)a7))k;$W!A)C#be^LnmJl)-)QmF(@RnP97
zZgz{*Px4e%h2U`DzY64CNuW+5V+@6SzUd!(V2ptf0zwGd+S>m}CKDgP!NI}7!NI}7
f!NI}NaQGjaHRL{oIduI1015yANkvXXu0mjf!Q8JD

delta 1596
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

diff --git a/astrid/res/drawable-hdpi/header_tasks_normal.png b/astrid/res/drawable-hdpi/header_tasks_normal.png
index 9587b3d659da591627aeaa8024cc2a2028b292da..8aab73116655f7b8d369ecf2e7b80fb366658c19 100644
GIT binary patch
delta 2442
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
IM6N<$f^3MRv;Y7A

delta 2262
zcmV;{2r2i(6Oj^-Hwpd#o&W|Asb!3jKp=kv1sW!A)F&4J00@yuL_t(|+U;CROcUQ4
z|DEZ~w4Iq!S_%T{y+VbxJ2x)OjrT6x7!wytR4lqPa?QOaiY9Ip#kkYR#zYJ?#%KZ>
zS1w(dK;mP?0*#LZ3#Fx{9g6L|?xJ?2bc*fFl=|oPOHN=Wb56hW>-Rq2l>GZY|J8r8
zKeC`G3Lpdx+JH2z1S5KBDG5;&p=nwJAQMFY__2!B)zt<PCW&f5&;YQ$Dy(T}*uRDZ
z)>Q(vh6Gvx5YUhxwIQM@SWYI9&1Rt}3LFlHsV|I_iBSn5&@>GU!`P>m6osayCcwc|
zB7yn%(Ds;9&SGwE4w*~_6h-9&^-X_?b?w>A!omXFZZ~%9+zE})8%d!3luE=9jYi>g
zI?>V50iNgKbUHx@fvT!C0ZCO=+rZN_4WcL_kx1av$B)>tV+UBbusJp`5nDhqnM7-A
zE85!Hz;PTHhN+1JuH{?Pw6bb$W?jGE55M1!NF;*q-@oJU-95Fpfr(fYsZ@Uoot>R%
zYionk=>$bl*bGNSY|P^cAz)b+&CShV7zW?IeZ&0RH?(ixSvwn;O2n|TvV!*Zb{#xb
zRc%q(dJ!Q69LJ%vvlCyxe#MWKG@P8rehEw`m$1CNjFy%b1OfrjG!0pnw?vpy0I{j5
z2`eiraB_mZPGlvOL^7F#*Xw^pOG^uAnzq%TTcQ2?_v6&5Q{Z_XpFe-b=;$cEeECwf
zJ)|fKf*?Q?MSGn{ZgmCmcpMzZ!RPbolJ_Tow`<of9XtT&>gvLgBS$bYGE%h!s;UZ_
zruCT9HXE2oB;azn5C{a|a=Gv)Wi{u{ozuZ9(B8d!tLCpDffPmkOagyw^1`V^9EzgA
z=kt{XuUcliy1Gg>T?s{_QADFr{rcFkW9aVgE_v?Fn>SDt#gqj8GE16u8>q+<(&;oj
z9uGK<%ipV#u>$ctkG{S>95`?Qf*_b$<I<%|n4g~q0CabEqpz>e@VUp2ADfB_2q9(n
zXUYaHF3f|bX$XP<ilTokfp_!fO$38M)2cc-If)M+KIqry&!0DZ?$M)1`1tXoX-}+a
znxS*7T7?s_MM#o_mX;Ph)-y|o4jr-t-u(PL!r`#a!|~(C4cGhh=@Y`?u%%F@yb4$0
zM6wwXq9{TT1aKT@*=Za;d|3Zq6h%x-OcY5|B?*5zody5|gF%0sIB~-8x!bpITl%64
zDx3$=LNOs8kAq<tcsw3Z6lFQfSZniMy?TZ5@p02@UAS<;@c#JtxM|g0>kP{YOT{)Y
z9-W7xD0+TqcZw#8qUkmJ`}?tb_wJJW@87@2!-o%T$wtb7Sdk4}71Iz!5nitsZnwK)
z)vYGMH){@p!61M7`}+;QkdcuQ%W-KT4*bQRi9k9YkAr1dJ!Gj=QmSFT;N=R`-rf#D
z5PqwE7cX8kygxQJhDao0i*~Gy1FH_C7w02T6a`+dSI={6L2CgV8XCgEg9iZsv$L}p
z92_*vLqnkudU{Ihbno81!_%ivZRM}vMAl<PX~;{U(a3+KQxHWFJkP`Ba+MfVtHTJy
zef#$5-~m8SPY>?gxdWc(i{=J{K@1EGlvak)X$%h!>(7NkA?(?+$1<P4{uU2vqlt@)
zi*P!f;Ca3%7ODk+g?mQMU_FRD&*Spt%Z8Hj;K2h#A`yM9fq?<bd~USwvUT=oWDWq}
z@p#~HICOtIQ0XXq@J7Q(g<rpZZOBh=Z!hlNy$g=x5DJCR+uK|6%-gqb@#M)9ef<K+
z)$(q%m-RMUSK*)R7Y%VaflMX?K@h;Q>~CWtI|>N}nw_1+wQJYPf;c`tj-yA98mjKv
zd8bdGHU!y99B71<p%;$DVqh2sEXzXEG}F0mwM>5&KIi4jm(Vl~SFc_zd9I_Q!*Krn
z`}Z+7H>W>y=FFKQFKTrUzofAOFI+gJ&gF8OR+^V2si@8F*|TTJ<#M=w{rYd`PESu`
zY-~)w_WS+CDQGrpxrI+vRpfFxqd2fs{W^B+#NvDe*=!aJ!`OP_Rfz-^Xkuals;c6~
zjT?XE>yoJyhK7cU=B~F@Rwb}F7p|}#*xI%Y(S>~aW@p<(wVBI{7cW2v!SL{~;hfRY
zQA8q<qPgqWA%s{Kf^ut6<zhgM<oiPuMXCD<+w<qoaplUDlKWFrQ<ln9<}{^vY?z5S
zIUep@4w*~_gb+9!j=F+aNZp#6nlLprg~5Np!8&kKfekDwIeD8QNfIPU0wHA6nuN-M
zSOBtKv>vO9(C`IXEtT%KGEtSLGd`aWs;WYgq?$0|@px=oYy0-?HI=}%qvDD*p&1B*
zfK)04LI`NudS_fJmC83V0yuf{q@Gb&rS+x#>FMd30b13m9P8%5$+B%uB^(ap?Ad>_
z`gH+BJ85!qvi>%3EpeVEuq+Enk}TH-!{IPyW@c(89WygCxOMB+pJ4;n4zJG#ilQJ%
zlBJS)I-N!+6vDlG_mE1ZY}-^SmBQrYBtoH(Ehb?j8%X}~&wpuVnAc<pOG`_jX?oK#
zm3oq@s`=*8oqscL1B=K(!{hNl6h(i%@#g=5EO#apRc%}@xMUgGY_{$}b{#VjYc0NR
zL4YjFkR%B#%Wg{Lrd}$XKi-5jFKm=tdz*a#@UvdFHA$9b{a~#aKpPH+WL1UV?}wr&
z$Y!%!((cK!3_%c#4wZ^){AP#z^WBPqI&US)X0vcO93V7ZvhVWsKodhH6nuX^A9A_e
zmXSnBlJboO{uaYM+yAnm!+}5`fLJUBRaL>VEGUYy-MOr9__n(@Thlb;ayh7~3SS^l
z7NeTHY$yY0-L?(s<>kM$V__HuZo#u5J~eyYRgz`6cpk2wP2;M?S|U}qKwbMyH3qeL
z-L*vJD2GLr`ZJ}Jt_0-<Z6rd0jaUAynU)3wmL>4dwJ(1O0BilD6AcM$(8d4~()iUo
kO90A}1bK@k|C>qw1He=@j)2VMqW}N^07*qoM6N<$g1wPQ3jhEB

diff --git a/astrid/res/drawable-hdpi/header_tasks_pressed.png b/astrid/res/drawable-hdpi/header_tasks_pressed.png
index e4626538329c4540a44aecab05abfa8c119c59c1..3e5dcedbb89ec45f8d88acd4a5cc1a6c192c023a 100644
GIT binary patch
delta 2789
zcmV<B3L5qH6`U53Hwpg${{a7>y{D6rKp=k!11}`i3?SkF01BK*L_t(|+U;CxY+S_^
z{^s7h@3p;l{Mguu?ZkEx(}n_u0;M3)0<EAaLKO)FLXjw>0iixXYC*J!{@@|hAEkm2
zDiLVPBOo9^3q@@u5NQd-knj${1mZY${I)l1@8izQ>5sj;-rak5?Yq0i)ZHT;d+&ej
z%(*k)oO9-!xp$WR?3Xto7L7qs6o4_5DGw2uFw(}xCJ+vXK}2PM3Lq^SjUW<<l#wWq
zlrjWm02kJTiBR@`Wer?V4WzOL76TwaNN|~o@PYGp11^>8`UfVq@z@lI0g9s87m^md
zG7!L$-iHB1U`zp16sW2rt6j3*+y{S1Nc6G3u41!>*h90m)#eL0BB1y1F{%jEVQFwV
zoNf<@2vUf`g)*dOn~;tRfk2Rgr>-&(u{l><2#gF4ZF9SnZT{L8XncfyX+Dqu3>=%H
zs;U}%<May=sBVDU>xaYPLgHQ$tYFzJ6Oj~{1R{W>NG~p!BngB=;~4Dk!T5jBL3k@F
zx;4g6op&Ed0FDhsskv<}npd6(pFd!j6-%>1R)qBQ_B5lEmi3CcAHnOdL1mx;$Et$p
zIk2azwpy8AA4p&r9FEh9Ri~k;<pj7~J_rE_!>qFGaDiPv%P~2bbrgpe^-ZfG0UYjm
zhXQ`i=0yVu3XTnPYHd3i!DW9ZKvmt~T;y|PUjYDVZhc`YYU)}MnjAxDTBi!u%K%xr
zMT8VLjt+#WKDYu)mUaM&194qsFP;lRXLhZ?h97pp>v7^p|2Veqd;@(06ZQZEK+sT8
z6+|f91E{ieiwHsK>Kll32P*3kT>dpEsvEj4@KvDZ#%ioLzypBgjn#j+=)AAvj}O0Q
zA3!2#4j(kl1(H-cAJ{+P?Dl#TENwjr4p(I!v;Fevn#<3G&j2q;U2B_-KF%FL#+ZSR
z232)}L<xN$lRARUXTa$RK<CmF2im39Wi{}6ownNzkA^Wk8ctnb`h%0vvTTW|-dp>>
zKrAk@A_B7PYqAbA{_1~{Ku}Fs73>2K4@hci>4e8$2a*gDvLHELj}sf#oq}`ES_Pli
zRgjF|-uqV!4u=wxuzU&DuRF!E-p&`^fs}>xlR*js5i3m~Jus$GWpyKbRZZXm;HFSz
zZshYiamP&;VP#8g!KV8BEAL_7hkdE*8-9F_WxdCDb>rZnp_G4FX8SlR(@ppGah-$f
z91f!5OjwWtFej?(+Mqbx#*DHYfp7k0c-{GHivn+OIE2TZ+Y4zp_KlaEYANrt!y|a?
z*}Xa9zFdK~H07q!qP_+jiwFTYGN{m!h88e~5AirR<gr<@25Y+bf)i7p!&5Ol`|`VZ
z_oJh>034r4JkNh=YpKN*mz-u<@7@RgiFjPhlHtHI(@7}~m*8B2lp;10`bI0r>+{1~
z*$9vdDQK3AJ^#%3eKS7q@2`G@N1xhLur}Vj<-3;Uk3Rh-KK*>CfRr)I@`M0MY1)FG
zvk%mzvs>y>_=BBLG$(|VC?$obVg<{*di@z_Z>=+x@B4q?2)6Hhqa^*4M3BTxSk1`?
z5`f-gysNsl4Vo(euFuVH+Q~$uBnV+2!1mTUT)qAbQ~B|!DDJ%Pm4akig=11k2q6Hi
zfI#~5As@M1PIxPq0Z?*kta;gB1$7nxg7uZ~`&{Vxd^m5LTW|cHW%>3e_h4WsRDylY
zM5lyIEFyo|L!VUx<HFG`<5Td}bwa`cor~0FCR3Q{M(Hk?*-$|tCE`XV^P8W4AM4Ir
z3jp}!&>*(lvJ>H{n5oUR8^48)mG!3bx8Li<U!L1rqK#n!2oRhb+MJ1%LI$c<%*lbn
z{k+Rp-44wi0Ff~hk{~Hza!Hm(xiC0slKI%mgwKEeW?Kq809d`U0bB3f0FT>|(YCFn
z7T0b(%WS&gC~p7#-%|Cix$I1wbVAdteaXeiu}T6+k_jUvxrkVC|A;~kcMV+rr65uu
zWV&$5`fs1JXIcn}juqy`V0Bvqw%vU>yatF~w*$BT;zCP}d2q*W^bJfv2#NOAT5P`Z
z+jD=K%-l>6QbHPFW@Dt}@?~6V-La^Ix3UFHaY6_IAtZ<-q)akpeNJaND`x{JrNqB>
ze_{#Dn)U|#>E4a-c^tUz%CoShy}?vx@BYKs@ywek`FGrOk+Fhi-8%~etG*@5jqk*a
z)n$`116d{?>PMHmVtLARlQ$Crsb?EA9WZ~-jFiY=vf%6mgd}j_(?Q&J&x<)g4C1M6
zKf$ISoo@Or6prGydtOY*{^_Q(v8Fwkke$_+?8(mVSF+B`IAt1unQU5x2@FR@J;b0u
z^E7~S0%OA1wJ>%s(!vx*iKIs<a`RM50ym!6J@e8&2q|&bEf<^WH3b8f?eE|I8hU^G
z#{dA0!75yzmJ=sjPhnea$?ZSl0)orgS78Q1B+9_40>`I07>guOBD;y2J&MM3OoV1$
zvwP&JJ(!Nf@rU1CI&0hibRWWf55Jna?(7Jfg7kFR_BM?Z<CG!>JrV~3G<zn}(HLeQ
z91YO%&^R<_MM4BC;LbKeLY+%YNA-V<vPYhN6LDQ&>s^=SY&Q{#VDqn@$Y>kO%6nsR
zVUledNTEZ-xm6}&wfjZrY#PVMeJUW`P_zQ}>1+bd7@%0hjZZ%RHW*`g;LZ(}?e4k%
zALtvH$Y`4_CYNkmrp&D4S|wKus8X1<1;-)u5Qs#H4b~n#v8x-`-@4OOzWaZz&+y=m
z*T2-hnBqXI6*$Qrb%Hfkk3+;J3=py4AWj;-Z1-EA;ffm{S%99HR^j}+F*Tl1HaJ;9
zJRX9>Rkh%n_{6U61)a!jtmgEBWoPgU#$*J7M^Pq|56qp)rAO>*f=4z>Jp?J@^U{&3
z3U|q5H8<7Fs|KdCHrqm)jDvp^#vfYU(0kp%LA8sy0$@t<Z^liABB-kL006dJl?Z$%
zj~B1yTQ;4YasBVThvp5?IqgU%9~-GGeyZO+O;frPio*}aihIR+>yFp)>l-eZ8TeJ_
zlzf1XmuOq7C?A-<Y%B{LVGI$FEZ&s2{`qyh|MAgz(~kE)K8joJexZNFD{v;MD^|84
z7K_;u6Yzuw#*VwzF~tSO)PlPci*r2l@_xkP9BbD!!tHXDWSEno2%dduKd!m?F@%ms
zOQd-mB&Ja7pS&YOxxRD$1qg-gZ+&y=K+i}ksm>ZO#ev06QbZwQL+A|lGTT1Tic}Vd
z$|R&7hUy9|XneT9abSP$Oe7bR@xQ(HQwAA<<o{2H6*IBOnG5G*q<!wF>tV!05Mq%B
z*(9MTDu@6{N_s9_JayC_WE39<EmjbT0Mg-bIgO}9rkQY_OvDa%)E;DdbPOc*MTegx
z0mvAZ`unUND%tmexp;NG0V2soq<jPt(@+%&Cni}*d|*Cq4)lLQkBmU3G?D!eyFCJl
z2#AN#Qgwh?jkn~74c%Ipt*ZSH2S?VBqWPh!9zaoTy`@k{W<Z3JjzbC^#HYbn4DCxk
z$#>LiehwRUEIGiYc?}JQo4_TIdMH)^jx6(qk<{n(BZy#BvPoh991g%+=|r8npXI}6
zUXQzawNbVrFuGBwqZ^GdzsFq{J88Lg8Ok(Q4J;q|FN(@PI#Ij^mVIE6KCt|w6J-rt
rNB|it|LR>)0CHUi*Yz?I1=4>3!2!)fd~qeL00000NkvXXu0mjfuz5cI

delta 2751
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
FV1mi&PkI0V

diff --git a/astrid/res/drawable/edit_titlebar_white.9.png b/astrid/res/drawable/edit_titlebar_white.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6f960f3ab02037ffa46cb2bbbe5839e0c024e24
GIT binary patch
literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y=!2%?2>*@RfQjEnx?oJHr&dIz4a+s35-CY>|
zxA&jf59DzcctjR6FmMZlFeAgPITAoY_7YEDSN7W+oXn<16TjwX0EP5DT^vI=uB)Ed
z$jhL}!(vdJ#C$6L;r65=u4f#sTHb9+IW6mVc5o$yJkJR$Zjk4{H<NY7k-Jl)fm#_n
MUHx3vIVCg!06vT^{r~^~

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/filter_btn_background.9.png b/astrid/res/drawable/filter_btn_background.9.png
index c95ed57d51d597f1aa21ae7ebc940cff13d20b13..e3b3d5cf9a70da676f004057489763238017c12b 100644
GIT binary patch
delta 787
zcmV+u1MK{>2B`*+BYyw^b5ch_0Itp)=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L
z01FcU01FcV0GgZ_00007bV*G`2iph<1PTZWXo_P100OB=L_t(o!|j(%PvbBUhM&ZC
z?1qp-KO~A&iQlyM{<{7m&Kx;{KqU#ym+d{Ebkh=+vdwa0q<=_};`qrsGnp9&oNoRv
z&w|fh9$XMb(Z)FkfO8J-{ik0Mh9S;5j4{-8jkR{&e=d(-Fve`^y2g7?7=|dN2!enh
z82)JQJ>Gkqb69JsstPG3*4mF1rD?i(d3ga~KA)2$3C0+N5QJg)p&Dx~bzPHX84nK+
zIOh;T9H<KVN`K0-1YosVaeaNwWHR{_(y4OJQB@UBPfy(6-;?J#^ZA_T=Vz?7YY8BP
z*i0r9%Ch9<=7!a3MI6U`#e@(jrO;ZVwdU^bj>pGGE-x?1vg|EJT5F1;V6j-RTrSaC
zzw_}|fV0^QfZN;KLr@e&D5aQArx;`CGVUCU<CrLl5Pw1dcnJ^$0ZOSZfFEYqsn%tw
z)_Nab*_Yg9(7B-Q|LgWV0D14R*3!1^D2lAL2O*Hh|AV#m({w(?y1fP!Ip_A*e^b;4
zjbX=oy^B%PG^50*ZQEhj_5J!^lc8UM#{hM%>spK)D);AFr>Nh@-o<Dv(D6QUC{s@9
zs9yzz-G405cU^aX?lq{WZClE+{O9&C)C`Y70k9b}8HPY1-()|aAJ7kIM9{f~^h=;I
zD)(PYP+ixgX}a%8W5AlG=>vlhpsK3<g0d`Wn&vE+_nxL{SS%J4Me#>b+qUaG&$+s~
zqEpzm?LPsWa}-5^loDeMudlCfBX@7nFChfe>3@_g%l1RcDT7LXoUW>hIF4B^mu$CN
zilSJ*J6bBGHc66@BnerTQ541A*Qc~^V+^y|3@Ihs?UvncM_HEZ!Be?XYNNF#O;au|
zE)YVTq{=x*(=_aMJMuiIX_`Ic!{fhFY7<2fQp%GD{w_Xk+v1!%fPAa{2E+jk0A(tE
RF$@3z002ovPDHLkV1mMdavuNy

delta 797
zcmV+&1LFLt2D1i`BYy(=Nkl<Zc-rlk*H3Ce5XN~HAB@3{3Mv*5LBVb;V4<lf!KgtH
z6uXB1|7C7|lUU9@2!<uOxrrzFLOHYh&CE_)hvVmuG(c;Q&*zh|u`z|m<B`$P(WdZv
zz4|#lJ+0rHl1xoaeQeHx$;nCKKQ^cb-XSwSJ}z#zTi2p!Lw}OFxj7je9F*SPURhjR
zlz2QYnM_8q*{qzNo_>qt<6}uA60)+gqC|atecxM!X2Zk7GBh+KTU%RFEEeVA;Xz(r
zUgYiVts!1tU*+lPNh+0!93CFZ?Ch+#TrO4CLdcJWg$1<)E2`D1)M~Ys@cjHNXJ=;;
z2n5tS!C>%{Xn$sAM*X_9v?SNp*Q#Nwz(Tx`&*$}=H#RmtiNfKqghC-nr_=KI_^4Xp
zidMn;a=ENQvc0|inF6>CYdF-qyF0nRzc&JB%Xtx8u~^JXw6?Y;M@L60aC38GgxlL&
zJ%ai9c{|bS>Z-bqXe*UUMu4PHDClw6h{yqQ;qvlQg?~(Nb#)~d7Z)1lHlpR_W!c-?
zlk@X)V?aXG5zRItf`J@Dz!c<BE|=5tWFsPr2}R1y$;pWkC`(j`iHV8&L?jor4IvW{
zy{S}6%a4sH8jWg*CzDAPG6B&`U{M)%c6O{pkw`=%Z-0MZ4h{~C0Lkv|u8fR~*ojCk
z+=qZEh<{#OMt`bHgjERe(gf^5U{Srl5^0N|utJ7_DcF2-b5jNe2JA#+F*5>%upOWe
zIh{_s>u6MjBZTb$`*n15{1W{V{Sy7xMD+J|6LofWT8Sv8TtR452(*I;#k;z?tVC?i
zT-V**tpkPM?>8o5Ug+=d*PF@5>`m3CyP^SC7k>tR6EfEJ^z`UtMUS)GkFbiF0l(6)
z7|>fe7hJ}Al&3f0Aqx>NI4dS0wBgnU84J;{5s+a++yx20nGqR@>)!gfheC#5>9{P!
zl|RAzMVZbD3H#Wr`I`(kU>T#=Pv<;FEQXTx^>yv84N1O|;Sx+oGxDq%@Bl6R-Hnca
b^%ndAYY;#)3Y`LS00000NkvXXu0mjfM~8;|

diff --git a/astrid/res/drawable/filter_count.xml b/astrid/res/drawable/filter_count.xml
index 9801e9848..5f837e693 100644
--- a/astrid/res/drawable/filter_count.xml
+++ b/astrid/res/drawable/filter_count.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
   <solid
-    android:color="#ff282828" />
+    android:color="#aa282828" />
   <corners
     android:bottomRightRadius="4dp"
     android:bottomLeftRadius="4dp"
diff --git a/astrid/res/drawable/task_indicator_0.9.png b/astrid/res/drawable/task_indicator_0.9.png
index de11f80942616b8211efee2da37ab4a071b71c61..a0ee5a1daa05744a682c623bbdda4d6d02074008 100644
GIT binary patch
delta 175
zcmV;g08sz!0rLTnF%Je}OGiWi{{a60|De66laVeTe+UT!CnEH=58nU)0CP!1K~y-)
z?UTC+fItvL-|97>Wn3eIxq%hfld+&+DA<YR=o<I|4dhG?k$d6pEHex&Jfi>xV9N3Z
zkYgip3{cr|5I_xpP15WACOR<y%=4pXgae*M=01?V6_0jWl)9H$N!QdNcnJP7xPI)V
d{w;E16$OHTBVZuBJi-6~002ovPDHLkV1gO(Nl^d*

delta 171
zcmey&_?B^k;Y4SddNw`|A&$j;xor##4E3Hajv*GOlM@c`|1&lK0wW-fDgFM7JsH9^
zHddKuajf9e-Do#9wzmH|JU|fD<h0_~%$brEk&zE$#MpqKZGXMto1fqR+s`?B#DQhO
zW+kx_#$#7cOTK)u?Ek`v|Npxm`BN?={NMi7hro8l$qzsLZ`SeV&3AQSWZ-HtFnrw0
RQvq}fgQu&X%Q~loCIH>HM9BaE

diff --git a/astrid/res/drawable/task_indicator_1.9.png b/astrid/res/drawable/task_indicator_1.9.png
index 107680b90773eaa9662682643b654b57e35cb453..84af310ad320bb3d025d722f99f99fb9f63e596f 100644
GIT binary patch
delta 160
zcmV;R0AK&s0ptOYF%Je}OGiWi{{a60|De66laVeTe+UT!Ck!ZH0uTTI0Axu-K~y-)
z?a;vqgFp~K(Kovi(o?J;C%dqxRNyf^NP5a4FkS<Kc#;+T$Kf;c8MaC2;5+qM?+F6+
zR$z?h9LNGSVsl-wgBGQ3H5fi|;JM%Xk$)e5UE$4!w<_gX!%r#gVgcLn8xD;^Vz~eS
O002ov22Mn-LSTX(Y(iuJ

delta 148
zcmaFDc#Uy_;Y4SddNw`|F_o`YM-mwr7&1Iv978NlCnp@>|7UCf1V%voCnE9l{F#sK
znSB~&_I4gz`A6vRzti%Pk`faCj157GjEx?d_H{OL7)Xe2OyFRVNnNsd_P?AB|Nhs{
zep~Mz`|tl^KKUzr@@u;O@rSnad%C(XGBDjyna-P7xtM{0i-Ez@)z4*}Q$iB}d!abE

diff --git a/astrid/res/drawable/task_indicator_2.9.png b/astrid/res/drawable/task_indicator_2.9.png
index 45eb1dcd61ba0480230dab331a671750392e60ab..926c92d84947dcced3941bfd4f40f27e503b95b8 100644
GIT binary patch
delta 151
zcmX@bc!zO<AwOG^x4R3&e-K=-clqRrdh)d#oXlz#0_TrEVPIg0@pN$vu{fQaaDe}x
zv4MfX1|T-z(AoL(KeMua$ef9djlFXl8ygkpDu#3bIS=iHnFSM0XeAvK=$w|aWcloA
zcK^?B_;t6w?dtnWZf%F%MFS%*{=cZOV6oC71_r~`Vh^(#=dJ+S!{F)a=d#Wzp$P!#
C0Y2#f

delta 135
zcmcb^c#3g?;Y4SdS~floaejxnJP8a83^ATAjv*GOlM@c`|1&lK0wW;i(AoL(KeMua
z$ef9djlFXl7apA6`0!Pr8yj2Oe;*!~2F2AKtj;P?lP1o~i~9A){_v~v|B_qQ{_p2$
n@7G$iY0>}1jt=gwE{qIOy5i2FH@Ck8+QZ=K>gTe~DWM4fMjbS>

diff --git a/astrid/res/drawable/task_indicator_3.9.png b/astrid/res/drawable/task_indicator_3.9.png
index 76a6550a171c52152da7b0497039b0ad65cc72c3..e639f746b9a8301ad3ac26517db5299dc1a12651 100644
GIT binary patch
delta 142
zcmV;90CE4w0n-7HF%Je}OGiWi{{a60|De66laVeTbO;FpCM9#pt33b!08>dsK~y-)
z?U1nwfG`XNuhJ}jW|n-8a|HiXcy1yN(y3DDjmg1-gKq>-0k%A}a^4>^0|<97fEF4U
wR;uqqM3jzmnW;zdedw4|`a{x8&{1mQ0@nNv>4(HW?f?J)07*qoM6N<$g00UwzyJUM

delta 133
zcmV;00DAw^0muQ6F_A+Ydj<{&7b**x*e3u009r{zK~y-)?U1nzz#tF<k0>;mgw1{z
zn$%x}xfmvr=~ASKsEClb(!Rnnd?SDWaQdZ#`)Oi~<eaIs20$AfOe^j0z|6wHP42Ez
nic(6N{>&x)A!%JOQ0k%qX<8GPepy-I00000NkvXXu0mjfTc9~8

diff --git a/astrid/res/layout/filter_adapter_row.xml b/astrid/res/layout/filter_adapter_row.xml
index 5f044b4c2..b6e63fc56 100644
--- a/astrid/res/layout/filter_adapter_row.xml
+++ b/astrid/res/layout/filter_adapter_row.xml
@@ -77,6 +77,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="55dp"
         android:layout_marginTop="29dp"
+        style="@style/TextAppearance.TAd_ItemDetails"
         android:paddingRight="30dp"
         android:gravity="center_vertical"
         android:visibility="gone"/>
diff --git a/astrid/res/layout/filter_list_activity.xml b/astrid/res/layout/filter_list_activity.xml
index 70bdfdd82..200b7ba1d 100644
--- a/astrid/res/layout/filter_list_activity.xml
+++ b/astrid/res/layout/filter_list_activity.xml
@@ -3,7 +3,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
-    android:background="@drawable/background_gradient"
+    style="@style/Content"
     android:orientation="vertical">
 
     <!-- Header -->
@@ -12,7 +12,7 @@
         android:layout_height="43dip"
         android:layout_weight="1"
         android:orientation="horizontal"
-        android:background="@drawable/header_background">
+        style="@style/Header">
     
         <!-- Filters Button -->
         <ImageView android:id="@+id/back"
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index a2ad2716a..f5521c168 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -9,6 +9,8 @@
   <attr name="asDueDateColor" format="color"/>
   <attr name="asDueDateOverdueColor" format="color"/>
   <attr name="asDueDateCompletedColor" format="color"/>
+  <attr name="asFilterHeaderColor" format="color"/>
+  <attr name="asFilterHeaderBackground" format="reference"/>
 
   <declare-styleable name="ContactsAutoComplete">
     <attr name="allowMultiple" format="boolean"/>
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 5dfb3a10b..d607b494f 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -13,6 +13,8 @@
         <item name="asDueDateColor">#ff7777aa</item>
         <item name="asDueDateOverdueColor">#ffee5555</item>
         <item name="asDueDateCompletedColor">#ff777777</item>
+        <item name="asFilterHeaderColor">#ffcccccc</item>
+        <item name="asFilterHeaderBackground">@drawable/edit_titlebar</item>
     </style>
     
     <style name="Theme.Transparent">
@@ -25,9 +27,11 @@
         <item name="asTextColor">#ff000000</item>
         <item name="asDetailsColor">#ff7777aa</item>
         <item name="asDueDateColor">#ff000000</item>
+        <item name="asFilterHeaderColor">#ffffff</item>
+        <item name="asFilterHeaderBackground">@drawable/edit_titlebar_white</item>
     </style>
     
-    <!--================================================== Stuff == -->
+    <!--================================================== General == -->
 
     <style name="Content">
         <item name="android:background">?attr/asContentBackground</item>
@@ -35,6 +39,7 @@
     
     <style name="Header">
         <item name="android:background">?attr/asHeaderBackground</item>
+        <item name="android:textColor">?attr/asTextColor</item>    
     </style>
     
     <style name="TextAppearance" parent="android:TextAppearance">
@@ -71,6 +76,7 @@
     <style name="TextAppearance.TLA_Header">
         <item name="android:textSize">18sp</item>
         <item name="android:gravity">center</item>
+        <item name="android:textColor">#ffffff</item>        
     </style>
     
     <style name="TextAppearance.TLA_Reminder">
@@ -123,15 +129,11 @@
     <style name="TextAppearance.FLA_Filter">
         <item name="android:textSize">18sp</item>
         <item name="android:textStyle">bold</item>
+        <item name="android:textColor">?attr/asTextColor</item>
     </style>
     
     <style name="TextAppearance.FLA_Header" parent="TextAppearance.FLA_Filter">
-        <item name="android:textColor">#ffcccccc</item>
-        <item name="android:textStyle"></item>
-    </style>
-    
-    <style name="TextAppearance.FLA_Category" parent="TextAppearance.FLA_Filter">
-        <item name="android:textColor">#ffdddddd</item>
+        <item name="android:textColor">?attr/asFilterHeaderColor</item>
         <item name="android:textStyle"></item>
     </style>
 
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index 406b94fae..5eec95ba2 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -102,9 +102,9 @@ public class FilterListActivity extends ExpandableListActivity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
         new StartupService().onStartupApplication(this);
+        ThemeService.applyTheme(this);
 
         setContentView(R.layout.filter_list_activity);
-        ThemeService.applyTheme(this);
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         findViewById(R.id.back).setOnClickListener(new OnClickListener() {
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index 7a2c8e1a7..94681ca49 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -16,7 +16,9 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.text.TextUtils;
@@ -51,7 +53,6 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     // --- style constants
 
     public int filterStyle = R.style.TextAppearance_FLA_Filter;
-    public int categoryStyle = R.style.TextAppearance_FLA_Category;
     public int headerStyle = R.style.TextAppearance_FLA_Header;
 
     // --- instance variables
@@ -91,6 +92,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     // if new filters are queued (obviously it cannot be garbage collected if it is possible for new filters to
     // be added).
     private final ThreadPoolExecutor filterExecutor = new ThreadPoolExecutor(0, 1, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
+    private final Drawable headerBackground;
 
     public FilterAdapter(Activity activity, ExpandableListView listView,
             int rowLayout, boolean skipIntentFilters) {
@@ -110,6 +112,9 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
         listView.setGroupIndicator(
                 activity.getResources().getDrawable(R.drawable.expander_group));
+
+        TypedArray a = activity.obtainStyledAttributes(new int[] { R.attr.asFilterHeaderBackground });
+        headerBackground = a.getDrawable(0);
     }
 
     private void offerFilter(final Filter filter) {
@@ -416,7 +421,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
 
         if(viewHolder.item instanceof FilterListHeader || viewHolder.item instanceof FilterCategory) {
             viewHolder.name.setTextAppearance(activity, headerStyle);
-            viewHolder.view.setBackgroundResource(R.drawable.edit_titlebar);
+            viewHolder.view.setBackgroundDrawable(headerBackground);
             viewHolder.view.setPadding((int) (7 * metrics.density), 5, 0, 5);
             viewHolder.view.getLayoutParams().height = (int) (40 * metrics.density);
         } else {
@@ -487,6 +492,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
         add.setTextColor(Color.WHITE);
         add.setShadowLayer(1, 1, 1, Color.BLACK);
         add.setText(filter.label);
+        add.setFocusable(false);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
                 (int)(32 * metrics.density));
         lp.rightMargin = (int) (4 * metrics.density);