From 28c31ed09eb82cfca182d114cdf9766e75452138 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 7 Sep 2010 13:21:51 +0800
Subject: [PATCH] Cleaned up the clock icons, added an 'already done' button to
 reminders

---
 .../reminders/NotificationActivity.java       |  13 ++++-
 astrid/res/drawable/tango_clock.png           | Bin 1411 -> 1425 bytes
 astrid/res/drawable/timers_decoration.png     | Bin 897 -> 877 bytes
 astrid/res/layout/notification_control.xml    |  49 +++++++++++-------
 astrid/res/values/strings-reminders.xml       |   3 ++
 .../com/todoroo/astrid/utility/Constants.java |   2 +-
 6 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
index db2d3b541..99ec09ac4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/NotificationActivity.java
@@ -45,6 +45,7 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
+import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.repeats.RepeatControlSet;
 import com.todoroo.astrid.ui.NumberPicker;
 import com.todoroo.astrid.utility.Preferences;
@@ -83,7 +84,7 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
     private void populateFilter(Intent intent) {
         taskId = intent.getLongExtra(TOKEN_ID, -1);
         if(taskId == -1)
-            taskId = 389; // TODO no
+            return;
 
         Filter itemFilter = new Filter(getString(R.string.rmd_NoA_filter),
                 getString(R.string.rmd_NoA_filter),
@@ -126,6 +127,16 @@ public class NotificationActivity extends TaskListActivity implements OnTimeSetL
                 snooze();
             }
         });
