From babd8d3ebddaaefc7721db218492bc7cf0304130 Mon Sep 17 00:00:00 2001 From: razeeman Date: Sun, 14 May 2023 10:14:57 +0300 Subject: [PATCH] change records filter records list date hint --- .../core/mapper/DateDividerViewDataMapper.kt | 2 +- .../util/simpletimetracker/core/mapper/TimeMapper.kt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/DateDividerViewDataMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/DateDividerViewDataMapper.kt index c9381ff1..0ffa7315 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/DateDividerViewDataMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/DateDividerViewDataMapper.kt @@ -18,7 +18,7 @@ class DateDividerViewDataMapper @Inject constructor( viewData.forEach { (timeStarted, recordViewData) -> if (!timeMapper.sameDay(timeStarted, previousTimeStarted, calendar)) { - timeMapper.formatDateYear(timeStarted) + timeMapper.formatDayDateYear(timeStarted) .let(::RecordsDateDividerViewData) .let(newViewData::add) } diff --git a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt index c83fe35f..f5598a23 100644 --- a/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt +++ b/core/src/main/java/com/example/util/simpletimetracker/core/mapper/TimeMapper.kt @@ -30,6 +30,7 @@ class TimeMapper @Inject constructor( private val dateTimeYearFormat = SimpleDateFormat("MMM d yyyy h:mm a", Locale.getDefault()) private val dateTimeYearFormatMilitary = SimpleDateFormat("MMM d yyyy HH:mm", Locale.getDefault()) + private val dayDateYearFormat = SimpleDateFormat("E, MMM d yyyy", Locale.getDefault()) private val dateYearFormat = SimpleDateFormat("MMM d yyyy", Locale.getDefault()) private val shortDayFormat = SimpleDateFormat("dd.MM", Locale.getDefault()) private val shortMonthFormat = SimpleDateFormat("MMM", Locale.getDefault()) @@ -82,6 +83,11 @@ class TimeMapper @Inject constructor( return dateYearFormat.format(time) } + // Tue, Mar 12 2021 + fun formatDayDateYear(time: Long): String = synchronized(lock) { + return dayDateYearFormat.format(time) + } + // 12.03 fun formatShortDay(time: Long): String = synchronized(lock) { return shortDayFormat.format(time) -- 2.54.0