From bc659fd48be7bc84111f48717d25cbfdd701074c Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 9 Feb 2012 19:17:55 -0800
Subject: [PATCH] Unread comment count in header for tags

---
 .../astrid/actfm/TagUpdatesFragment.java      |  10 ++++++++-
 .../todoroo/astrid/actfm/TagViewFragment.java |  17 ++++++++++++++++
 astrid/res/drawable/comment_blue_filled.xml   |   6 ++++++
 .../drawable/comment_blue_filled_normal.png   | Bin 0 -> 3519 bytes
 .../drawable/comment_blue_filled_pressed.png  | Bin 0 -> 3492 bytes
 .../res/drawable/comment_dark_blue_filled.xml |   6 ++++++
 .../comment_dark_blue_filled_normal.png       | Bin 0 -> 3503 bytes
 .../comment_dark_blue_filled_pressed.png      | Bin 0 -> 3483 bytes
 astrid/res/drawable/comment_red_filled.xml    |   6 ++++++
 .../drawable/comment_red_filled_normal.png    | Bin 0 -> 3498 bytes
 .../drawable/comment_red_filled_pressed.png   | Bin 0 -> 3525 bytes
 astrid/res/layout/header_nav_views.xml        |   8 ++++----
 astrid/res/values/attrs.xml                   |   3 ++-
 astrid/res/values/styles.xml                  |   3 +++
 .../astrid/activity/TaskListActivity.java     |  19 ++++++++++++++++--
 .../astrid/service/TagDataService.java        |  12 +++++++----
 16 files changed, 78 insertions(+), 12 deletions(-)
 create mode 100644 astrid/res/drawable/comment_blue_filled.xml
 create mode 100644 astrid/res/drawable/comment_blue_filled_normal.png
 create mode 100644 astrid/res/drawable/comment_blue_filled_pressed.png
 create mode 100644 astrid/res/drawable/comment_dark_blue_filled.xml
 create mode 100644 astrid/res/drawable/comment_dark_blue_filled_normal.png
 create mode 100644 astrid/res/drawable/comment_dark_blue_filled_pressed.png
 create mode 100644 astrid/res/drawable/comment_red_filled.xml
 create mode 100644 astrid/res/drawable/comment_red_filled_normal.png
 create mode 100644 astrid/res/drawable/comment_red_filled_pressed.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index df6e2b929..53fd2f228 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -29,6 +29,7 @@ import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmCameraModule.CameraResultCallback;
 import com.todoroo.astrid.actfm.ActFmCameraModule.ClearImageCallback;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
@@ -55,7 +56,10 @@ public class TagUpdatesFragment extends ListFragment {
 
     private Bitmap picture = null;
 
-    public static final String TAG_UPDATES_FRAGMENT = "tagupdates_fragment";
+    public static final String TAG_UPDATES_FRAGMENT = "tagupdates_fragment"; //$NON-NLS-1$
+
+    //Append tag data remote id to this preference
+    public static final String UPDATES_LAST_VIEWED = "updates_last_viewed_"; //$NON-NLS-1$
 
     private static final int MENU_REFRESH_ID = Menu.FIRST;
 
@@ -192,6 +196,10 @@ public class TagUpdatesFragment extends ListFragment {
             cursor.requery();
             getActivity().startManagingCursor(cursor);
         }
+
+        if (tagData != null) {
+            Preferences.setLong(UPDATES_LAST_VIEWED + tagData.getValue(TagData.REMOTE_ID), DateUtilities.now());
+        }
     }
 
     @Override
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
index b07a9fb32..afed24c29 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@@ -40,6 +40,7 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.actfm.sync.ActFmSyncService;
+import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.activity.TaskListFragment;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.api.Filter;
@@ -47,6 +48,7 @@ import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
 import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
+import com.todoroo.astrid.data.Update;
 import com.todoroo.astrid.helper.ProgressBarSyncResultCallback;
 import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.tags.TagFilterExposer;
@@ -224,6 +226,20 @@ public class TagViewFragment extends TaskListFragment {
             tagData.setValue(TagData.TASK_COUNT, count);
             tagDataService.save(tagData);
         }
