archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove date formatting that always includes year

Browse Source
pull/384/head
Alex Baker 9 years ago
parent 8e21760b6a
commit 47d38374de
8 changed files with 23 additions and 66 deletions
Show Stats Download Patch File Download Diff File

5
src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java
Unescape Escape View File

@ -16,7 +16,6 @@ import java.util.Locale;
import static com.todoroo.andlib.utility.DateUtilities.addCalendarMonthsToUnixtime; import static com.todoroo.andlib.utility.DateUtilities.addCalendarMonthsToUnixtime;
import static com.todoroo.andlib.utility.DateUtilities.getDateString; import static com.todoroo.andlib.utility.DateUtilities.getDateString;
import static com.todoroo.andlib.utility.DateUtilities.getDateStringHideYear;
import static com.todoroo.andlib.utility.DateUtilities.getStartOfDay; import static com.todoroo.andlib.utility.DateUtilities.getStartOfDay;
import static com.todoroo.andlib.utility.DateUtilities.getTimeString; import static com.todoroo.andlib.utility.DateUtilities.getTimeString;
import static com.todoroo.andlib.utility.DateUtilities.getWeekday; import static com.todoroo.andlib.utility.DateUtilities.getWeekday;
@ -115,13 +114,13 @@ public class DateUtilitiesTest extends AndroidTestCase {
public void testGetDateStringHidingYear() { public void testGetDateStringHidingYear() {
freezeAt(newDate(2014, 1, 1)).thawAfter(new Snippet() {{ freezeAt(newDate(2014, 1, 1)).thawAfter(new Snippet() {{
assertEquals("Jan 1", getDateStringHideYear(newDateTime())); assertEquals("Jan 1", getDateString(newDateTime()));
}}); }});
} }
public void testGetDateStringWithDifferentYear() { public void testGetDateStringWithDifferentYear() {
freezeAt(newDate(2013, 12, 31)).thawAfter(new Snippet() {{ freezeAt(newDate(2013, 12, 31)).thawAfter(new Snippet() {{
assertEquals("Jan 1\n2014", getDateStringHideYear(new DateTime(2014, 1, 1, 0, 0, 0))); assertEquals("Jan 1, 2014", getDateString(new DateTime(2014, 1, 1, 0, 0, 0)));
}}); }});
} }

2
src/androidTest/java/com/todoroo/andlib/utility/RelativeDayTest.java
Unescape Escape View File

@ -55,7 +55,7 @@ public class RelativeDayTest extends AndroidTestCase {
} }
public void testRelativeDayOneWeekNextYear() { public void testRelativeDayOneWeekNextYear() {
checkRelativeDay(new DateTime().plusDays(7), "Jan 7\n2014", "Jan 7\n2014"); checkRelativeDay(new DateTime().plusDays(7), "Jan 7, 2014", "Jan 7, 2014");
} }
private void checkRelativeDay(DateTime now, String full, String abbreviated) { private void checkRelativeDay(DateTime now, String full, String abbreviated) {

62
src/main/java/com/todoroo/andlib/utility/DateUtilities.java
Unescape Escape View File

@ -99,7 +99,6 @@ public class DateUtilities {
return Arrays.binarySearch(sortedValues, search) >= 0; return Arrays.binarySearch(sortedValues, search) >= 0;
} }
public static String getLongDateString(DateTime date) { public static String getLongDateString(DateTime date) {
return getDateString("MMMM", date); return getDateString("MMMM", date);
} }
@ -113,40 +112,6 @@ public class DateUtilities {
} }
private static String getDateString(String simpleDateFormat, DateTime date) { private static String getDateString(String simpleDateFormat, DateTime date) {
String month = date.toString(simpleDateFormat);
String value;
String standardDate;
Locale locale = Locale.getDefault();
if (arrayBinaryContains(locale.getLanguage(), "ja", "ko", "zh")
|| arrayBinaryContains(locale.getCountry(), "BZ", "CA", "KE", "MN" ,"US")) {
value = "'#' d'$'";
} else {
value = "d'$' '#'";
}
value += ", yyyy";
if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")){
standardDate = date.toString(value).replace("#", month).replace("$", "\u65E5"); //$NON-NLS-1$
}else if ("ko".equals(Locale.getDefault().getLanguage())){
standardDate = date.toString(value).replace("#", month).replace("$", "\uC77C"); //$NON-NLS-1$
}else{
standardDate = date.toString(value).replace("#", month).replace("$", "");
}
return standardDate;
}
public static String getLongDateStringHideYear(DateTime date) {
return getDateStringHideYear("MMMM", date);
}
/**
* @param date date to format
* @return date, with month, day, and year
*/
public static String getDateStringHideYear(DateTime date) {
return getDateStringHideYear("MMM", date);
}
private static String getDateStringHideYear(String simpleDateFormat, DateTime date) {
String month = date.toString(simpleDateFormat); String month = date.toString(simpleDateFormat);
String value; String value;
Locale locale = Locale.getDefault(); Locale locale = Locale.getDefault();
@ -157,15 +122,14 @@ public class DateUtilities {
value = "d '#'"; value = "d '#'";
} }
if (date.getYear() != (newDateTime()).getYear()) { if (date.getYear() != newDateTime().getYear()) {
value = value + "\nyyyy"; value = value + ", yyyy";
} }
if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")) //$NON-NLS-1$
{ if (arrayBinaryContains(locale.getLanguage(), "ja", "zh")) {
return date.toString(value).replace("#", month) + "\u65E5"; //$NON-NLS-1$ return date.toString(value).replace("#", month) + "\u65E5";
} else if ("ko".equals(Locale.getDefault().getLanguage())) //$NON-NLS-1$ } else if ("ko".equals(Locale.getDefault().getLanguage())) {
{ return date.toString(value).replace("#", month) + "\uC77C";
return date.toString(value).replace("#", month) + "\uC77C"; //$NON-NLS-1$
} else { } else {
return date.toString(value).replace("#", month); return date.toString(value).replace("#", month);
} }
@ -185,12 +149,14 @@ public class DateUtilities {
return date.toString("EEE"); return date.toString("EEE");
} }
public static String getDateStringWithTime(Context context, long timestamp) { public static String getLongDateStringWithTime(Context context, long timestamp) {
return getDateStringWithTime(context, newDateTime(timestamp)); DateTime date = newDateTime(timestamp);
return getLongDateString(date) + ", " + getTimeString(context, date);
} }
public static String getDateStringWithTime(Context context, DateTime date) { public static String getDateStringWithTime(Context context, long timestamp) {
return getDateString(date) + " " + getTimeString(context, date); DateTime date = newDateTime(timestamp);
return getDateString(date) + ", " + getTimeString(context, date);
} }
/** /**
@ -216,7 +182,7 @@ public class DateUtilities {
return abbreviated ? DateUtilities.getWeekdayShort(newDateTime(date)) : DateUtilities.getWeekday(newDateTime(date)); return abbreviated ? DateUtilities.getWeekdayShort(newDateTime(date)) : DateUtilities.getWeekday(newDateTime(date));
} }
return DateUtilities.getDateStringHideYear(newDateTime(date)); return getDateString(newDateTime(date));
} }
public static long getStartOfDay(long time) { public static long getStartOfDay(long time) {

2
src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java
Unescape Escape View File

@ -194,7 +194,7 @@ public class CalendarReminderActivity extends InjectingAppCompatActivity {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
createNewList(tag.getName() + " " createNewList(tag.getName() + " "
+ DateUtilities.getDateStringHideYear(newDateTime(startTime))); + DateUtilities.getDateString(newDateTime(startTime)));
} }
}) })
.setNegativeButton(R.string.CRA_use_existing, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.CRA_use_existing, new DialogInterface.OnClickListener() {

2
src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
Unescape Escape View File

@ -473,7 +473,7 @@ public class RepeatControlSet extends PopupControlSet {
StringBuilder displayString = new StringBuilder(); StringBuilder displayString = new StringBuilder();
DateTime d = newDateTime(repeatUntilValue); DateTime d = newDateTime(repeatUntilValue);
if (d.getMillis() > 0) { if (d.getMillis() > 0) {
displayString.append(DateUtilities.getDateStringHideYear(d)); displayString.append(DateUtilities.getDateString(d));
if (Task.hasDueTime(repeatUntilValue)) { if (Task.hasDueTime(repeatUntilValue)) {
displayString.append(", "); //$NON-NLS-1$ //$NON-NLS-2$ displayString.append(", "); //$NON-NLS-1$ //$NON-NLS-2$
displayString.append(DateUtilities.getTimeString(activity, repeatUntilValue)); displayString.append(DateUtilities.getTimeString(activity, repeatUntilValue));

2
src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
Unescape Escape View File

@ -105,7 +105,7 @@ public class HideUntilControlSet extends TaskEditControlSetBase implements OnIte
spinnerItems.add(0, new HideUntilValue(DateUtilities.getDateString(newDateTime(specificDate)), spinnerItems.add(0, new HideUntilValue(DateUtilities.getDateString(newDateTime(specificDate)),
Task.HIDE_UNTIL_SPECIFIC_DAY, specificDate)); Task.HIDE_UNTIL_SPECIFIC_DAY, specificDate));
} else { } else {
spinnerItems.add(0, new HideUntilValue(DateUtilities.getDateStringWithTime(activity, newDateTime(specificDate)), spinnerItems.add(0, new HideUntilValue(DateUtilities.getDateStringWithTime(activity, specificDate),
Task.HIDE_UNTIL_SPECIFIC_DAY_TIME, specificDate)); Task.HIDE_UNTIL_SPECIFIC_DAY_TIME, specificDate));
} }
existingDate = specificDate; existingDate = specificDate;

12
src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
Unescape Escape View File

@ -32,7 +32,6 @@ import org.tasks.location.GeofenceService;
import org.tasks.location.PlacePicker; import org.tasks.location.PlacePicker;
import org.tasks.preferences.PermissionRequestor; import org.tasks.preferences.PermissionRequestor;
import org.tasks.preferences.Preferences; import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
import org.tasks.ui.HiddenTopArrayAdapter; import org.tasks.ui.HiddenTopArrayAdapter;
import java.util.ArrayList; import java.util.ArrayList;
@ -42,6 +41,7 @@ import java.util.Set;
import timber.log.Timber; import timber.log.Timber;
import static com.todoroo.andlib.utility.DateUtilities.getLongDateStringWithTime;
import static org.tasks.date.DateTimeUtils.newDateTime; import static org.tasks.date.DateTimeUtils.newDateTime;
/** /**
@ -109,7 +109,7 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
} }
public void addAlarmRow(final Long timestamp) { public void addAlarmRow(final Long timestamp) {
final View alertItem = addAlarmRow(getDisplayString(timestamp), timestamp, null); final View alertItem = addAlarmRow(getLongDateStringWithTime(activity, timestamp), timestamp, null);
TextView display = (TextView) alertItem.findViewById(R.id.alarm_string); TextView display = (TextView) alertItem.findViewById(R.id.alarm_string);
display.setOnClickListener(new OnClickListener() { display.setOnClickListener(new OnClickListener() {
@Override @Override
@ -338,14 +338,6 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
} }
} }
private String getDisplayString(long forDate) {
DateTime dateTime = newDateTime(forDate);
return (dateTime.getYear() == newDateTime().getYear()
? DateUtilities.getLongDateStringHideYear(dateTime)
: DateUtilities.getLongDateString(dateTime)) +
", " + DateUtilities.getTimeString(activity, dateTime);
}
@Override @Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
Timber.i("onItemSelected(%s, %s, %s, %s)", parent, view, position, id); Timber.i("onItemSelected(%s, %s, %s, %s)", parent, view, position, id);

2
src/main/java/org/tasks/ui/DeadlineControlSet.java
Unescape Escape View File

@ -125,7 +125,7 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
} else if (date == today.plusWeeks(1).getMillis()) { } else if (date == today.plusWeeks(1).getMillis()) {
dueDateOptions.set(0, nextWeekString); dueDateOptions.set(0, nextWeekString);
} else { } else {
dueDateOptions.set(0, DateUtilities.getLongDateStringHideYear(newDateTime(date))); dueDateOptions.set(0, DateUtilities.getLongDateString(newDateTime(date)));
} }
} }
dueDateOptions.set(3, nextWeekString); dueDateOptions.set(3, nextWeekString);

Write Preview
Loading…
Cancel
Save