From c5313b5425940afce07e0d51a93d3cf1b1ae9430 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 12 Jul 2022 14:15:04 +0200
Subject: [PATCH] Use style for reply/forward texts in chat bubble

---
 app/src/main/res/layout/chat_message_list_cell.xml | 12 ++----------
 app/src/main/res/values/styles.xml                 |  8 ++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml
index fc4570fb2..90473c701 100644
--- a/app/src/main/res/layout/chat_message_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_list_cell.xml
@@ -91,37 +91,29 @@
             android:paddingBottom="5dp">
 
             <TextView
+                style="@style/chat_message_reply_forward_indicator_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
                 android:layout_marginTop="5dp"
                 android:drawablePadding="3dp"
-                android:fontFamily="sans-serif"
                 android:gravity="center_vertical"
-                android:lineSpacingExtra="3.3sp"
                 android:text="@string/chat_message_forwarded"
-                android:textColor="@color/chat_bubble_text_color"
-                android:textSize="10sp"
-                android:textStyle="normal"
                 android:visibility="@{data.chatMessage.forward ? View.VISIBLE : View.GONE, default=gone}"
                 app:drawableLeftCompat="@drawable/icon_forwarded_message"
                 tools:ignore="SmallSp" />
 
             <TextView
+                style="@style/chat_message_reply_forward_indicator_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
                 android:layout_marginRight="5dp"
                 android:layout_marginTop="5dp"
                 android:drawablePadding="3dp"
-                android:fontFamily="sans-serif"
                 android:gravity="center_vertical"
-                android:lineSpacingExtra="3.3sp"
                 android:text="@string/chat_message_replied"
-                android:textColor="@color/chat_bubble_text_color"
-                android:textSize="10sp"
-                android:textStyle="normal"
                 android:visibility="@{data.chatMessage.reply ? View.VISIBLE : View.GONE, default=gone}"
                 app:drawableLeftCompat="@drawable/icon_replied_message"
                 tools:ignore="SmallSp" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 067b3c8f2..7d008fbbf 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -329,6 +329,14 @@
         <item name="android:fontFamily">sans-serif</item>
     </style>
 
+    <style name="chat_message_reply_forward_indicator_font">
+        <item name="android:textColor">@color/chat_bubble_text_color</item>
+        <item name="android:textSize">10sp</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:lineSpacingExtra">3.3sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+    </style>
+
     <!-- Dialog related -->
 
     <style name="dialog_title_font" parent="@android:style/TextAppearance.Medium">