Merge branch 'Phoca-feature/allow-dots-in-month-and-day-pattern' into develop

Author: J-Jamet

ReadMe.md

@@ -112,21 +112,15 @@ SwitchDateTimeDialogFragment dateTimeDialogFragment = SwitchDateTimeDialogFragme
 );
 
 // Assign values
-dateTimeFragment.startAtCalendarView();
-dateTimeFragment.set24HoursMode(true);
-dateTimeFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
-dateTimeFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
-dateTimeFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
-// Or assign each element, default element is the current moment
-// dateTimeFragment.setDefaultHourOfDay(15);
-// dateTimeFragment.setDefaultMinute(20);
-// dateTimeFragment.setDefaultDay(4);
-// dateTimeFragment.setDefaultMonth(Calendar.MARCH);
-// dateTimeFragment.setDefaultYear(2017);
+dateTimeDialogFragment.startAtCalendarView();
+dateTimeDialogFragment.set24HoursMode(true);
+dateTimeDialogFragment.setMinimumDateTime(new GregorianCalendar(2015, Calendar.JANUARY, 1).getTime());
+dateTimeDialogFragment.setMaximumDateTime(new GregorianCalendar(2025, Calendar.DECEMBER, 31).getTime());
+dateTimeDialogFragment.setDefaultDateTime(new GregorianCalendar(2017, Calendar.MARCH, 4, 15, 20).getTime());
 
 // Define new day and month format
 try {
- dateTimeFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("dd MMMM", Locale.getDefault()));
+ dateTimeDialogFragment.setSimpleDateMonthAndDayFormat(new SimpleDateFormat("dd MMMM", Locale.getDefault()));
 } catch (SwitchDateTimeDialogFragment.SimpleDateMonthAndDayFormatException e) {
  Log.e(TAG, e.getMessage());
 }

switchdatetime/src/main/java/com/kunzisoft/switchdatetime/SwitchDateTimeDialogFragment.java

@@ -542,7 +542,7 @@ public SimpleDateFormat getSimpleDateMonthAndDayFormat() {
  * @param simpleDateFormat Format to show month and day
  */
  public void setSimpleDateMonthAndDayFormat(SimpleDateFormat simpleDateFormat) throws SimpleDateMonthAndDayFormatException{
- Pattern patternMonthAndDay = Pattern.compile("(M|w|W|D|d|F|E|u|\\s)*");
+ Pattern patternMonthAndDay = Pattern.compile("(M|w|W|D|d|F|E|u|\\.|\\s)*");
  Matcher matcherMonthAndDay = patternMonthAndDay.matcher(simpleDateFormat.toPattern());
  if(!matcherMonthAndDay.matches()) {
  throw new SimpleDateMonthAndDayFormatException(simpleDateFormat.toPattern() + "isn't allowed for " + patternMonthAndDay.pattern());