|
|
@ -18,7 +18,6 @@
|
|
|
|
package com.timsu.astrid.activities;
|
|
|
|
package com.timsu.astrid.activities;
|
|
|
|
|
|
|
|
|
|
|
|
import java.text.Format;
|
|
|
|
import java.text.Format;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
|
|
|
@ -333,7 +332,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
|
|
|
|
DateUtilities.getDurationString(r,
|
|
|
|
DateUtilities.getDurationString(r,
|
|
|
|
Math.abs(secondsLeft), 1));
|
|
|
|
Math.abs(secondsLeft), 1));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
finishedTime = DateUtilities.getFormattedDate(r,
|
|
|
|
finishedTime = DateUtilities.getFormattedDate(activity,
|
|
|
|
task.getCompletionDate());
|
|
|
|
task.getCompletionDate());
|
|
|
|
label.append(r.getString(R.string.taskList_completedPrefix,
|
|
|
|
label.append(r.getString(R.string.taskList_completedPrefix,
|
|
|
|
finishedTime));
|
|
|
|
finishedTime));
|
|
|
@ -358,7 +357,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
|
|
|
|
label.append(DateUtilities.getDurationString(r,
|
|
|
|
label.append(DateUtilities.getDurationString(r,
|
|
|
|
(int)Math.abs(timeLeft), 1, true));
|
|
|
|
(int)Math.abs(timeLeft), 1, true));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
label.append(DateUtilities.getFormattedDate(r,
|
|
|
|
label.append(DateUtilities.getFormattedDate(activity,
|
|
|
|
task.getDefiniteDueDate()));
|
|
|
|
task.getDefiniteDueDate()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(!taskOverdue && task.getPreferredDueDate() != null) {
|
|
|
|
if(!taskOverdue && task.getPreferredDueDate() != null) {
|
|
|
@ -381,7 +380,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
|
|
|
|
label.append(DateUtilities.getDurationString(r,
|
|
|
|
label.append(DateUtilities.getDurationString(r,
|
|
|
|
(int)Math.abs(timeLeft), 1, true));
|
|
|
|
(int)Math.abs(timeLeft), 1, true));
|
|
|
|
else
|
|
|
|
else
|
|
|
|
label.append(DateUtilities.getFormattedDate(r,
|
|
|
|
label.append(DateUtilities.getFormattedDate(activity,
|
|
|
|
task.getPreferredDueDate()));
|
|
|
|
task.getPreferredDueDate()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -458,8 +457,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
|
|
|
|
if(label.length() > 0)
|
|
|
|
if(label.length() > 0)
|
|
|
|
label.append(". ");
|
|
|
|
label.append(". ");
|
|
|
|
if(alarmFormat == null)
|
|
|
|
if(alarmFormat == null)
|
|
|
|
alarmFormat = new SimpleDateFormat(
|
|
|
|
alarmFormat = Preferences.getDateWithTimeFormat(activity);
|
|
|
|
r.getString(R.string.alarmDateFormatter));
|
|
|
|
|
|
|
|
String alarmString = alarmFormat.format(nextAlarm);
|
|
|
|
String alarmString = alarmFormat.format(nextAlarm);
|
|
|
|
label.append(r.getString(R.string.taskList_alarmPrefix) +
|
|
|
|
label.append(r.getString(R.string.taskList_alarmPrefix) +
|
|
|
|
" " + alarmString);
|
|
|
|
" " + alarmString);
|
|
|
|