#7 Trim both spaces and commas from date pattern after "Number of day…

…s to event" substitution into the pattern. Now comma disappears with disappearing "Number of days to event" string
andstatus · Mar 14, 2020 · 0c6f6b3 · 0c6f6b3
1 parent dbc0d94
commit 0c6f6b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/app/src/androidTest/java/org/andstatus/todoagenda/prefs/DateFormatterTest.java b/app/src/androidTest/java/org/andstatus/todoagenda/prefs/DateFormatterTest.java
@@ -75,12 +75,19 @@ public void customPatterns() {
         assertPattern(now, "BBB " + javaPattern + " b",  todayText + " " + javaFormatted);
         assertPattern(now.plusDays(1), "BBB " + javaPattern + " b",  tomorrowText + " " +
                 javaFormatted(javaPattern, now.plusDays(1)));
+        assertPattern(now.plusDays(1), "BBB, " + javaPattern + " b",  tomorrowText + ", " +
+                javaFormatted(javaPattern, now.plusDays(1)));
         assertPattern(now.plusDays(2), "BBB " + javaPattern + " b",
                 javaFormatted(javaPattern, now.plusDays(2)) + " 2");
+        assertPattern(now.plusDays(2), "BBB, " + javaPattern + " b",
+                javaFormatted(javaPattern, now.plusDays(2)) + " 2");
 
         assertPattern(now, "BBB " + javaPattern + " BBBB",  todayText + " " + javaFormatted);
+        assertPattern(now, "BBB " + javaPattern + ", BBBB",  todayText + " " + javaFormatted);
         assertPattern(now.plusDays(1), "BBB " + javaPattern + " BBBB",  tomorrowText + " " +
                 javaFormatted(javaPattern, now.plusDays(1)));
+        assertPattern(now.plusDays(1), "BBB " + javaPattern + ", BBBB",  tomorrowText + " " +
+                javaFormatted(javaPattern, now.plusDays(1)));
         assertPattern(now.plusDays(2), "BBB " + javaPattern + " BBBB",
                 javaFormatted(javaPattern, now.plusDays(2)) + " " + inTwoDaysText);
 

diff --git a/app/src/main/java/org/andstatus/todoagenda/prefs/dateformat/DateFormatType.java b/app/src/main/java/org/andstatus/todoagenda/prefs/dateformat/DateFormatType.java
@@ -40,7 +40,7 @@ public enum DateFormatType {
     DAY_IN_MONTH("dayInMonth", R.string.date_format_day_in_month, "dd"),
     MONTH_DAY("monthDay", R.string.date_format_month_day, "MM-dd"),
     WEEK_IN_YEAR("weekInYear", R.string.date_format_week_in_year, "ww"),
-    DEFAULT_EXAMPLE("example", R.string.pattern_example, "BBB EEEE d MMM yyyy BBBB"),
+    DEFAULT_EXAMPLE("example", R.string.pattern_example, "BBB, EEEE d MMM yyyy, BBBB"),
     PATTERN_EXAMPLE1("example1", R.string.pattern_example, "b 'days,' EEE, d MMM yyyy, 'week' ww"),
     CUSTOM("custom-01", R.string.custom_pattern, ""),
     UNKNOWN("unknown", R.string.not_found, "");

diff --git a/app/src/main/java/org/andstatus/todoagenda/prefs/dateformat/DateFormatter.java b/app/src/main/java/org/andstatus/todoagenda/prefs/dateformat/DateFormatter.java
@@ -169,10 +169,19 @@ private String preProcessNumberOfDaysToEvent(DateTime date, String pattern, int
                 replacement +
                 (ind2 < pattern.length() ? pattern.substring(ind2) : "");
 
-        return preProcessNumberOfDaysToEvent(date, pattern2.trim(), startIndex + replacement.length(),
+        return preProcessNumberOfDaysToEvent(date, trimPattern(pattern2), startIndex + replacement.length(),
                 alreadyShown || replacement.length() > 0);
     }
 
+    private String trimPattern(String pattern) {
+        String pattern2 = pattern.trim();
+        if (pattern2.endsWith(",")) pattern2 = pattern2.substring(0, pattern2.length()-1);
+        if (pattern2.startsWith(",")) pattern2 = pattern2.substring(1);
+        if (pattern2.equals(pattern)) return pattern;
+
+        return trimPattern(pattern2);
+    }
+
     private int getIndexOfNumberOfDaysLetter(String pattern, int startIndex) {
         boolean inQuotes = false;
         for (int ind = startIndex; ind < pattern.length(); ind++) {