From d630f0ceecf25e03a520ce95faadfbdbe256483b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 23 Jun 2022 13:32:06 +0200
Subject: [PATCH] Fixed chat room last update time for AM/PM time formats

---
 app/src/main/res/layout/chat_room_list_cell.xml | 11 +++++------
 app/src/main/res/values/styles.xml              |  9 +++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/chat_room_list_cell.xml b/app/src/main/res/layout/chat_room_list_cell.xml
index b00d316bb..4cc6764e3 100644
--- a/app/src/main/res/layout/chat_room_list_cell.xml
+++ b/app/src/main/res/layout/chat_room_list_cell.xml
@@ -62,17 +62,16 @@
 
         <TextView
             android:id="@+id/date"
-            android:layout_width="wrap_content"
+            style="@style/chat_room_last_updated_time_font"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
             android:paddingRight="10dp"
-            android:singleLine="true"
-            android:text="@{data.lastUpdate, default=`12:03`}"
-            android:textColor="?attr/accentColor"
-            android:textSize="16sp"
+            android:maxLines="1"
+            android:text="@{data.lastUpdate, default=`10:11 PM`}"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/securityLevel"
             app:layout_constraintStart_toStartOf="@id/avatar"
+            app:layout_constraintEnd_toEndOf="@id/securityLevel"
             app:layout_constraintTop_toBottomOf="@id/avatar" />
 
         <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 391b58547..6cc2a3322 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -298,6 +298,15 @@
 
     <!-- Chat related -->
 
+    <style name="chat_room_last_updated_time_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/primary_color</item>
+        <item name="android:textSize">16sp</item>
+        <item name="autoSizeTextType">uniform</item>
+        <item name="autoSizeMinTextSize">8sp</item>
+        <item name="autoSizeMaxTextSize">16sp</item>
+        <item name="autoSizeStepGranularity">@dimen/settings_granularity_step</item>
+    </style>
+
     <style name="chat_message_reply_sender_font">
         <item name="android:textColor">@color/light_primary_text_color</item>
         <item name="android:textSize">13sp</item>