diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt index d10b6a82..d65d8a09 100644 --- a/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt +++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/DateExtension.kt @@ -177,10 +177,10 @@ fun Date.getNextMinuteInMilliseconds(): Long { return calendar.time.time - this.time } -fun Date.setHourMinutes(value: String) { +fun Date.setHourMinutes(value: String, dateFormat: String = "HH:mm") { val calendar1 = Calendar.getInstance() calendar1.time = this - val calendar2 = Calendar.getInstance().apply { time = SimpleDateFormat("HH:mm", Locale.getDefault()).parse(value) } + val calendar2 = Calendar.getInstance().apply { time = SimpleDateFormat(dateFormat, Locale.getDefault()).parse(value) } calendar1.set(Calendar.HOUR_OF_DAY, calendar2.get(Calendar.HOUR_OF_DAY)) calendar1.set(Calendar.MINUTE, calendar2.get(Calendar.MINUTE)) calendar1.set(Calendar.SECOND, 0)