Improved the details string for alarms to have an icon and look nicer, plus smart flags

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();
         }

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>