feat: message grouping update (#WPB-17468)

Author: sbakhtiarov

app/src/main/kotlin/com/wire/android/mapper/MessageDateGroupingMapper.kt

@@ -27,7 +27,6 @@ private const val ONE_MINUTE_FROM_MILLIS = 60 * 1000
 private const val THIRTY_MINUTES = 30
 private const val ONE_WEEK_IN_DAYS = 7
 private const val ONE_DAY = 1
-private const val FORTY_FIVE_MINUTES_DIFFERENCE = 45
 private const val MINIMUM_DAYS_DIFFERENCE = 1
 
 fun String.shouldDisplayDatesDifferenceDivider(previousDate: String): Boolean {
@@ -36,17 +35,12 @@ fun String.shouldDisplayDatesDifferenceDivider(previousDate: String): Boolean {
     val currentLocalDateTime = currentDate.serverDate()?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDateTime()
     val previousLocalDateTime = previousDate.serverDate()?.toInstant()?.atZone(ZoneId.systemDefault())?.toLocalDateTime()
 
-    val differenceInMinutes = ChronoUnit.MINUTES.between(
-        currentLocalDateTime,
-        previousLocalDateTime
-    )
-
     val differenceInDays = ChronoUnit.DAYS.between(
         currentLocalDateTime,
         previousLocalDateTime
     )
 
-    return differenceInMinutes > FORTY_FIVE_MINUTES_DIFFERENCE || differenceInDays >= MINIMUM_DAYS_DIFFERENCE
+    return differenceInDays >= MINIMUM_DAYS_DIFFERENCE
 }
 
 fun String.groupedUIMessageDateTime(now: Long): MessageDateTimeGroup? = this

app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt

@@ -1342,39 +1342,31 @@ private fun MessageGroupDateTime(
 
         is MessageDateTimeGroup.Daily -> {
             when (messageDateTimeGroup.type) {
-                MessageDateTimeGroup.Daily.Type.Today -> DateUtils.getRelativeDateTimeString(
-                    context,
-                    messageDateTime.time,
-                    DateUtils.DAY_IN_MILLIS,
-                    DateUtils.DAY_IN_MILLIS,
-                    0
-                ).toString()
-
+                MessageDateTimeGroup.Daily.Type.Today,
                 MessageDateTimeGroup.Daily.Type.Yesterday ->
-                    DateUtils.getRelativeDateTimeString(
-                        context,
+                    DateUtils.getRelativeTimeSpanString(
                         messageDateTime.time,
+                        now,
                         DateUtils.DAY_IN_MILLIS,
-                        DateUtils.DAY_IN_MILLIS * 2,
                         0
                     ).toString()
 
                 MessageDateTimeGroup.Daily.Type.WithinWeek -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE
                 )
 
                 MessageDateTimeGroup.Daily.Type.NotWithinWeekButSameYear -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_WEEKDAY or DateUtils.FORMAT_SHOW_DATE
                 )
 
                 MessageDateTimeGroup.Daily.Type.Other -> DateUtils.formatDateTime(
                     context,
                     messageDateTime.time,
-                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR or DateUtils.FORMAT_SHOW_TIME
+                    DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_DATE or DateUtils.FORMAT_SHOW_YEAR
                 )
             }
         }