Fix for AST-291 - task est time tally now 999, AST-215 - cancel specific day/time goes back

astrid/res/values/strings-core.xml

@@ -280,11 +280,8 @@ to the plugin creator for fastest service.
   <!-- Menu: Delete Task -->
   <string name="TEA_menu_delete">Delete Task</string>
   
-   <!-- Toast: task saved with deadline (%s => time units) -->
-  <string name="TEA_onTaskSave_due">Task Saved: due in %s</string>
-  
-  <!-- Toast: task saved with deadline in past (%s => time units) -->
-  <string name="TEA_onTaskSave_overdue">Task Saved: due %s ago</string>
+   <!-- Toast: task saved with deadline (%s => preposition + time units) -->
+  <string name="TEA_onTaskSave_due">Task Saved: due %s</string>
   
   <!-- Toast: task saved without deadlines -->
   <string name="TEA_onTaskSave_notDue">Task Saved</string>

astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java

@@ -451,16 +451,9 @@ public final class TaskEditActivity extends TabActivity {
 
         long due = model.getValue(Task.DUE_DATE);
         if (due != 0) {
-            long dueFromNow = due - System.currentTimeMillis();
-
-            if (dueFromNow < 0) {
-                stringResource = R.string.TEA_onTaskSave_overdue;
-            } else {
-                stringResource = R.string.TEA_onTaskSave_due;
-            }
+            stringResource = R.string.TEA_onTaskSave_due;
             CharSequence formattedDate =
-                DateUtils.getRelativeTimeSpanString(dueFromNow, DateUtilities.now(),
-                        DateUtils.MINUTE_IN_MILLIS, 0);
+                DateUtils.getRelativeTimeSpanString(due);
             Toast.makeText(this,
                     getResources().getString(stringResource, formattedDate),
                     Toast.LENGTH_SHORT).show();
@@ -853,6 +846,8 @@ public final class TaskEditActivity extends TabActivity {
                         this, 1900 + customDate.getYear(), customDate.getMonth(), customDate.getDate());
                 datePicker.setOnCancelListener(this);
                 datePicker.show();
+
+                spinner.setSelection(previousSetting);
             } else {
                 previousSetting = position;
                 model.setValue(Task.DUE_DATE, item.dueDate);

astrid/src/com/todoroo/astrid/ui/NumberPicker.java

@@ -106,7 +106,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
     private int                                mPrevious;
     private OnChangedListener                  mListener;
     private Formatter                          mFormatter;
-    private long                               mSpeed              = 300;
+    private long                               mSpeed              = 60;
 
     private boolean                            mIncrement;
     private boolean                            mDecrement;

astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java

@@ -26,18 +26,13 @@ import android.view.View;
 import android.widget.Button;
 
 import com.timsu.astrid.R;
-import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.ui.NNumberPickerDialog.OnNNumberPickedListener;
 
 @SuppressWarnings("nls")
 public class TimeDurationControlSet implements OnNNumberPickedListener,
         View.OnClickListener {
 
-    @Autowired
-    DateUtilities dateUtilities;
-
     private final Activity activity;
     private final Button timeButton;
     private final NNumberPickerDialog dialog;
@@ -57,7 +52,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
         dialog = new NNumberPickerDialog(activity, this,
                 activity.getResources().getString(titleResource),
                 new int[] {0, 0}, new int[] {1, 5}, new int[] {0, 0},
-                new int[] {99, 59}, new String[] {":", null});
+                new int[] {999, 59}, new String[] {":", null});
         final NumberPicker hourPicker = dialog.getPicker(0);
         final NumberPicker minutePicker = dialog.getPicker(1);
         minutePicker.setFormatter(new NumberPicker.Formatter() {
@@ -101,10 +96,8 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
 
         String prefix = "";
         if (prefixResource != 0)
-            prefix = r.getString(prefixResource);
-        timeButton.setText(prefix
-                + " "
-                + DateUtils.getRelativeTimeSpanString(activity, timeDurationInSeconds * 1000L));
+            prefix = r.getString(prefixResource) + " ";
+        timeButton.setText(prefix + DateUtils.formatElapsedTime(timeDuration));
         int hours = timeDuration / 3600;
         int minutes = timeDuration / 60 - 60 * hours;
         dialog.setInitialValues(new int[] { hours, minutes });