From 807b8ffa9fb7c82ca48db93eb971fa54e0b699b1 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Wed, 30 Jun 2010 22:52:27 -0700
Subject: [PATCH] Minor appearance tweaks - updated tab icons, made the date
 utilities better

---
 .../todoroo/andlib/utility/DateUtilities.java |  74 +++++++++++++-----
 astrid/res/drawable/tea_tab_basic.png         | Bin 2679 -> 2659 bytes
 astrid/res/drawable/tea_tab_extensions.png    | Bin 3362 -> 3452 bytes
 astrid/res/drawable/tea_tab_extra.png         | Bin 4537 -> 4486 bytes
 astrid/res/layout/task_edit_activity.xml      |  31 +++++++-
 astrid/res/values/strings-3.0.xml             |  10 ++-
 .../astrid/activity/TaskEditActivity.java     |  23 +++++-
 .../service/AstridDependencyInjector.java     |   1 +
 .../astrid/service/StartupService.java        |  14 ++--
 .../todoroo/astrid/utility/Preferences.java   |  40 +++++-----
 10 files changed, 142 insertions(+), 51 deletions(-)

diff --git a/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java
index f52240bb8..c257bf23e 100644
--- a/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java
+++ b/astrid/common-src/com/todoroo/andlib/utility/DateUtilities.java
@@ -25,6 +25,9 @@ public class DateUtilities {
     @Autowired
     public Integer monthsResource;
 
+    @Autowired
+    public Integer weeksResource;
+
     @Autowired
     public Integer daysResource;
 
@@ -77,10 +80,10 @@ public class DateUtilities {
     }
 
     /** Represents a single day */
-    public static long ONE_DAY = 3600000L;
+    public static long ONE_DAY = 24 * 3600000L;
 
     /** Represents a single week */
-    public static long ONE_WEEK = 7 * 3600000L;
+    public static long ONE_WEEK = 7 * ONE_DAY;
 
     /* ======================================================================
      * =========================================================== formatters
@@ -193,35 +196,67 @@ public class DateUtilities {
      */
     public String getDurationString(long duration, int unitsToShow, boolean withPreposition) {
         Resources r = ContextManager.getContext().getResources();
-        int years, months, days, hours, minutes, seconds;
         short unitsDisplayed = 0;
         duration = Math.abs(duration);
 
         if(duration == 0)
             return r.getQuantityString(secondsResource, 0, 0);
 
-        Date now = new Date();
-        Date then = new Date(DateUtilities.now() + duration);
+        Date now = new Date(80, 1, 1);
+        Date then = new Date(now.getTime() + duration);
+
+        int[] values = new int[] {
+            then.getYear() - now.getYear(),
+            then.getMonth() - now.getMonth(),
+            (then.getDate() - now.getDate())/7,
+            (then.getDate() - now.getDate()) - (then.getDate() - now.getDate())/7*7,
+            then.getHours() - now.getHours(),
+            then.getMinutes() - now.getMinutes(),
+            then.getSeconds() - now.getSeconds(),
+        };
+        int[] maxValues = new int[] {
+                Integer.MAX_VALUE,
+                12,
+                5,
+                7,
+                24,
+                60,
+                60
+        };
+
+        // perform rounding (this is definitely magic... trust the unit tests)
+        int cursor = 0;
+        while(values[cursor] == 0 && ++cursor < values.length)
+            ;
+        int postCursor = cursor + unitsToShow;
+        for(int i = values.length - 1; i >= postCursor; i--) {
+            if(values[i] >= maxValues[i]/2) {
+                values[i-1]++;
+            }
+        }
+        for(int i = Math.min(values.length, postCursor) - 1; i >= 1; i--) {
+            if(values[i] == maxValues[i]) {
+                values[i-1]++;
+                for(int j = i; j < values.length; j++)
+                    values[j] = 0;
+            }
+        }
 
-        years = then.getYear() - now.getYear();
-        months = then.getMonth() - now.getMonth();
-        days = then.getDate() - now.getDate();
-        hours = then.getHours() - now.getHours();
-        minutes = then.getMinutes() - now.getMinutes();
-        seconds = then.getSeconds() - now.getSeconds();
 
         StringBuilder result = new StringBuilder();
-        unitsDisplayed = displayUnits(r, yearsResource, unitsToShow, years, months >= 6,
+        unitsDisplayed = displayUnits(r, yearsResource, unitsToShow, values[0],
+                unitsDisplayed, result);
+        unitsDisplayed = displayUnits(r, monthsResource, unitsToShow, values[1],
                 unitsDisplayed, result);
-        unitsDisplayed = displayUnits(r, monthsResource, unitsToShow, months, days >= 15,
+        unitsDisplayed = displayUnits(r, weeksResource, unitsToShow, values[2],
                 unitsDisplayed, result);
-        unitsDisplayed = displayUnits(r, daysResource, unitsToShow, days, hours >= 12,
+        unitsDisplayed = displayUnits(r, daysResource, unitsToShow, values[3],
                 unitsDisplayed, result);
-        unitsDisplayed = displayUnits(r, hoursResource, unitsToShow, hours, minutes >= 30,
+        unitsDisplayed = displayUnits(r, hoursResource, unitsToShow, values[4],
                 unitsDisplayed, result);
-        unitsDisplayed = displayUnits(r, minutesResource, unitsToShow, minutes, seconds >= 30,
+        unitsDisplayed = displayUnits(r, minutesResource, unitsToShow, values[5],
                 unitsDisplayed, result);
-        unitsDisplayed = displayUnits(r, secondsResource, unitsToShow, seconds, false,
+        unitsDisplayed = displayUnits(r, secondsResource, unitsToShow, values[6],
                 unitsDisplayed, result);
 
         return result.toString().trim();
@@ -229,11 +264,8 @@ public class DateUtilities {
 
     /** Display units, rounding up if necessary. Returns units to show */
     private short displayUnits(Resources r, int resource, int unitsToShow, int value,
-            boolean shouldRound, short unitsDisplayed, StringBuilder result) {
+            short unitsDisplayed, StringBuilder result) {
         if(unitsDisplayed < unitsToShow && value > 0) {
-            // round up if needed
-            if(unitsDisplayed + 1 == unitsToShow && shouldRound)
-                value++;
             result.append(r.getQuantityString(resource, value, value)).
             append(' ');
             unitsDisplayed++;
diff --git a/astrid/res/drawable/tea_tab_basic.png b/astrid/res/drawable/tea_tab_basic.png
index ecd19d70b2c9038b0f5b3de1910632ad5b312fee..91cc4b0d17e2465a1bc94dd0b28bf42db3ec0a7d 100644
GIT binary patch
delta 2603
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
N002ovPDHLkV1h?;1D5~*

delta 2623
zcmV-F3c&T_6!#R67YaxS1^@s6RqeA!ks&~T0Ut1*ta_OM015X=L_t(|+U?tIY*W`A
z$MNsE_uBW`j`RHBhZq7RCJhBblBTpnZJ|X|J5`f5P1@d6Qwh_mjiIUQ)V?VV-Mgvk
zo2ngcVO=-Dq;6|fOWTW89b0Kd+oUU$ha}LB#}I-833+sE-?JC@h8O}%;>3x|{FknO
zKq0n{Kl=U8J?C5uxyn_pa+RxG<?1#qk*x!hQVKw^uZeLc0aFMe|F40hlq%o=bifIy
zfC-EPG5gO2ff8AYqXXVUZ$EbTnU4Ki;_+C}FpO?rsP3(XAN=h-U=SDsl9@&lS%_l*
z1)uJ&f4t}H@#oz-c-?}*5y^N06nAic?>C?P>S>@K7|k@2$VQy@J@qZU=a08GR4Wvg
zEeFL3GJ!dCk^@Ig;+ik=$S+U-1h@i>3L%oWHPDSX(F@00o5Kq3@&<(J0-=C3k!B2e
z^(Y^HF^sFI`h|OceDp;-Nn@EpQnE2Q*KizOD?LI3#fi{7i2T*8uT>bneDcYE_C57m
zfI`5q-{<xMx*5*;+7z5A!&4BN3$3J?rW%Flh2yO@QbDGWl&nh5N(Fa$Jwo%?zh&O!
z0-@@-%NuB_QRqE?ytRE#eM_d0M7H2Gg%$FB^$68t%{kM)iHS@ObG7Gl+PX~2gLmv`
zeEjp*fr0s)la$5Axp*!O8~~wzAXE?ezIvL%nM;ybESyhw+sUa>DD<xZEf0~#a3m5E
zL-b!bOxp=7Nq23Tza)vp!s$6{%{hg>J3-5vd2(*iZX|~2?>WLJohH7}{2_^j#`*a5
zNt|MT9jJ4}NkvKyarwfrYe;vu%pFPG7C0G15(|ZM@U^uq7teLHHq|J9lm=?8w#vvo
z!fLl@cL!}JOe!jCcdXxfC~YLMP&gOPcC<E!6-oo)`A^O*k`(Rk;*%~Df2elH`mKj{
zPi#wOb5tT03a6<?p*&EX!Q|XLNxj`CX**#OTvGd7bIW9sW_k)BGL3WobVqAbSiu)q
zKKHv-ns>LJ?yqR;GI14uEZOzQQzxFE%?4Lw66fqGD>;G6s?4|5bnVu2ih~^{`DH79
zy?Ohw7wja(rc05M37n5!wQw4$6#~H}pt>gqyU-Va>Za6JMe|C9{@yR2I`;Qx?yyfS
zr~UlOeB&J0Wwlj9wL&l$n#8&3#&e-AKrtxyEn#();KGr8KgT+M>z?-WYx9nCY62&S
z&|H(r$%ax5sw#`2Hy*@#5Rh4*o8hcmAqZ9at&_lO$;qA)dIhdLF=!7=W(+75=Yv<)
zw46KL+1gkwSQ7G0;>hg6L3M-BNR)2ggZ=0zBS2D0#qMG6KVDk1rTeUnQ(2zXIKo*(
zZ*1w_6&s&>59|4VS~61!QUTXTuQh(}-09Apjn#sx%F?WDs|lRG#PUex#+RSLdagD;
zlZB#|MtX$(I(N^xlTWW&Dp<ax`1)IU*5Q=UXNDvG`(E0Xy4{$`%hO4a032QWcUD)G
z#R7Fz#x)!%Wmee;&1K;vt0!=-03*!eVPiT#3g8&&`Ead&*Ch}}5FGi|za)l`$<ge<
zQC;9HC2H100{6X~7S7y&u6)&8k_RXnQRVKvsv^8a>fuMlSkIy(3DpI9Ielh061eY`
zv~kj1NvnWEj$dhVY9Ql-#6`hpzHhv^qc2$<K`%$B`l79xg{oUP$?7@d%o-?Vg4T60
z6fW?(AUTA8H?;Wxa4B&AuI+thID)erq38>~?-Gg*PCGgG@0v4CItfw$?a*7_+2C{l
zjzWfGT6f9P4HxZO=jFitySDYo+6a0%D8|A8DTb9CSvzky=>VyK<Laej_ZSZA2LooP
z-ClIXfMMW@g;W<2dKsuj=37fO5PBJXvTj~+(oK+mb8NW3QFjV3$B1d6Pl33-Doxr0
zyB;Z%Nm4S0Gb^B!`NwIfL*YUXkQ_nr)_wsbQU)}M^uTM|`pmkBFe);WB-KC|74(^P
zk-!75%{$I)6Qlsz7w@*Lbtnn1?(#Ao7lSJ|{pyenBmt%%ZQN}k=@s*vB*j4JHqOS~
z8No?^2gosU@!-8~9S|Cq<Gyygy%MQ|x*1Z`Ts414Hcr%Bl~J6ufQE+#S857ijuTVL
zy6j_vDZAnuk%F7{Y>UcOb8k1ht)g;OB)Dl$Msa2glsf;6jtn%qbOGi#rsvL&>;&C(
z<2M!QjkzT$B{{)OZ)6;2HVG1d+VTF5WnSlhSin~V@pzm&9)9_NJ^$QtXFLVz!8fl@
z(oAtulk?!43xYEnAZz|P|Na`o3BuuJAYM8#|4ci;sYrj=7L}_b!tjIUp23dMjWGN~
z<?2ZA!9Oe*&a8nh^`39mREUiZ(m&?zw0|z_7G#!4KfBg$|7%WKM4Z_GsemIH8)$NW
z>(JW|hdX<lx{tl>16+V3Eu@F`ZjUCG?HA4xP@G69ue;FltT|_qaApLQx<Pd?6!y9V
zc`lI2k?=de`Qh)*9@@JU$eRh$4PQ_(ftY9Yj%Tlqd%IBGm?qaQp?MI_vPH$2X@V3$
z`|OY3+Mucyj$4PjY6Kdi;Xm(sV(*!MfB(J;@BrEbl9W<NDHSQDCZ%*rDP8vO<YWCm
z!U7=g@~QoW=cCDeeSKFjC72RahYO*XaY?R;1RvVFXgD)HFjE0Xw7ct`JO?OtMoRJp
z8&)YCI64~s)2lz-_uU`K?=M~V*ePI4T4%4S{r(!(H+LL>^W)#H-*Ea|-<=nKdIy@u
zV<TagHXbPQ3RW!<<hun9rwd_Ja7orjDmU+2RGf+1_jE000HuG~S@F*Dl7Yr$zR8!2
zC*V@Q<X=Zjq_Z^g#0%ZOus;ldcI2<ymtFkwpKHE6)7LyaJiIbCHq@vH&{Qjhp)$d;
z3c)g;K)6B(y$qpwh>nNewO7c0{fmh+ZGuu4h)yvS_80;)WyPZ@R+1X36%KYpAARM?
z0A)p<6X$yR8%9S*!$OV+G}TI-zgQ4jp%5$)_=^P?0SiR+aFu24aZ%Kn&`OUx3RZp)
zsQq>)FvJ3V<!LT0W*v~d{n%QElJMrarcPN-4VIP*5=n)Qv(ZP-oQdLp)?r0R5Gqp$
zmI}Py0)$=$&Qf9&cMph)uDI%N6Ndjta9zuRQfs>sx3AQ{n~RAvW1#-?ZTET%fm5?4
z(J61D!V14&g<qw>BS80AAX*-SRJHd})G3XnpEwJu50}?G{Ga?uh{O$NNfQeox!5o>
z1rmTdG&Ho*pLacu+X<?F(}Qr9fU_8(dKi;M-2;?##WjB$M&L;0x~&KF>l2ZfI6F!O
z$rg-sfFzLg7bksn0RtR`2uA@piV>>LRWsBc7e$>(J@mCq$9w=;i@BPu&tB#DPU$Ea
zj;sDQ4BwH;bz5(oJHB@5nDcGkzKczK``AcX0pAwsn6Guv#P&ccO=-K^A|1KPRjzWC
ht6b$OSGl@%{TG~i#KpE<ZTJ8H002ovPDHLkV1iys1|a|d

diff --git a/astrid/res/drawable/tea_tab_extensions.png b/astrid/res/drawable/tea_tab_extensions.png
index 3929d77b5ada84b996fed339d92af37a7fe3257e..5ddce8801914cd413e25b8dd5e722e74857b224f 100644
GIT binary patch
delta 3402
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

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

diff --git a/astrid/res/drawable/tea_tab_extra.png b/astrid/res/drawable/tea_tab_extra.png
index 93ef0f4c8bee9141bf120a7be3e88581e2ed8e83..69323d56795645d3b191720615de042834b4df7f 100644
GIT binary patch
delta 4413
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
D0qkKv

delta 4464
zcmV-$5s&VMBe^4x7YaxS1^@s6RqeA!ks&|}0VECkcG<8101-KnY$Ja<sLg37ENWvb
ztt~3pjO{K0>Ik@u&QW9$q!m=O4`bW5_Hi7hQE1XCiv$rSiV+E6$-dP7>MeKv$g9e$
zkU+u!37*_K_f(*6-QRnk`rY4l?*sZ;U+Zgqt*`a9zV<V1q$`6crNkUd05Dzs-WhHb
zfMLE<LI~{<Kqeg4?3{nu8MF6PGt91;T?e3_2}oQQ;qU-#W*5wVGd-+18UO`A%zOu>
z^t40bx}ag43C3x5TQ4#ZQ2@bqT6I<dF;+mM{xssDqv0bnC@A0K#?v55fv@28tv766
z2|zWwc2<{|MT5lZ>S}j`Tz{J|fM@JJ354{Vou-r`QWF(x8f$-M09b1-d-hB?kFEe>
z0PvAWgy-`(Ms~~K2n*7KHkuLxLbiyABf?wmqelTTgb+Ab2fVBoJOnUZ&>$WHWJZRY
z@jzx|@DRWf7671A9ST(tqCvD6&4?HgsEBvXg;9zajY1I>t0^Eo0VoNI5CVy@Lncm$
zL_FbO8<F5)-Ee=xZDc7qUu75>rFlaCZ}aW_kL1hw0RZ^1r6RpXsmVMTKTzDrHjJqg
zYe%#g%?KC)#Ax)SKO09`1W2G;@!XjN1OSj@GI%!+o^))ZS#WSMF1X-U2S)uHu5ews
zc3^s8Q%7S9-TsC`_#4JxY&n3n-!^`eyFK>RZ9hprmIQxjfC(8P=$+VH0|o?$No_on
zty_QyAu!BW`z8_*F2;q-cvkt<+@$#<^DeKnxZjf+tc%hvIeJmrCC_cC{`@an=;uoq
zp2=@9nxS<9iFR-eJqjr3YC&9y!vRO9aI(U=n`URvo$nN!DuA%*b{PN?0Pf?;57T!x
z?Z^axr-y$nF7HUrgzT%zheV2I{GnmhOOP<~M38zFAOHx<L3rR!(I5s4?8E_YFk{pG
z`42uWvNjb!iy6dG0JaBr{_EHecEA6eCa9SSU3z2B>u|7gxi2l_^A|6DWkYf1=ul$L
zY<o`RZf4H?|55k+YE9CHwiwOFX{|wNhnjr4TbF-*b>e~yN<l5%P8{H3?16i-<}4Ih
zn+BlS1QaqMDKB02%2zjx`o$+j*9<|<mDzAka6l>+p=8C*KiF_^_D%ma<)dr=KH-;E
zc^NjJGF7_eVK&azN<>PLNzH4al=dD#DUi$;Pk89iaD_4PNuQLdm|%h?n7A3;#sS2Z
zUATX0S#e<O+I+4*GTAIR9ZtB4WXKaFFa>axA1q&R=^rn8%qnk0#-+8FM29Z{0G6;R
zvS}x_ux9~TF3f-d798Xz*Tx(BPboK{#7rngyM!_fAh2l2bIXPYFIzi+8;E{f9z2W(
zZpH(*-v#kP0k!d(spCGre5O_A9fh+>*&u(ni-(W`$morLQjHgf7>(ju>AF?se`yxG
z##`*03LpX?03bMj&{NAU2wuFlADfRXHm4O3<3UDNI>ZYER5l)*{n*zJoo|&jijG~O
zA`Y&5CiCnAq89Zggn$k5d#=y_MWtzsS<_p|X4WrRAjM5BY5@>>xbU%M0|JF_`B;A+
zGFTsE;)G0`NXt$G*N<cVy8olOR=Kwq-mzN^YgL30(1aGB1^aVKOU$4Y2BnBo1)hkv
z)Dp?sCT*EGb>03qivXknZ~?G)ph+PB$|HsImgY4VyyYMcNQ@0OB0*+k*oN>3d4eO?
zSG=8VmF*6@OLeLz<@Zh_ZN7A92pfM9<Z*f5S?8+!zVct5+BkpB`ii&vTOe6ANw<_H
z@VI}$(s)aJw@OuTgoQ{%WU^V{d@MH9zB|q;JI%-_4;X>oYowDd*1WKw5kR3dsLDD<
z&(#K~Qapdb#(Aqu4e*+f8~{YKERiVN;@|f^>;K2WQh$@tm`qi82w*c9G%<gT1=hK<
z_^hL08iWol#ZmN14brHN2n{1g$_b?m@KLuk$_CBb3hAASby+4Pw+YH=+9=ziZ=UkM
zwr}}L>Y=iYNXeUJ2@5CZg3f8)lsu4ihN4C+CDiD3HpuGgqcn=B9!>ea=n+CLw-Zva
z2+bSMU-;ioBp|r~q?^mmxv+n1p8xgjt5+Inx;G;yz10O$JsFuxM1q5n)s!e+3-K`;
zg$}JPSnZ7()auVQ=!%Yt;1BK;JE5mn%Zv=C;DS^vLiMN#NSTSHwXkfSf9;oVu7uC<
zN<}vC5RTJOp76*+|DUXLAC4V%#i?>uW1w#5V$|X}425D_=*t23V9tMm#ODR^fjjC*
z^-wUTwJ8oD@>MK<!Kd?91+H$HQx!QRum5uWa^x6Z+b|I_aVAR^32iW7AV#AY=N$iq
zRrXQ+h+k%0Fkpa580xd&#klUmN&a#=#s2X3!vJhbjG5%R;nQ_^eWsl_U=RvwGeC<e
zqTA#7i#I>>5dg3`45WYIBAlEHA`!uXOVI{ODQYTfjT*ToMg9%xlXr-^P^k*>f}jyV
zgoZ(lUS@-+(Y6eTL{J~Bn_&I?R|9XY$ZzSt(aE&lyp2e3NDes0i*QV|!SPQv*hh+x
z1sNg{QwncM2LKJAU|uU*{>HEVF?CGa+`r!cZ|Tqex+paC<4k`x3vR}fy82J^cF(C9
zX`^i^NRou87R{Yj`pYX)awqTIFN=z;*2{V!5)l%SATf3bb^(G-fP*<6jx|dM0B?a8
zOfIo+`F6|8<3B8(o*0)W=SQ9x_~g^$LRUSSOY=fGVh${6&KZH!Z9s<UJtQK5OJ`A5
zUN$=rZ%NKGCTo9O?TvKG!yY{?kjZAjMkLsY12QAGM#@C$P;;ySAV*l(iUbG)IOf37
zA0HX<_JxlG<H4ki+Xl?s^c(iBoBhg=-ImIM-s6C*Hi!WOzCVW;AM;P%IH|-sZc4%Q
zeYY|*Z!d@ss5p-s2p{Wf)fx!kI;kUDJre^4HX=b7!b5+&KtN5XX8PrS82<9^`Z9ZB
zd~xRJ>Q#f@xYtZy5`a#-RU#(=BAUTnMp^yWSvNJ@xH&`408jX2u-H-&Kzy&Nl#HA<
zYiaR{eb(<QdW?CmYW?H`Ld9(%F;EbvDiUc03l0JmR8>`*j<Sa{8}x=`jFU)bqBM$_
z7K3(7M{Iw095&rnG4GlM_un~WR<$W2WY(WTW~oIZgcv;n=<E6&S+~@cY)*5fAyJ!A
zsDh9YKy+su^dPC7fBnKcW)<CA-O*fS4ZE^`jO;%@Y(%^O;Nvn66sM0aZ&2#&F9epn
zUC-BMHyMp>iKrQ|D~KVc#h};ei0+Pqi?9thj-G$=z$=$8-)GjEtkp{ufN?qxFmwyh
z%{3*Py>2gf!Y6MaMx%&@Vu<cgfO^t2vH0po*NuI5S9dPr<Ejt+?=o+#X<=IA7Na>O
zv`ENMbOlDhKx|JOMm<%AUNUsy#;Z1ON)+SFcja_LI^|RY02o5R6CRw*!FH(#WWoEl
zZU29>{PK5(-|>BOx!Bb?C+FW-F(EQ>zJu5enURw<pM(s7h_G=sFfInROGL2wjQDNY
z-sg+gkC<sD!d^?|Kmfp+M|XP0&07sB0Rx`!V4VcEVFLKUEPuGZYWCHuuKH;FpGQso
zxbj19SEjya(0!%DnlF37P8>)iuPF`z0z`jS1mh$Siv);+IUK4vbl*iQhCF#BeAsE`
zd2X`?b=n|xd5P_;+n#mHv69VlntWXTL}5UsYU?rxQy3uw>H!VvF&)q;9K5{C>2&UO
z`J9J&iH`t)8ddGVhG1SW5W4WLiL(|za?!j>0QmiPa~?bB`DtpcUIUe?oywt63iW@m
z24$ZLyW!ZiY}(3)CgoqB*ii{sz1#n1xpfcFk&?~!40{S7YbjQxDpXwsjZzp<3aU~V
z%?7j@9a_Bsbd)<00*RCMZ@u%&+xt24)TkC^es|!Wmup?e#?<OH$t>S0N2hucl2+5|
z;dn);nseRn=00-q<5lL?Q=nZ4a7usY7`qB6eP`YF?3=4fHrstthkNse<>ED}!cZt^
z9Dv#iifSE1DGXplDU`i&WY~Nk?3q=*1OWE8d?!ECxNuFqt<GPk*Bw{ZX#ZpAjjhHT
z0TQ@!%#{zVAHQLj2`B+cNyJIrg>*6-lsFHl0{~&r;ns`QR<MMHKtymh4y=EZfRPz6
zF0(sHYL^*sX$-_6JnAELCD(4Aa4i4~b{B<aig!IAYtAMw>+Mh$OIYwM4<Zq;X$)*5
z1P~uwpOt>Le8PvLC!0pwYyQA?bEk#ru3b8r2Jz<Po{$>K9CKv&)+{kwj8o;Ly9!os
zr%^q5W7J~YTZ_~h6sjOrsX%|-qlfMrH~02OFMgsD0Ny#UZs_~sd#jsCvzRE$wvX&J
zXwY@Nby<fg;y<W}AJUNH$yr-=_ugfeSSf6YmAY(~P6miY+W}7R3*}2nnjDSOS%&3L
zB|PY?jG`JE;#9$r_+f;D;r*YE`23l~=g*Zdn)G+i=Zjj5W(18u=SzRv0!cljLHR+2
zNAPa?^URMHp6|UN+`+DImmr-C5QDZOz_QuxICDpUDJ;i&%|gHQ(7yZc+L!jt-F13h
zhli_@yBsP7Razlw)f!^^RM-vszQxm?d*BxTjJi|ta3=$lJfmn{taWFCIRkJsw4GL^
zraTt_$8XDTTXfKUU{ZgrUen=mm_$L3YDhxT8+63>#KFe+>KWI~xc~XfUaA1l)E!7&
zJ!#LN?W8@6)W;FXX@UcbLrAPgArUDzDUHs1tL|J=Yp)qvtJidT`ixTAT4~f;J*3{$
z3W+q5rjmc2GWXTu*UBxB!X~6ny<2yl)kutIP9vC(Kqb2M5W9a1K-$;!JA8|SPp_*J
zYI5t1+T&`{3}NA8eaK)kk*(*}s#IkwnD5gM2dfa?90RSTfs$*c%vm;S)jktai>XO!
zXH|gS@K8!umbX3Owm1Cr$H8m4)oYrWCb>~>NU2M^IS+F5+=g4}Zyug@-c5S|V0FdH
zaqsYNE;<%CCP#m^MnM}8n0D>-dtNDCu@^w2sY%h!mKxJr0ht$Tm^LZ#$U)2W0XJ7n
z3QvC24u|1j<hFx0CaA&9MXw~_0KhE&y`@7NFJ8eo34|g6@WS<{Pd|8Z%dyYWOzq@N
zvvGQ|`5uN80MI<Q==a--o5sH2W<0P9$s!|~gH0&Oo?d_2ex8wz;%$1P0oKJpED}I-
z_1yW}9>2bw!y)G!APXejG^P<#lY)yceExlZ)8Gwm#sijTL3Ik{2Nh+FJKgQ)_@<@I
zs~*-sL;}`LAQbY@I4v7pc=oN=13Ceu=*xpwyqMjRTbj;ffUpEKO!4a9mZqF7IvlFv
zKl$R5*;Id}00Xe;EckvbM(2#(g|=tSXlDg~f^(>ufoqCqD{uN=@8b;*uBn!e`s)tX
zBl1-YwurPRcTmn>b<N<8RURve+Z4Zjlnq=z78$$`xea-r{O84gSqPxP%={CcjGohg
z+C}$C&$hLCOU{eYXV)C!59T)S4<P<s99pdbFaUq&V<GrC@Od13u1uU49Qei3^Im%}
z-Im^Ly80jhg%F~5B#*<n*AfwTED@KD&z?X~jo-cyUc6En^g{vR06y5N3`8X0G8lNA
zUJMNSOP3B<`LI_^3tI~P+KIM{2+l=9sgH^#G|98IdQ0|;;b&L=B>Y$qsfogf8DQNk
zyk37V{E<OBUhThnZn`Z!VkxLaPZT7cvw%(j$-S-i%gon<E1$1*R1edr4v~n+3*>Kn
ztlxsC`#JK0mTjU)S9U<oSwNjYk^wlQT2y+k^6fEAMsq=-Sh&kP$DLSK;qL6Aozs9i
zfFzn*KN8xW%+}HNbad4GTkC51^_&OPE^kar9AZzT4+L!|{u5;stvdz$p9LTbq~s%{
zmLQl~vbAm(?SD3aIw{YzkH-62U+Zgqt*`x@+W!G*5wFQIHMYV40000<MNUMnLSTY?
C7G)3s

diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index 87295085c..60d6c6a6e 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -85,12 +85,20 @@
         android:autoText="true"
         android:capitalize="sentences"
         android:singleLine="false" />
+                
+      <!-- separator -->
+      <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:padding="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
         
       <!-- buttons -->
       <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:gravity="bottom"
         android:paddingTop="5dip"
         android:baselineAligned="false">
         <Button
@@ -209,12 +217,20 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content" />
       </LinearLayout>
-      
+              
+      <!-- separator -->
+      <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:padding="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+        
       <!-- buttons -->
       <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:gravity="bottom"
         android:paddingTop="5dip"
         android:baselineAligned="false">
         <Button
@@ -252,6 +268,11 @@
       android:layout_height="fill_parent">
 
       <!-- calendar integration -->      
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/TEA_calendar_label"
+        style="@style/TextAppearance.GEN_EditLabel" />
       <CheckBox
         android:id="@+id/add_to_calendar"
         android:layout_width="fill_parent"
@@ -291,11 +312,19 @@
         android:id="@+id/elapsedDuration"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" />
+                
+      <!-- separator -->
+      <View
+        android:layout_width="fill_parent"
+        android:layout_height="1dip"
+        android:padding="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
         
       <LinearLayout
         android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:gravity="bottom"
         android:paddingTop="5dip"
         android:baselineAligned="false">
         <Button
diff --git a/astrid/res/values/strings-3.0.xml b/astrid/res/values/strings-3.0.xml
index 465d890b7..08783f896 100644
--- a/astrid/res/values/strings-3.0.xml
+++ b/astrid/res/values/strings-3.0.xml
@@ -30,6 +30,11 @@
     <item quantity="one">1 Month</item>
     <item quantity="other">%d Months</item>
   </plurals>
+  <plurals name="DUt_weeks">
+    <!-- plurals: days -->
+    <item quantity="one">1 Week</item>
+    <item quantity="other">%d Weeks</item>
+  </plurals>
   <plurals name="DUt_days">
     <!-- plurals: days -->
     <item quantity="one">1 Day</item>
@@ -267,7 +272,10 @@ to the plugin creator for fastest service.
   <string name="TEA_elapsedDuration_label">Time Already Spent on Task</string>
   
   <!-- Label for adding task to calendar -->
-  <string name="TEA_addToCalendar_label">Add Task To Calendar</string>
+  <string name="TEA_calendar_label">Calendar Integration:</string>
+  
+  <!-- Label for adding task to calendar -->
+  <string name="TEA_addToCalendar_label">Create Calendar Event</string>
   
   <!-- Label when calendar event already exists -->
   <string name="TEA_showCalendar_label">Open Calendar Event</string>
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index f17456f94..df6dfa98e 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -37,6 +37,7 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.Editable;
+import android.text.Html;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -966,8 +967,7 @@ public final class TaskEditActivity extends TabActivity {
     public class ReminderControlSet implements TaskEditControlSet {
         private final CheckBox during, after, random;
         private final Spinner mode;
-        private final long periodic = Preferences.getIntegerFromString(R.string.p_notif_defaultRemind)
-            * DateUtilities.ONE_DAY;
+        private long periodic;
 
         public ReminderControlSet(int duringId, int afterId, int randomId, int modeId) {
             during = (CheckBox)findViewById(duringId);
@@ -975,8 +975,9 @@ public final class TaskEditActivity extends TabActivity {
             random = (CheckBox)findViewById(randomId);
             mode = (Spinner)findViewById(modeId);
 
-            random.setText(getString(R.string.TEA_reminder_random,
-                    dateUtilities.getDurationString(periodic, 1, true)));
+            periodic = Preferences.getIntegerFromString(R.string.p_notif_defaultRemind)
+                * DateUtilities.ONE_DAY;
+            updatePeriodicString();
 
             String[] list = new String[] {
                     getString(R.string.TEA_reminder_alarm_off),
@@ -988,6 +989,15 @@ public final class TaskEditActivity extends TabActivity {
             mode.setAdapter(adapter);
         }
 
+        @SuppressWarnings("nls")
+        private void updatePeriodicString() {
+            if(periodic == 0)
+                periodic = DateUtilities.ONE_WEEK;
+            String dateString = "<a href='#'>" + dateUtilities.getDurationString(periodic, 1, true) + "</a>";
+            random.setText(Html.fromHtml(getString(R.string.TEA_reminder_random,
+                    dateString)));
+        }
+
         public void setValue(int flags) {
             during.setChecked((flags & Task.NOTIFY_AT_DEADLINE) > 0);
             after.setChecked((flags &
@@ -1010,6 +1020,11 @@ public final class TaskEditActivity extends TabActivity {
         @Override
         public void readFromModel() {
             setValue(model.getValue(Task.NOTIFICATION_FLAGS));
+            periodic = model.getValue(Task.NOTIFICATIONS);
+            if(periodic > 0) {
+                random.setChecked(true);
+                updatePeriodicString();
+            }
         }
 
         @Override
diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
index 645f7a5af..ca91a66d8 100644
--- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
+++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
@@ -73,6 +73,7 @@ public class AstridDependencyInjector implements AbstractDependencyInjector {
         injectables.put("dateUtilities", DateUtilities.class);
         injectables.put("yearsResource", R.plurals.DUt_years);
         injectables.put("monthsResource", R.plurals.DUt_months);
+        injectables.put("weeksResource", R.plurals.DUt_weeks);
         injectables.put("daysResource", R.plurals.DUt_days);
         injectables.put("hoursResource", R.plurals.DUt_hours);
         injectables.put("minutesResource", R.plurals.DUt_minutes);
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index dd2aab7e1..8d4f42e6b 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -19,12 +19,12 @@ import com.timsu.astrid.appwidget.AstridAppWidgetProvider.UpdateService;
 import com.timsu.astrid.sync.SynchronizationService;
 import com.timsu.astrid.utilities.BackupService;
 import com.timsu.astrid.utilities.Notifications;
-import com.timsu.astrid.utilities.Preferences;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.service.ExceptionService;
 import com.todoroo.andlib.service.ExceptionService.TodorooUncaughtExceptionHandler;
 import com.todoroo.astrid.utility.Constants;
+import com.todoroo.astrid.utility.Preferences;
 
 /**
  * Service which handles jobs that need to be run when user's phone or Astrid
@@ -73,7 +73,7 @@ public class StartupService extends BroadcastReceiver {
         ContextManager.setContext(context);
 
         // read current version
-        int latestSetVersion = Preferences.getCurrentVersion(context);
+        int latestSetVersion = Preferences.getCurrentVersion();
         int version = 0;
         try {
             PackageManager pm = context.getPackageManager();
@@ -87,7 +87,7 @@ public class StartupService extends BroadcastReceiver {
         boolean justUpgraded = latestSetVersion != version;
         if(justUpgraded) {
             upgradeService.performUpgrade(latestSetVersion);
-        	Preferences.setCurrentVersion(context, version);
+        	Preferences.setCurrentVersion(version);
         }
 
         // perform startup activities in a background thread
@@ -113,7 +113,7 @@ public class StartupService extends BroadcastReceiver {
             }
         }).start();
 
-        Preferences.setPreferenceDefaults(context);
+        Preferences.setPreferenceDefaults();
 
         // check for task killers
         if(!Constants.OEM)
@@ -122,8 +122,10 @@ public class StartupService extends BroadcastReceiver {
         hasStartedUp = true;
     }
 
+    private static final String P_TASK_KILLER_HELP = "taskkiller"; //$NON-NLS-1$
+
     private static void showTaskKillerHelp(final Context context) {
-        if(!Preferences.shouldShowTaskKillerHelp(context))
+        if(!Preferences.getBoolean(P_TASK_KILLER_HELP, false))
             return;
 
         // search for task killers. if they exist, show the help!
@@ -142,7 +144,7 @@ public class StartupService extends BroadcastReceiver {
                         @Override
                         public void onClick(DialogInterface arg0,
                                 int arg1) {
-                            Preferences.disableTaskKillerHelp(context);
+                            Preferences.setBoolean(P_TASK_KILLER_HELP, true);
                         }
                     };
 
diff --git a/astrid/src/com/todoroo/astrid/utility/Preferences.java b/astrid/src/com/todoroo/astrid/utility/Preferences.java
index 40c030077..58fa5b6e9 100644
--- a/astrid/src/com/todoroo/astrid/utility/Preferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/Preferences.java
@@ -13,7 +13,6 @@ import com.todoroo.astrid.model.Task;
 public class Preferences {
 
     private static final String P_CURRENT_VERSION = "cv"; //$NON-NLS-1$
-    private static final String P_READ_INTRODUCTION = "ri"; //$NON-NLS-1$
 
     /** Set preference defaults, if unset. called at startup */
     public static void setPreferenceDefaults() {
@@ -52,20 +51,6 @@ public class Preferences {
         editor.commit();
     }
 
-    /** ReadIntroduction: whether the user has read the introductory notes */
-    public static boolean hasReadIntroduction() {
-        Context context = ContextManager.getContext();
-        return getPrefs(context).getBoolean(P_READ_INTRODUCTION, false);
-    }
-
-    /** ReadIntroduction: whether the user has read the introductory notes */
-    public static void setReadIntroduction(boolean value) {
-        Context context = ContextManager.getContext();
-        Editor editor = getPrefs(context).edit();
-        editor.putBoolean(P_READ_INTRODUCTION, value);
-        editor.commit();
-    }
-
     /* ======================================================================
      * ======================================================= helper methods
      * ====================================================================== */
@@ -124,7 +109,6 @@ public class Preferences {
     /** Gets an integer value from a string preference. Returns null
      * if the value is not set or not an integer.
      *
-     * @param context
      * @param keyResource resource from string.xml
      * @return integer value, or null on error
      */
@@ -145,7 +129,6 @@ public class Preferences {
     /** Gets an float value from a string preference. Returns null
      * if the value is not set or not an flat.
      *
-     * @param context
      * @param keyResource resource from string.xml
      * @return
      */
@@ -163,7 +146,6 @@ public class Preferences {
 
     /** Gets a boolean preference (e.g. a CheckBoxPreference setting)
      *
-     * @param context
      * @param key
      * @param defValue
      * @return default if value is unset otherwise the value
@@ -172,4 +154,26 @@ public class Preferences {
         Context context = ContextManager.getContext();
         return getPrefs(context).getBoolean(key, defValue);
     }
+
+    /** Gets a boolean preference (e.g. a CheckBoxPreference setting)
+     *
+     * @param keyResource
+     * @param defValue
+     * @return default if value is unset otherwise the value
+     */
+    public static boolean getBoolean(int keyResources, boolean defValue) {
+        return getBoolean(ContextManager.getString(keyResources), defValue);
+    }
+
+    /**
+     * Sets boolean preference
+     * @param key
+     * @param value
+     */
+    public static void setBoolean(String key, boolean value) {
+        Context context = ContextManager.getContext();
+        Editor editor = getPrefs(context).edit();
+        editor.putBoolean(key, value);
+        editor.commit();
+    }
 }