+
+        ((Button)findViewById(R.id.done)).setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View arg0) {
+                Task task = new Task();
+                task.setId(taskId);
+                taskService.setComplete(task, true);
+                finish();
+            }
+        });
     }
 
     public static class SnoozeDialog extends FrameLayout implements DialogInterface.OnClickListener {
diff --git a/astrid/res/drawable/tango_clock.png b/astrid/res/drawable/tango_clock.png
index d676ffd4632b2e2271a9906e6d871eed2c14df31..d53b15a270be665db65953f192a47f8c4bc2f596 100644
GIT binary patch
delta 1362
zcmV-Y1+Dsn3y}+uBnkm@Qb$4nuFf3kks&aD+6e~(D>_|_Rigj^1rbR^K~y-)eU)2m
zoW&K#e>30S?7jH1&iX<WUxE`msjx9Pj*~`3LUmgeq>?H{>QfO9yfm$#eF}(&O637j
z;Gq)gMTqjirKl~k1g@esrKNI6AtBwkF=!P#v7NQo>)7$`ciG+Vn;9N#uM#yd($PqN
zGjo13^Ph9h2)?5I{ClS!*OquvYPy9X4j3(P3}!|ee*eO|&%OF(zT(S(2=Vg$M~4#q
zgMGwPairW@s<pu>Ipk*N`1s!!O*H2J_LskV=f_A9Ae2QzLJ4vC|G`fkfBH}T`+ANa
zn;2u&b|{o?U_~I6YQ*;gJg<hTL3=8HO(qfN!_()eng2ZWlV?xAkHH`WG)BVKt<Wcr
zpZe?Ak>Q7rK6r?kl|>GY^fGq%Ael^xOq-x9BkAeg%YlP?iKQZBbMuUk4pClD{P16Y
zOY6~Z)c%RN0lpD+@KcYRI=OFu@5!SN9^!w6IVQe+gqT>Q>_squv=WF=GYE@+AW)>D
zEA$^2=3F+*(7*s!KeL<4PV4JE{htOx8zXnXmXyyQn;2szKhMO(ILTxap1rU=YtYKu
z(l{sq;HeHA$KmML?`0-G&#{TIk<;%~Jz)??fdu&JiBqrKH-1lS)h;tMvLCHHT-T<f
z@B8TLGDbO|YZz5USaAScuUdb9%%PF}tlDLUM~8Uv7vK60QV0nUwnC5e5BA|1mrN#&
z3?=can|yxxBf7fpL&zAyYCu>~jP?Nt0)HE<X>D!7GcNsueJn4uPl|^5Eh#KTI-ZIX
zjfXMDpp+sMNwKGAfVtdxI=gzP**SFJVh97!)!B~gdPpg;EQ@G7ycL#z0TzJ#(W5^L
z=|F{~6m;*oi^ZjD_`Z+U8bgTA-2?ph+*@?-`zBqx?`C@XERjeAuj13#*ns2MEG{k3
z)zN{J0v%`rAc4fr14d&JuIHC<TnDW+N-305boM>~!0hZSCr<oeYg1z|#&C0UgN>W(
zB%2bqWn2i@6d_A#Z7j!s@faB%1wbi<F$REqJ`cd);2@Ke@1nJ?+pe~Dlv0F4VH|BR
zQUn0<wYPs|Ojx>3$zgqMv+kgjA_xL(+h%xp1b||(z~RG(Zv$(siNzXlZ4am9poG4;
zBLx*z%jRb1kgh=pd7BKockcn9P*|>y?br@jO3A|IMRK!q)J$-HrVh5H|M>ZjF6m^r
zk^Eu-Aw=DIYU(}m`K3ETl~S~}rdiFe)0S-Fle1angw+$kR%l$DnZ9xFf${OmhIjYA
zzFtDf2+|U0t;u9E7-OhZD_c2eO#P&-t!dn{hhD4k!PGQYmzUmn^)D~IRR;rNX71uY
zx-$chg^XxuOSWKtB9i8oW`e-S7`V1Lk5Y<cqKRlULMqin;rbeWp~8i;Sw6myUHQ%A
zOHTj_@OHq_An=<utL5`illpFXwG`=W+lA*<u)-nYi8vkYoupgRgu@ZmmNzKO6%n@L
zgQ;mgxp-;w%`>l^tW@0+-~nZ;US*(hZG9!kUb*o1=0wMT{kc!)TZC^!j0k?o$6Ir8
ziVk+c#x2_9vR8Qj&u7e~`Pt9@F!jnaUd1T_o4^WCyS30qfG!{dWWF{qI(}&2$Ybev
zYrClil0a{lL4ghlb;DUNPJZ~uUvF#{uL5hpDsTlT-RWx*Kr_$*v;e7OqPgv^j-I`{
z(w+U4s%Nh~uH_dOuIH{9V_cvN+ys_@A`pD#pLfd*8n!LA-2>Es%C?pcP`#7$7aO*u
Ut_hc~tN;K207*qoM6N<$g3NTN$N&HU

delta 1350
zcmV-M1-bf>3xf-gB#|*Kf7J;O2@@h<3U1;600j_9L_t(I%YBtyY+Oeb$A2^T?%lQ5
zyZ%^vV>fX=oH*Es#Kv`-xTUBd;UX#|k}B;3FI0W#1FBE~3CZxxLq$~{kSZipLXn^#
z6{0|JibSYrNCT<U#Bt*`ZfqxZHeT=A-j93t?(V%a!$a&<Ez*v3e>Bp}{C_&<%$zxb
z&lo@a*2Ht#5-&>49$|<BMhiTHnURKH{p{3FU;8wz_%t9w{CxD$p_cx^KH|wZQr<hN
zwZSWS%+1bo>HL+ouAcIDfArE{R*<3<q1I?>nG)i9_5Z-%KmOx4`w#9t{@C~tR$Y&5
zX${MPWU`qc2q~95f2wXkcWa7d+%~zwZ*z}-<^20??Y@KIE<*f^X6N;7;1`cioIUc$
z@Dn3rhq=1E$mqiZ?0le$^`%pUN+P92NAEXrU6+|_A5kg(m4gQ^)0Iw`SW|Dwu|M$9
zH!gvE*=~4xY~qFfgZrKs89U4e*?GSHjYrY`4erdGL|8Fae~UJ;+C}2&uOX#iXt*B{
z?#JfuSk5tl{ney0r;ywj6j~pUTVPAdmmV8G!c1m?@$oSdiB^2~Hqvr1%B3x`h;3U4
zArL~KlpzvrCK@{gq5yhPRLZ58FjSFZMFM>9#Kfx)jvbDzx@Cq&K8IF5m5NJu-%|(y
zDkxxr0zx_sf3Of1^?DN_2e8D)_@!S{$WJ-{eWx#n6#te05z9W-KiG$FDx}jXq@5tB
z75V7;MRpHO5Y{#b>IFb=yXZh4#jozCTJNRo9b$Rm+v3gFM|(xnLcs>G6sdSJPPFD?
zj6o@d?IhW~cYyi1Df;>!<m#C(VT@@&jWHM_sD@ugf9p}!N@bGqD7yAxFM#~cGe59(
zsB9?(dv@<+Y55jG5TLcjVAHc}fUEy`gP|wSb7=ewXV1QMZ_gNvG5CIkVyTMb#Bm%O
zG!B3STDH81#vJZsmhmbcT5FV2D5dDx_c#Evv$LEy@$@!up}4_DVVy*4%eIQMfugW2
zrM0m<f6r%R_#pt4QjO3vnG67fgM*wteG090!@4?mpp+tFNAR@4ND%_alYe;Gn24-+
zC6D!du^~`O5r!eI>oPn%0zfX8<>=9)+rV0DVzDMFu8&vpP(l~BQbASKr{`wpkrjgw
za$6d9?b;1MHhZ_Rwq;vjDJ8eBFEKYePu+y)e;Qy{2G31hyrvV8W-?3J%>uY5o}4^G
zCbN8Bs8WiKjufkzbvhHRy!Y<3@*?Va01M#C%!RctetvAMy5S!<*tZWm;UF!6)|zxW
zjWLF5t=f2ITb_1wq^OjAbiU5plNVULyZpP?{`|@t4KN^P=CAy7PkP{4+lZ#lL_5Zj
zf3&r?5rzTAz^$bPlu{&GT8Ty-lF3%Gck%?;Dwp4#=F;Wqm0zBI<#|8>{uVeIhCyqw
zR-THQ<dfyqlGD@Kh3{9fA~x}sINdvXNVTVkL>%&WH^|QC5U%3w$qT%9<y!Ig=T5#*
ztyM~Z50tmS258Q&uY}V#FaM*hrF(SlfBl7a5f~A}At(j-`3hdn!_B%>axQbzH~HJ2
z&Y5cqvmgFu^3|XCRWAn=ffb<s$^X~^9strn`U?XOjXgZ@$g`<<#|~2qCE?~jVF|P?
z)S9=RJN?cdf3Z=_EdqI96}SnM?$??G&<1n^?Laco($=}Nd++|PR8N1k=DVx;Jj~MV
zJ9D>;F%_T;6o6$Q2ZW#5^F9$l)278XXMj3T-OQy2)b1z#A2AcOI(H_%1^@s607*qo
IM6N<$f<<hi@&Et;

diff --git a/astrid/res/drawable/timers_decoration.png b/astrid/res/drawable/timers_decoration.png
index 18b7c6781edadc1d075728dd41546f7010ee7037..ce8414ff9f36d9eea8a1111d58374f1c3ca0a9ff 100644
GIT binary patch
delta 854
zcmV-c1F8Ih2ki!sB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru+6e~(Eg0Umv%vrW0_{meK~y-)Ws*%yTy+%1fB!e%
z%m>BDm(xnquwalhu~eG)L1fo%3~EMQ&{UShU0V_p)~twKX@BZMQj?O{7NSHG7wUpg
z)U**qm_jwSf|N2&c}%CwdynD0_rEU6kXlc2a~JoVlargHcnX8PL;Yg#fkM52mMDfo
zkXfbqWMp#q($jqPgz%`q<*x1*k9Krsh$rGG1tMUTEpoHV+?@V(LBZ*f$>D|n80?9!
z_YGuIPC%n-Jb!9;F91;2c7c_<_YgZs%r_XjIQ~e%YgH2iK#<YCfo$sjPKm>9v3+qB
zhteSqx5c=>Q=)Gmn-XNSdNT%lhx)s^j~y?IM@wrx%?C64!ayXww;NHxT3TA`DT_x}
z_p#%Hy+i%g1lf+x44aNgI^9I6c#q8MSIC<o{K`52u7B$SkWM$T>6mnMW&pAPh9D>6
zi8#qr46QXrFo|Pt)AROa#wO-)U6)WOgkczHtx2Y0#1nA@IraX#=V}b#fKt%VP)D&;
zL~D(&1<TrI_~SpgcJ&JYL<HaWdF9nEl-mD)s{uR|0mt5@vAzk<^Ke}k(==&sZ|B_k
z52;ith=0iA(HarJK!7`jLfx>+7Hfa!(OTnq9-ilM_Uw6<mX;_K@<bvLeBURTOySrL
zR@s73!2bN|N0tGM=Vq5l1(H~0n@}js)YKFc6BBG~tnVAf;|WAybHyY#yG#ZDaSui&
zhcDfno|~<Yr<nQS7es`UCr^>jZ?Ll$Jrao!41WeG7PhcAZEpNDzx(x%*WLjL032y-
z&D~jCeXpnI<?!7<*Vrl*dA{W!(MXhNG)6cS;h(<>6jvTH_UX7Rt}kAkTmCr*m;r!=
z)%jvL7{0asd*MVw-7~c<&1t-Ck4kX|$8>nG`heeN7WwAO@7$T&*GH%4zyB7<16%5e
z#!nsqj=b^GTW6ko_RyO(;hJVc89_m`?b_S<Qhw>HnJb?G8^A4K4G_iuk=Qe<jsOnu
g2rz*XpsVD60pO8hwsUqimH+?%07*qoM6N<$f)f**6aWAK

delta 848
zcmV-W1F!t;27w2VBo78+OGiWi000000Qp0^e~~~Qf7J;O2s#CTgf3M800Rz5L_t(I
z%Vm;FOk8Cg#ed&-@4T3~cVHq2(#j)P9c(a`zT%>>JKUIx!MY$CHYP+@wKXOzO=B7#
ziN-`ttTnNVKJXDuOrtKa1x-~b1v*$O+7anYr_2n)%)P@5cfQY!Z781P?9Ms=M~+|<
zjvN>nf6|f{1>#|p4hTbfT8bN0wSMNE&t89JvtDd4_GtKY_r6Daw)e&fN5TjJT0?QQ
z#LQHJOPA);gTv>J^*oXaB6X5b^0c|Zd|_~Sz%Cn#RiA?>zIJDd-EoX~;6WNYQ_YRd
zl{Y=TbJftltO&PVNdS#LJ~%vJ-&iZq{!oZ$fA#IV*0k#_wr*>ocW;hp!!CosyA8;v
zqreV%<iN<#?tMFUmb6D(S0gQ3;+xMzN{J8xGY~_vM5S~Br!*4;{euJsw)e(aE@x?N
zZKja_hxp^CNN0U_KT8NIULT(5CzY&n^1}zJc=DX7(R;#?FqRiWDTU8xQFe=j>MTZH
zf7*uM-pg}sIc(cP$QaUp5W~C4!qmsnp%?mt5~vpfnwlEO7xE~js40!(6gm3d??htV
zOiWCmltOETVH%i*1f>PgWdbW&6Dzw_Iy%~^RMt>RQ7jhe?(XL0!>@Af+Er?`8d6HM
zQfLiGG_W8A;-XV>So}MUQVP%W@H~%0e}@i}NF>N)(pZ*7tyaUbY|3sKr{sXoa6dWy
zmLq|)bCdJfhJ{md@%j9Wjg2unI!Y?FbSE$zj-WLxU(Yf(IZuV!41j#&%cCcLK0h_t
z7`7Sz{#Uft^z}VKI-O#zQbB7?AP~SbP4bx>?y}3pAE&EdO`LfKzyRpHw`*=;e>VB-
z{{4^n|NLW-Tp`c>ZCeNif&_yh{JsD;|H_cRzQV~5&g$8v+4raBf0_fb2Ea^mI`23A
zSC+13_B1ubqHQg$ctwv&evNXr%&p`tE|1Uh_2=KNkN<Yz`1$GYz5&uePHgB(J<$2&
zuKwrmyJzcDb^f{*DWs{<%3XJhHt9k-@x}P5kAM_#1y}^M;QxsH7j~N(C<CiN7AOGf
aw)kJkBxD8_!ZzOk0000<MNUMnLSTaa^PJKE

diff --git a/astrid/res/layout/notification_control.xml b/astrid/res/layout/notification_control.xml
index 5e623bd1a..c82768ddc 100644
--- a/astrid/res/layout/notification_control.xml
+++ b/astrid/res/layout/notification_control.xml
@@ -6,41 +6,52 @@
     android:visibility="visible"
     android:layout_weight="1">
     
-    <TextView android:id="@+id/reminderLabel"
+            
+    <LinearLayout android:id="@+id/buttons"
         android:layout_width="fill_parent" 
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:text="I want you to be the walrus."
-        android:background="@drawable/reminder_popup"
-        style="@style/TextAppearance.TLA_Reminder" />
-      
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/reminderLabel"
         android:layout_alignParentLeft="true"
-        android:orientation="horizontal">
+        android:orientation="vertical">
+        
+        <Button android:id="@+id/done"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="49"
+            android:drawableLeft="@drawable/tango_check"
+            android:text="@string/rmd_NoA_done"/>
         
         <Button android:id="@+id/snooze"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="49"
+            android:drawableLeft="@drawable/tango_clock"
             android:text="@string/rmd_NoA_snooze" />
         
         <Button android:id="@+id/goAway"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_weight="49"
+            android:drawableLeft="@drawable/tango_stop"
             android:text="@string/rmd_NoA_goAway" />
-          
-        <ImageView android:id="@+id/astridIcon"
-            android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:paddingRight="15dip"
-            android:paddingLeft="5dip"
-            android:src="@drawable/icon_blank" />
+            
     </LinearLayout>
+
+    <TextView android:id="@+id/reminderLabel"
+        android:layout_width="fill_parent" 
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/buttons"
+        android:text="I want you to be the walrus."
+        android:background="@drawable/reminder_popup"
+        style="@style/TextAppearance.TLA_Reminder" />
+                  
+    <ImageView android:id="@+id/astridIcon"
+        android:layout_width="wrap_content" 
+        android:layout_height="wrap_content"
+        android:layout_below="@id/reminderLabel"
+        android:layout_alignParentRight="true"
+        android:paddingRight="15dip"
+        android:src="@drawable/icon_blank" />
         
 </RelativeLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-reminders.xml b/astrid/res/values/strings-reminders.xml
index d816c3588..cb1d6dd7c 100644
--- a/astrid/res/values/strings-reminders.xml
+++ b/astrid/res/values/strings-reminders.xml
@@ -42,6 +42,9 @@
   <!-- Name of filter when viewing a reminder -->
   <string name="rmd_NoA_filter">Reminder!</string>
   
+  <!-- Reminder: Task was already done -->
+  <string name="rmd_NoA_done">Already Done!</string>
+  
   <!-- Reminder: Snooze button (remind again later) -->
   <string name="rmd_NoA_snooze">Snooze...</string>
   
diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java
index 830e8d767..b2c2f81da 100644
--- a/astrid/src/com/todoroo/astrid/utility/Constants.java
+++ b/astrid/src/com/todoroo/astrid/utility/Constants.java
@@ -30,7 +30,7 @@ public final class Constants {
     /**
      * Whether to turn on debugging logging and UI
      */
-    public static final boolean DEBUG = true;
+    public static final boolean DEBUG = false;
 
     /**
      * Upgrade time