fix(cells): Time format doesn't follow the device settings (WPB-22171)

core/ui-common/src/main/kotlin/com/wire/android/util/DateAndTimeParsers.kt

@@ -62,6 +62,9 @@ fun Instant.fileDateTime(): String = DateAndTimeParsers.fileDateTime(this)
 @Stable
 fun Instant.cellFileDateTime(): String = DateAndTimeParsers.cellFileDateTime(this)
 
+@Stable
+fun Instant.cellFileTime(): String = DateAndTimeParsers.cellTimeFormat(this)
+
 @Stable
 fun Instant.uiReadReceiptDateTime(): String = DateAndTimeParsers.uiReadReceiptDateTime(this)
 
@@ -102,8 +105,6 @@ class DateAndTimeParsers private constructor() {
             .withZone(ZoneId.systemDefault()).withLocale(Locale.getDefault())
         private val fileDateTimeFormat =
             DateTimeFormatter.ofPattern("yyyy-MM-dd-hh-mm-ss", Locale.getDefault()).withZone(ZoneId.systemDefault())
-        private val cellFileDateTimeFormat =
-            DateTimeFormatter.ofPattern("MMM dd, hh:mm a", Locale.getDefault()).withZone(ZoneId.systemDefault())
         private val readReceiptDateTimeFormat =
             DateTimeFormatter.ofPattern("MMM dd yyyy,  hh:mm a", Locale.getDefault()).withZone(ZoneId.systemDefault())
         private val mediumOnlyDateTimeFormat =
@@ -156,7 +157,33 @@ class DateAndTimeParsers private constructor() {
                 null
             }
 
-        fun cellFileDateTime(instant: Instant): String = cellFileDateTimeFormat.format(instant.toJavaInstant())
+        fun cellTimeFormat(instant: Instant): String {
+            val timeFormatter = java.text.DateFormat.getTimeInstance(
+                java.text.DateFormat.SHORT,
+                Locale.getDefault()
+            ).apply {
+                timeZone = java.util.TimeZone.getDefault()
+            }
+            return timeFormatter.format(Date.from(instant.toJavaInstant()))
+        }
+
+        fun cellDateFormat(instant: Instant, showYear: Boolean = false): String {
+            val pattern = if (showYear) "MMM dd, yyyy" else "MMM dd"
+
+            val formatter = DateTimeFormatter
+                .ofPattern(pattern, Locale.getDefault())
+                .withZone(ZoneId.systemDefault())
+
+            return formatter.format(instant.toJavaInstant())
+        }
+
+        fun cellFileDateTime(instant: Instant): String {
+
+            val dateString = cellDateFormat(instant)
+            val timeString = cellTimeFormat(instant)
+
+            return "$dateString, $timeString"
+        }
 
         fun fileDateTime(instant: Instant): String = fileDateTimeFormat.format(instant.toJavaInstant())
 

features/cells/src/main/java/com/wire/android/feature/cells/ui/versioning/VersionHistoryViewModel.kt

@@ -31,6 +31,7 @@
 import com.wire.android.feature.cells.util.FileHelper
 import com.wire.android.util.FileSizeFormatter
 import com.wire.android.util.addBeforeExtension
+import com.wire.android.util.cellFileTime
 import com.wire.android.util.dispatchers.DispatcherProvider
 import com.wire.android.util.ui.UIText
 import com.wire.kalium.cells.domain.model.NodeVersion
@@ -48,7 +49,6 @@
 import java.time.LocalDate
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
 import javax.inject.Inject
 
 @HiltViewModel
@@ -138,10 +138,9 @@
 
                 val uiItems = items.mapIndexed { itemIndex, apiItem ->
 
-                    val formattedTime = Instant.ofEpochSecond(apiItem.modifiedTime?.toLong() ?: 0L)
-                        .atZone(ZoneId.systemDefault())
-                        .toLocalTime()
-                        .format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT))
+                    val formattedTime = apiItem.modifiedTime?.toLong()?.let {
+                        kotlinx.datetime.Instant.fromEpochSeconds(it).cellFileTime()
+                    } ?: ""
 
                     CellVersion(
                         versionId = apiItem.id,