From ad7b9b45f5d37ebc3f53eca1e80ba1b6a915c986 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Mon, 27 Sep 2010 18:45:31 -0700
Subject: [PATCH] Improved the details string for alarms to have an icon and
 look nicer, plus smart flags

---
 .../astrid/alarms/AlarmDetailExposer.java        |  15 +++++++++++----
 astrid/res/drawable/silk_clock.png               | Bin 0 -> 882 bytes
 astrid/res/values/strings-alarms.xml             |   3 ---
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 astrid/res/drawable/silk_clock.png

diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
index b3c584136..b78dfcdbc 100644
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmDetailExposer.java
@@ -3,12 +3,13 @@
  */
 package com.todoroo.astrid.alarms;
 
+import java.util.Date;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.text.format.DateUtils;
 
-import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -60,10 +61,16 @@ public class AlarmDetailExposer extends BroadcastReceiver {
 
             if(nextTime == -1)
                 return null;
+            int flags = DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME;
+            Date today = new Date();
+            Date alarm = new Date(nextTime);
+            if(today.getYear() == alarm.getYear())
+                flags |= DateUtils.FORMAT_NO_YEAR;
+            if(alarm.getTime() - today.getTime() > DateUtilities.ONE_DAY)
+                flags |= DateUtils.FORMAT_SHOW_DATE;
             CharSequence durationString = DateUtils.formatDateTime(context, nextTime,
-                    DateUtils.FORMAT_NUMERIC_DATE | DateUtils.FORMAT_SHOW_TIME |
-                    DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_NO_YEAR);
-            return context.getString(R.string.alarm_ADE_detail, durationString);
+                     flags);
+            return "<img src='silk_clock'/> " + durationString; //$NON-NLS-1$
         } finally {
             cursor.close();
         }
diff --git a/astrid/res/drawable/silk_clock.png b/astrid/res/drawable/silk_clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2672c20676177efb2fdea593b8f000fd5f12342
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#1W80eR5;6B
zlWRy*aTvxAfdmnKi~14-eUK;$q8mkl5EVf|(1&gYK^LlpSeBJm8)TVTnVG1Wx7DPT
z({y&Xt>Zkp%;s8}r<n_v<=W;h$76bQdwTyvM|I$LczECEdH$R~91Z|C+{jHM)P$XQ
zM@(n)zoFTj$-R|GoSJh11D8PL47cz3uJ}v{weR&<>$h6cUMpt8KZ&`memftw9r2BH
zXZp!+CFaEnJk?xA$eKJbHrNPn>;Axd{TeCT;zL2Z2lqOE#$fse--k~9GCAnb$WrIY
zUzF=05;%7ScRp;-^ba=g4+!_yjOVxZ<DvZrbo@6I8oH4Gs0$TMebCvyqwK8-pX)b8
zM%<4k2J04zluhKm7IW)*N@j>HrAy=-Qy;3W{V<qZ=yiwS3rX;Xh9UNcpnchkvSt?^
zKFNh$w|ca@WY!1DCdMuz?OwyR^cn|BEH3EjH1-SygZMJ=6Te9_q$p5i>_ws3i3@rj
zN6Uq**d4Ifp5hMksmBf!JrmJQC(GkeNV1GOW##ZtQFwF|H80+P{}RL%{YNk_%ft(I
z<njJg-3MHKV25W!!O&;~W3)J{*5JP33DPfW@KUhC5ma!Z&<f^dnRvmrE6@CgO07_r
z+t4p5R1$$Z7{;aC>#;Cz`v~ti@ZP83cwQ@*mu2Dwn=d>z@4RV(M%#h6&LDo!N4vuc
zo|;?G=MQ0U0&vMd?WX`v6t{tSSteePbgELlMO}xKy8^QHBD{2ALkbX%5TpZC;3a)d
zD?(MwgLzpdUa<Cf;c}vD<M{@plHsbp2R2s#65WR+E3lK!s{RaB!5c6S^Ri65fU)vm
z?%^ZZT6x2nTI|bxh1A<T(r#Ihdb1g-JQI?0o@3W#BMxL$%FG-87p8<D2uTiy15GA=
zV(qa~tWfE&D#Z|k=`E)#(QIjnwg^I$yzBodFdB`s3CZbnqQ0TQzjSw|X7SDpGvS|v
zX*KP_q9}sA<HUk^K~+`NOrnPvBNqMtD^EeY`9zQyAm*~!ALrBM+uxtKg#Z8m07*qo
IM6N<$g8$>8!vFvP

literal 0
HcmV?d00001

diff --git a/astrid/res/values/strings-alarms.xml b/astrid/res/values/strings-alarms.xml
index 338e19112..d5989f0c6 100644
--- a/astrid/res/values/strings-alarms.xml
+++ b/astrid/res/values/strings-alarms.xml
@@ -10,9 +10,6 @@
     <!-- Task Edit Activity: Add New Alarm -->
     <string name="alarm_ACS_button">Add an Alarm</string>
     
-    <!-- Task Detail for Alarms (%s -> time)-->
-    <string name="alarm_ADE_detail">Alarm: %s</string>
-   
     <string-array name="reminders_alarm">
       <!-- reminders related to alarm -->
       <item>Alarm!</item>