+
+        if (tagData != null) {
+            long lastViewedComments = Preferences.getLong(TagUpdatesFragment.UPDATES_LAST_VIEWED + tagData.getValue(TagData.REMOTE_ID), 0);
+            int unreadCount = 0;
+            TodorooCursor<Update> commentCursor = tagDataService.getUpdatesWithExtraCriteria(tagData, Update.CREATION_DATE.gt(lastViewedComments));
+            try {
+                unreadCount = commentCursor.getCount();
+            } finally {
+                commentCursor.close();
+            }
+
+            TaskListActivity tla = (TaskListActivity) getActivity();
+            tla.setCommentsCount(unreadCount);
+        }
     }
 
     // --------------------------------------------------------- refresh data
@@ -247,6 +263,7 @@ public class TagViewFragment extends TaskListFragment {
             @Override
             public void run() {
                 ContextManager.getContext().sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
+                // Update comment unreadCount
             }
         }));
         Preferences.setLong(LAST_FETCH_KEY + tagData.getId(), DateUtilities.now());
diff --git a/astrid/res/drawable/comment_blue_filled.xml b/astrid/res/drawable/comment_blue_filled.xml
new file mode 100644
index 000000000..05ae784d8
--- /dev/null
+++ b/astrid/res/drawable/comment_blue_filled.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_blue_filled_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_blue_filled_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_filled_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_blue_filled_normal.png b/astrid/res/drawable/comment_blue_filled_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..1daf3a677a4c1b118e20d43b367701c098759043
GIT binary patch
literal 3519
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/comment_blue_filled_pressed.png b/astrid/res/drawable/comment_blue_filled_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..60d4eefbbc88b16af95d8f2d0708d4b932aab8cf
GIT binary patch
literal 3492
zcmai02{aU3-yejKeQTmHS*9{GX2=%VCi|Xc2+<fz&6XJ%%OGUuv6RT3t#~{VvSrJb
z7=uAXkqTMM5)IX>p7-lK=X~GyzW1Da@BjYp@BjNR=iGB{oVBG9FZVHS006*iVvMvs
z*v$^6`C*QORnE-x0N{rE8W>oc7#K)f`w_f+u^0frI4(CM!0zItSPZ>It;IS`ApZ8y
zH6L46W8N0yROo3qmw;(|3IL>vv?C&IQcDjbz_Z~+2C3Dc_**PC)ys!~$kFRW5s3^F
z&r0CT)4+9F_Keg{=(YS7`fKlX>Ua|%Wj~VrnK_Cp{74~6<n2OtY*K=^J15JLPXIP7
zV3t@@qc65=$eP6(GLeYQ65bVWY2uUqx_6qPlh^_Hk$=0<2?PgNXC^Le>`uA>#rxE?
z9dqRBt@<*bs8|dtnGS-SA`lMgqz%POAz!jE{2H5xC@o+=X>bnn>HW0AyCe;v*2GkI
zp!mY!-9|*KJUWtW60O@qcwY?+u~Y?s)25;Gq>G+d2s#anh=9Bc1k4)uUH&uzLk-Y{
z`}w;E2b`fovSqPAd6$dPN$J7~Z|QW4g@o<_B|f#JlXLKiETEI*TR(soecwqW5C?n=
zIya%Np{|63;99|>VXphxX*)ME+@iwPfJmv`&M%IkS-gNprI@-&W(>|(6yUndV%_{L
zhUN|f#6NEJ=c8Uf(G=ol+cl@?eWqf1+Qp0||Jo_o;yN>*FU;U_2;H{z_4)@7%4WKH
z8X0cjriS+lDn)iZADkn8Ju;skvn$2<-T#D`;J$2YEbR6LWPho-w0TC|rRT!2>{<HJ
zy1V)JcKJKM7f&{3#J$=T9LhkkmdG5_4Ltz>pB9wn3idoRv`*#eF=G2lOBl||%-y3$
ze5X1#n16pRCL5NFHbNpAglq;^?(I9Xsz?Ja=&~*8N-VMow;y`aF4zFzpJij!1IHe^
z?hc=g5J_P{N{fqx*A*PS9Z~77@PNa=Ku{%8m3WkV6FsY<&I!HQ?|x{S#a4+gFZ|Re
z?g3qas9VnkL~Ucp(gx2ZAKyZyNW5obHxRUzynR^CK;M{ERCl?+_JL%1^irYM;-y6}
z`B)Qx*Py<@#z%-L8pL^0iL123`H>)&y~f>2{cv)Wct_tSgt`<oqQ3nOku5}EEy}9%
z?yMk+Tjyq(V7P#w=KTaEL9u6s`l%FIE<u@!6ro~PU)@(JCyJ#S<Be0xo?jB-xNre(
zZGM~Qg_P*6x%(M~4uz^k<u;twxev~d+K+;-a&HS-7+$+i8y;K)kQFt7xd~81$Aavk
z<BK(mf?MiLQI5z$bRs<YXqdUAyl4$;4X{Rnk*skG*pui{T8;Wsb6j#cp10fY(G@KG
z33sqSuuw4jxnyeO$vHCdiTY(1Ez8(5UG}riL<OQFQMdv4ROpSsdLn=K=BNJ8m|epV
z{?NlZ$@wy1;Y6;#qKx%Vdq4`)h78rs8q6qqvO?RjmR-dA;SJF!6D_2cm84v&oQ<)U
ztm>(ovNAZCRfSy8Yfy`HdY_>uzn_+q`5S$_e7?+#LYqy&Y1HXM;7=kBXGX!~(=IlY
z(pX0oyDdAHKQpUPg%sp<<IfL;-1>~;D!Xi)OYDlsb|0fhY7zF6h8lJn27xtx2^;Jm
zj6@W>W9JOs+QftRz}{fAT~xUh=3?Wh|ES@T(~>%`fpRJPkgab?Ex{+U_LOLRe6DG&
zX`X4)i|eANju%P{vn_tyLNGm;{>*ds5PK{8)+PBd)v+_>Rb%rH0v~)HGaY?3W;puh
zq4FqolrdWWFyP?~L)SOcH|pB^t1H9m6`#p`xa5AxwVX7Kn1$)_sIxSclPZorYYfSu
zobi$I4aSR+@)6CVZM*EhRts~>TMYK1z7+G>_gWYg)EF!j52B;FJJVAKA9!xTOUY;b
zzxm5GZ8t?WDF^ig*#zARS`FIS;$kX(ll^v_*}}ZYp~)e`!Ol_1QP2B1TCr24(>3~A
zbX8Jf(v?Kjqy9i`go84l(x4jtZ0j|B)$3|bUL)>)G!gU*goW~JT+rkZ)fzQ3cm-Sn
z5kosZz&_thi-8P@S&Hc=a3n~W3o+8OI<c5!=MhLGga^{BnC}Ecbzj2OEY&l8aD-g^
zYaeQF^c7*Bi#`nWW<_Nd<mHo|FRxrSTxJ?87H-g~cyD}f{S-QYk#|+<N?S+k%kPnq
zMUl@7X&xiP?eO91@y{FyJ=|!VS8jm*xj>D|8=CW5<C7guD<KnK#l=g_?wKX@7X|ig
z?rt7iNNQYa^mAEuEx{kDN7lFCZ3A2bl7l1n*!ZdZc}D5IQDqOk%NO+M-frV=penwq
zmssyFre97Gx~AyOUBN>!bHX1ku99XP>1vbpV*xMdZwR+$PKDKmrTkF+A;IFzG95l2
z{!q8K{mxCQUU31t-k2VL1TEr1hqesS*!}sJl;%y|1)ha~TM<LyL#u^5&k{Q`Zc(L@
zx%hdixWbNl2-^q@w}m&k_eEr|SAkkU{h)PZ7SiN?P?2bn@crzf%e|D|+r7r<$}5gN
zZt;v*;V%DP^t+;W*>h#$OvUL&qE^TGLiM*y(7OwP2~fpxR8H&eu28pJj+~Lua2z}i
z61T2Vn8Pu+H4<J@XI9pLU4yO(=W!A^32EyuU<+2Vjq-OCv`ueVyvftbn#;3I-LPvH
zv*XDtW0sAVv|935Oyz$$r7hp0&2~36^SYg}U@6xgqE2}e5mPfz6JJx@pL2KBMOBVl
z=q$!yGU0J^x5^}aG`tJ>*bQ;-UB<=qO?frV9pgN|JSBpA<K%`#zrqG}v(4?MbBF8j
zrGiV3p16}s7G5yzhssMTf*hBtpw8N@Jp|g#x~MweYhmD8s3I(+5$fe?mFh5j?|$`m
z=<=lm(fAA9YN`#`2UD@Hz!T~XzH6oB7E)#uIdQW}vooeMgn4}H?j4%roy*i$X|<R~
z1BF<+!+^uv@#U%M`r}|nC><s>b>eXgi4$$qmwfl!-Ib@-9*#Ek36IPkn>hnrCS5Vs
zb#+Trf75N_Bu9(jO0U(@S1+3bo2ynnPcR(H>>ZtV@Kx^Xw4gTTAV*PjJT;T5v3Ek%
zQ0+??joH*_QuMI)V`u2w(2qA`*{HN+8Vzy}f~h1{6#H+uKkMk9p@cDB_h2gsW%YMY
zu*S&7oCwR_UES`~iwXYYQF1NSd)F1mSyxmnyyWsmW9-g|+-majiSx%Owe`IvW$%Lf
z*LS2C+72X_50pu+XL0w1^DXD|bI#xKU;6m*Jp<ih7POudr%kGaJtcg?4oz+@gwS(8
z?yTqpzS-Wd<{1=EcJp*yX?jn5NNNu)c*nUXrO9!e<6MknOcU&!>l!dmEo3f!?+(MU
zr7EvkjJP`Td_VQ=vdv4v8{-C<mcHh%iw?}ng?bX6KJ7#jr`EsE8)=E(ySF0|s`9Pc
zbxB(L{F1ijC-;uXbLi=61s%+ft<a~7GG9HqqXv<iC#Q^h<*5oV9k*S|zR7rcR#~^s
znIA5D1MepT+9>-7CDC(dzq@ShGpe#LKWLlyF|vkPCr@mBa|Bj-x!rwg6GobaEaQGO
zX9fr>H?CK&pV7$-UHp1<>+@P!qE&t<+fLNx-U^Q8+QA=^i)idb0sx>Ve@+%kiOvlG
zfCcYsha#ga%r(&j9Mr>;a0LUU;D`ro06>ePd0^r&WDjWy4vQygQnW$87@7z6PZ$Q0
z{zV~Q(*~g|tfdVIei&&Ls0vgGbe>yUT3XA`(@WD9Y4~sVgOfJMhfF4F!e9Xb0nh+t
zD8bJg2G`KgfGHth2n6JS0U-tA$sQC4o^<kWk^j*_Vn}E|Un1F;fS3NM>v4tPPu2#3
zeg^tI{?5}A{W}iP-w*pMiYFR|!D4V2JedT8L*cOB;s?H3o@h;y|COs4H2GKFzvX@v
zpzq-g`v<HA``>IW*w2jqk>TIv|3VMyKhLcN``yd)+#hs!^$t3pZ-UgbqvWhkRa-u@
z7K!=HuoW!UjpgA>OGzoHAj~nCN_hDmy`*F2JQhB=DsaVb@5h6)zlV`DazYwQjtIPd
zbEm`v5|?$M^{!9C#11R&J}UeQOFTPRtl<AP;u2)|KcpwXlbkaao>(!BXo~}VOQKUn
z-ema<p8w$YU#^C-P~F6kt;E4DKfP*zLL1%Ln@xhMHFbV%tm!+hwU&WJ?{xk-zODAh
z`V$>srW3}&p3>G(zOv2Qwi2F>3e>F8%56OA@7`jv@?oPXb@FyP%EAd}lwqaN`f^tg
z`{x)Q+wHUzoOC%Nu`YJr;YjD+@(rR@X9d00NyH6Y({4GgDS=Y;o!5J-uT(8IJiVbZ
zAiNEUMI}sh+${*3{ia+2DIC!1y?PO>{73bTqK8%W-<8+vJ+lAbKK)&9yZ8(ZYO=R?
RIPd3EFu7of{7c_G;$J(|R9pZ6

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/comment_dark_blue_filled.xml b/astrid/res/drawable/comment_dark_blue_filled.xml
new file mode 100644
index 000000000..bae6b3b6a
--- /dev/null
+++ b/astrid/res/drawable/comment_dark_blue_filled.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_dark_blue_filled_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_dark_blue_filled_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_dark_blue_filled_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_dark_blue_filled_normal.png b/astrid/res/drawable/comment_dark_blue_filled_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdf70010ec12acc8ea3f61e7d3be3aca7ddfa5ee
GIT binary patch
literal 3503
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/comment_dark_blue_filled_pressed.png b/astrid/res/drawable/comment_dark_blue_filled_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..51ec8a02279b7b943a340f72152de001a4ef4b2c
GIT binary patch
literal 3483
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
NbTkd&Pt_g6{|BUJPn7@w

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/comment_red_filled.xml b/astrid/res/drawable/comment_red_filled.xml
new file mode 100644
index 000000000..09b3b392f
--- /dev/null
+++ b/astrid/res/drawable/comment_red_filled.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_red_filled_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_red_filled_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_red_filled_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_red_filled_normal.png b/astrid/res/drawable/comment_red_filled_normal.png
new file mode 100644
index 0000000000000000000000000000000000000000..fbf8f36fc04124c7d53b523ed61a66d7ff67dcb5
GIT binary patch
literal 3498
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/comment_red_filled_pressed.png b/astrid/res/drawable/comment_red_filled_pressed.png
new file mode 100644
index 0000000000000000000000000000000000000000..e36789b07963cf16d9822b3aa83ea4f8bf7975ef
GIT binary patch
literal 3525
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
MdRLH-bX}wV1?CD~LI3~&

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 9ecf1979a..704e7b5b8 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -64,12 +64,12 @@
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"/>
 	
-	<ImageButton 
+	<Button 
 	    android:id="@+id/comments"
 	    android:layout_width="51dip"
 	    android:layout_height="fill_parent"
-	    android:background="@android:color/transparent"
-	    android:src="?attr/asCommentButtonImg"
-	    android:scaleType="fitCenter"/>
+	    android:background="?attr/asCommentButtonImg"
+	    android:textColor="@android:color/white"
+	    android:paddingBottom="6dip"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/values/attrs.xml b/astrid/res/values/attrs.xml
index 1848a9e17..b5a3fc398 100644
--- a/astrid/res/values/attrs.xml
+++ b/astrid/res/values/attrs.xml
@@ -17,7 +17,7 @@
   <attr name="asFilterHeaderColor" format="color"/>
   <attr name="asFilterHeaderBackground" format="reference"/>
   <attr name="asFilterCountColor" format="color"/>
-  <attr name="asMembersHeaderBackground" format="reference"/>
+  <attr name="asMembersHeaderBackground" format="color"/>
   <attr name="asSeparatorBackground" format="color"/>
   
   <attr name="asThemeTextColor" format="color"/>
@@ -25,6 +25,7 @@
   <attr name="asAddButtonImg" format="reference" />
   <attr name="asMicButtonImg" format="reference" />
   <attr name="asCommentButtonImg" format="reference" />
+  <attr name="asFilledCommentButtonImg" format="reference" />
   <attr name="asTaskEditArrow" format="reference" />
   <attr name="asRepeatIcon" format="reference" />
   <attr name="asMainMenu" format="reference" />
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 0350c7d7b..0543f3ec9 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -22,6 +22,7 @@
         <item name="asAddButtonImg">@drawable/plus_button_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_blue</item>
         <item name="asCommentButtonImg">@drawable/comment_blue</item>
+        <item name="asFilledCommentButtonImg">@drawable/comment_blue_filled</item>
         <item name="asEditBackground">#101010</item>
         <item name="asEditRowBackground">@drawable/task_edit_background</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator_dark</item>
@@ -68,6 +69,7 @@
         <item name="asAddButtonImg">@drawable/plus_button_red</item>
         <item name="asMicButtonImg">@drawable/mic_button_red</item>
         <item name="asCommentButtonImg">@drawable/comment_red</item>
+        <item name="asFilledCommentButtonImg">@drawable/comment_red_filled</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
         <item name="asEditTabBackground">@drawable/custom_tab_indicator</item>
         <item name="asMainMenu">@drawable/menu_button_red</item>
@@ -89,6 +91,7 @@
         <item name="asAddButtonImg">@drawable/plus_button_dark_blue</item>
         <item name="asMicButtonImg">@drawable/mic_button_dark_blue</item>
         <item name="asCommentButtonImg">@drawable/comment_dark_blue</item>
+        <item name="asFilledCommentButtonImg">@drawable/comment_dark_blue_filled</item>
         <item name="asMainMenu">@drawable/menu_button_dark_blue</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asListsDisclosure">@drawable/lists_disclosure_dark_blue</item>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 9e29a0544..431bb6bef 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -16,6 +16,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
 import android.view.ViewGroup.LayoutParams;
+import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.PopupWindow.OnDismissListener;
@@ -50,7 +51,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     private ImageView listsNavDisclosure;
     private TextView lists;
     private ImageView mainMenu;
-    private ImageView commentsButton;
+    private Button commentsButton;
 
     private FragmentPopover listsPopover;
     private FragmentPopover editPopover;
@@ -130,7 +131,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 		listsNavDisclosure = (ImageView) actionBar.getCustomView().findViewById(R.id.list_disclosure_arrow);
 		lists = (TextView) actionBar.getCustomView().findViewById(R.id.list_title);
 		mainMenu = (ImageView) actionBar.getCustomView().findViewById(R.id.main_menu);
-		commentsButton = (ImageView) actionBar.getCustomView().findViewById(R.id.comments);
+		commentsButton = (Button) actionBar.getCustomView().findViewById(R.id.comments);
 
 		initializeFragments(actionBar);
 		createMainMenuPopover();
@@ -254,6 +255,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
 	public boolean onFilterItemClicked(FilterListItem item) {
 	    if (listsPopover != null)
 	        listsPopover.dismiss();
+	    setCommentsCount(0);
 	    return super.onFilterItemClicked(item);
 	}
 
@@ -326,6 +328,19 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
        lists.setText(item.title);
     }
 
+    public void setCommentsCount(int count) {
+        TypedValue tv = new TypedValue();
+
+        if (count > 0) {
+            commentsButton.setText(Integer.toString(count));
+            getTheme().resolveAttribute(R.attr.asFilledCommentButtonImg, tv, false);
+        } else {
+            commentsButton.setText(""); //$NON-NLS-1$
+            getTheme().resolveAttribute(R.attr.asCommentButtonImg, tv, false);
+        }
+        commentsButton.setBackgroundResource(tv.data);
+    }
+
     @Override
     public void onBackPressed() {
      // manage task edit visibility
diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java
index 0f17b6545..88c0938b6 100644
--- a/astrid/src/com/todoroo/astrid/service/TagDataService.java
+++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java
@@ -131,16 +131,20 @@ public class TagDataService {
      * Get updates for this tagData
      * @return
      */
-    @SuppressWarnings("nls")
     public TodorooCursor<Update> getUpdates(TagData tagData) {
+        return getUpdatesWithExtraCriteria(tagData, Criterion.all);
+    }
+
+    @SuppressWarnings("nls")
+    public TodorooCursor<Update> getUpdatesWithExtraCriteria(TagData tagData, Criterion criterion) {
         if (tagData == null)
             return updateDao.query(Query.select(Update.PROPERTIES).where(
-                    Criterion.all).
+                    criterion).
                     orderBy(Order.desc(Update.CREATION_DATE)));
         if(tagData.getValue(Task.REMOTE_ID) < 1)
             return updateDao.query(Query.select(Update.PROPERTIES).where(Criterion.none));
-        return updateDao.query(Query.select(Update.PROPERTIES).where(
-                Update.TAGS.like("%," + tagData.getValue(Task.REMOTE_ID) + ",%")).
+        return updateDao.query(Query.select(Update.PROPERTIES).where(Criterion.and(criterion,
+                Update.TAGS.like("%," + tagData.getValue(Task.REMOTE_ID) + ",%"))).
                 orderBy(Order.desc(Update.CREATION_DATE)));
     }