Support entry format for date component (#1897)

* Support Entry format for date component * spotless check applied * review comments addressed * review comments addressed * review comment addressed * Add tests from previous pr * Move entry format function to extensions package * Reorganize MoreQuestionnaireItemComponents.kt file * Add tests in MoreQuestionnaireItemComponentsTest.kt * Add comment and rename function name * Add back enable when expression utility --------- Co-authored-by: Jing Tang <[email protected]>
google · Aug 31, 2023 · 22ab365 · 22ab365
1 parent 4a75e6b
commit 22ab365
Show file tree

Hide file tree

Showing 15 changed files with 660 additions and 409 deletions.
diff --git a/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt b/datacapture/src/main/java/com/google/android/fhir/datacapture/extensions/MoreLocalDates.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Google LLC
+ * Copyright 2022-2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,19 @@ import java.lang.Character.isLetter
 import java.text.ParseException
 import java.time.LocalDate
 import java.time.ZoneId
+import java.time.chrono.IsoChronology
 import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeFormatterBuilder
+import java.time.format.FormatStyle
 import java.util.Date
+import java.util.Locale
 
 /**
  * Returns the first character that is not a letter in the given date pattern string (e.g. "/" for
- * "dd/mm/yyyy").
+ * "dd/mm/yyyy") otherwise null.
  */
-internal fun getDateSeparator(localeDatePattern: String): Char =
-  localeDatePattern.filterNot { isLetter(it) }.first()
+internal fun getDateSeparator(localeDatePattern: String): Char? =
+  localeDatePattern.filterNot { isLetter(it) }.firstOrNull()
 
 /**
  * Converts date pattern to acceptable date pattern where 2 digits are expected for day(dd) and
@@ -112,3 +116,16 @@ internal fun LocalDate.format(pattern: String? = null): String {
     DateTimeFormatter.ofPattern(pattern).format(this)
   }
 }
+
+/**
+ * Medium and long format styles use alphabetical month names which are difficult for the user to
+ * input. Use short format style which is always numerical.
+ */
+internal fun getLocalizedDatePattern(): String {
+  return DateTimeFormatterBuilder.getLocalizedDateTimePattern(
+    FormatStyle.SHORT,
+    null,
+    IsoChronology.INSTANCE,
+    Locale.getDefault()
+  )
+}