add date formats that have years.
- this is useful for the SimpleCalendar app to be able to detect what parsed dates have years specified on them
This commit is contained in:
parent
c7fe72f5d4
commit
cd14df8e69
1 changed files with 16 additions and 0 deletions
|
@ -291,6 +291,12 @@ const val DATE_FORMAT_FIVE = "d MMMM yyyy"
|
|||
const val DATE_FORMAT_SIX = "MMMM d yyyy"
|
||||
const val DATE_FORMAT_SEVEN = "MM-dd-yyyy"
|
||||
const val DATE_FORMAT_EIGHT = "dd-MM-yyyy"
|
||||
const val DATE_FORMAT_NINE = "yyyyMMdd"
|
||||
const val DATE_FORMAT_TEN = "yyyy.MM.dd"
|
||||
const val DATE_FORMAT_ELEVEN = "yy-MM-dd"
|
||||
const val DATE_FORMAT_TWELVE = "yyMMdd"
|
||||
const val DATE_FORMAT_THIRTEEN = "yy.MM.dd"
|
||||
const val DATE_FORMAT_FOURTEEN = "yy/MM/dd"
|
||||
|
||||
const val TIME_FORMAT_12 = "hh:mm a"
|
||||
const val TIME_FORMAT_24 = "HH:mm"
|
||||
|
@ -372,6 +378,16 @@ fun getDateFormats() = arrayListOf(
|
|||
"MM.dd"
|
||||
)
|
||||
|
||||
fun getDateFormatsWithYear() = arrayListOf(
|
||||
DATE_FORMAT_FOUR,
|
||||
DATE_FORMAT_NINE,
|
||||
DATE_FORMAT_TEN,
|
||||
DATE_FORMAT_ELEVEN,
|
||||
DATE_FORMAT_TWELVE,
|
||||
DATE_FORMAT_THIRTEEN,
|
||||
DATE_FORMAT_FOURTEEN,
|
||||
)
|
||||
|
||||
val normalizeRegex = "\\p{InCombiningDiacriticalMarks}+".toRegex()
|
||||
|
||||
fun getConflictResolution(resolutions: LinkedHashMap<String, Int>, path: String): Int {
|
||||
|
|
Loading…
Reference in a new issue