Skip to content

Commit ee199ce

Browse files
committed
spacing, comments and typos
1 parent 596036c commit ee199ce

File tree

4 files changed

+17
-11
lines changed

4 files changed

+17
-11
lines changed

app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,13 @@ private void setPriority(char priority) {
359359
}
360360

361361
private static Calendar parseDateString(final String dateString, final Calendar fallback) {
362-
final String dateFormat = TodoTxtTask.getDateFormat().toPattern();
363-
if (dateString == null || dateString.length() != dateFormat.length()) {
362+
if (dateString == null || dateString.length() != TodoTxtTask.DATEF_YYYY_MM_DD_LEN) {
364363
return fallback;
365364
}
366365

367366
try {
368367
Calendar calendar = Calendar.getInstance();
369-
calendar.setTime(TodoTxtTask.getDateFormat().parse(dateString));
368+
calendar.setTime(TodoTxtTask.DATEF_YYYY_MM_DD.parse(dateString));
370369
return calendar;
371370
} catch (ParseException e) {
372371
return fallback;
@@ -385,7 +384,7 @@ private void setDate() {
385384
final DatePickerDialog.OnDateSetListener listener = (_view, year, month, day) -> {
386385
Calendar fmtCal = Calendar.getInstance();
387386
fmtCal.set(year, month, day);
388-
final String newDate = TodoTxtTask.getDateFormat().format(fmtCal.getTime());
387+
final String newDate = TodoTxtTask.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
389388
text.replace(sel[0], sel[1], newDate);
390389
};
391390

@@ -404,7 +403,7 @@ private void setDueDate(final int offset) {
404403
final DatePickerDialog.OnDateSetListener listener = (_view, year, month, day) -> {
405404
Calendar fmtCal = Calendar.getInstance();
406405
fmtCal.set(year, month, day);
407-
final String newDue = "due:" + TodoTxtTask.getDateFormat().format(fmtCal.getTime());
406+
final String newDue = "due:" + TodoTxtTask.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
408407
runRegexReplaceAction(
409408
// Replace due date
410409
new ReplacePattern(TodoTxtTask.PATTERN_DUE_DATE, "$1" + newDue + "$4"),

app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtTask.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,28 @@
3131
public class TodoTxtTask {
3232

3333
//
34-
// Static memebers
34+
// Static members - date format helpers, regex generators & constants
3535
//
3636

37-
public static final String DATE_FORMAT = "yyyy-MM-dd";
37+
public static final SimpleDateFormat DATEF_YYYY_MM_DD = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
38+
public static final int DATEF_YYYY_MM_DD_LEN = "yyyy-MM-dd".length();
3839

40+
/**
41+
* Returns a SimpleDateFormat for the configured todo date format.
42+
* Falls back to {@link #DATE_FORMAT} if settings are not available or the configured pattern is invalid.
43+
* Note: This does not cache the SimpleDateFormat instance because the pattern may change at runtime.
44+
*/
3945
public static SimpleDateFormat getDateFormat() {
40-
final String fmt = ApplicationObject.settings() != null ? ApplicationObject.settings().getTodoDateFormat() : DATE_FORMAT;
46+
final String fmt = ApplicationObject.settings() != null ? ApplicationObject.settings().getTodoDateFormat() : "yyyy-MM-dd";
4147

4248
try {
4349
return new SimpleDateFormat(fmt, Locale.ROOT);
4450
} catch (IllegalArgumentException e) {
4551
// Fallback: return a default format instead of throwing
46-
return new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
52+
return DATEF_YYYY_MM_DD;
4753
}
4854
}
55+
4956
public static final String PT_DATE = "\\d{4}-\\d{2}-\\d{2}(?:[ T]\\d{2}:\\d{2}(?::\\d{2})?)?";
5057
public static final Pattern PATTERN_PROJECTS = Pattern.compile("(?:^|\\s)(?:\\++)(\\S+)");
5158
public static final Pattern PATTERN_CONTEXTS = Pattern.compile("(?:^|\\s)(?:\\@+)(\\S+)");

app/src/main/java/net/gsantner/markor/model/AppSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ public boolean isTodoAddCompletionDateEnabled() {
348348
}
349349

350350
public String getTodoDateFormat() {
351-
return getString(R.string.pref_key__todotxt__set_date_format, "hh-mm");
351+
return getString(R.string.pref_key__todotxt__set_date_format, "yyyy-MM-dd");
352352
}
353353

354354
public boolean isAppCurrentVersionFirstStart(boolean doSet) {

app/src/main/res/xml/preferences_master.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@
516516
android:summary="@string/add_completion_date_for_todos_when_marking_them_as_done"
517517
android:title="@string/add_completion_date" />
518518
<ListPreference
519-
android:defaultValue="yyyy-mm-dd"
519+
android:defaultValue="yyyy-MM-dd"
520520
android:dialogTitle="@string/theme"
521521
android:entries="@array/pref_arrdisp__todo_date_format"
522522
android:entryValues="@array/pref_arrkeys__todo_date_format"

0 commit comments

Comments
 (0)