From c0d5bcf25cb721b921f8833fb1e7d24af477a8cf Mon Sep 17 00:00:00 2001
From: HuyNguyen <quanghnguyen@linagora.com>
Date: Mon, 11 Nov 2024 13:52:07 +0700
Subject: [PATCH] TW-2113: Fix text message overlaps time stamp in message
 bubble

---
 lib/config/app_config.dart                                  | 2 ++
 .../chat/events/message/message_content_builder_mixin.dart  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart
index bfb5030408..0837e4097f 100644
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@@ -31,6 +31,8 @@ abstract class AppConfig {
   static double bubbleSizeFactor = 1;
   static double fontSizeFactor = 1;
 
+  static const double messagePadding = 16.0;
+
   static String sampleValue = 'sampleValue';
 
   ///`REGISTRATION_URL`: Registration URL for public platform, sample is `https://example.com`
diff --git a/lib/pages/chat/events/message/message_content_builder_mixin.dart b/lib/pages/chat/events/message/message_content_builder_mixin.dart
index c808dcb854..ae1bd0d0f3 100644
--- a/lib/pages/chat/events/message/message_content_builder_mixin.dart
+++ b/lib/pages/chat/events/message/message_content_builder_mixin.dart
@@ -1,4 +1,5 @@
 import 'dart:math';
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/events/message/message_style.dart';
 import 'package:fluffychat/pages/chat/events/message_time_style.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
@@ -93,8 +94,7 @@ mixin MessageContentBuilderMixin {
     Event event,
     double maxWidth,
   ) {
-    const double leftMessagePadding = 8.0;
-    final double messageMaxWidth = maxWidth - leftMessagePadding;
+    final double messageMaxWidth = maxWidth - AppConfig.messagePadding;
     return TextPainter(
       textScaler: MediaQuery.of(context).textScaler,
       text: TextSpan(
@@ -162,7 +162,7 @@ mixin MessageContentBuilderMixin {
     double maxWidth,
   ) {
     const spaceMessageAndTime = 4.0;
-    const paddingMessage = 16.0;
+    const paddingMessage = AppConfig.messagePadding;
 
     final paintedMessageText = _paintMessageText(
       context,