From 7c69ba820c06efdd8357f8c091fb3521cc70c411 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Wed, 28 Sep 2022 12:19:30 +0700
Subject: [PATCH] TF-981 Fix composer background color is broken

---
 .../extensions/color_extension.dart           |  5 +++++
 .../controller/rich_text_web_controller.dart  | 21 +++++--------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/core/lib/presentation/extensions/color_extension.dart b/core/lib/presentation/extensions/color_extension.dart
index e0bc95ce8..4bd2cea26 100644
--- a/core/lib/presentation/extensions/color_extension.dart
+++ b/core/lib/presentation/extensions/color_extension.dart
@@ -156,5 +156,10 @@ extension AppColor on Color {
     [Color(0xFF8DDAD5), Color(0xFF00CDAC)],
     [Color(0xFFDE9AF5), Color(0xFFD670EE)],
   ];
+
+  String toHexTriplet() => '#${(value & 0xFFFFFF)
+      .toRadixString(16)
+      .padLeft(6, '0')
+      .toUpperCase()}';
 }
 
diff --git a/lib/features/composer/presentation/controller/rich_text_web_controller.dart b/lib/features/composer/presentation/controller/rich_text_web_controller.dart
index 9b5d153f6..97ffd52cf 100644
--- a/lib/features/composer/presentation/controller/rich_text_web_controller.dart
+++ b/lib/features/composer/presentation/controller/rich_text_web_controller.dart
@@ -1,4 +1,5 @@
 
+import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:custom_pop_up_menu/custom_pop_up_menu.dart';
 import 'package:core/utils/app_logger.dart';
 import 'package:flutter/material.dart';
@@ -76,10 +77,7 @@ class RichTextWebController extends BaseRichTextController {
             context,
             selectedTextColor.value,
             onResetToDefault: () {
-              final colorAsString = (Colors.black.value & 0xFFFFFF)
-                  .toRadixString(16)
-                  .padLeft(6, '0')
-                  .toUpperCase();
+              final colorAsString = Colors.black.toHexTriplet();
               selectedTextColor.value = Colors.black;
               editorController.execCommand(
                   textStyleType.commandAction,
@@ -88,10 +86,7 @@ class RichTextWebController extends BaseRichTextController {
             },
             onSelectColor: (selectedColor) {
                 final newColor = selectedColor ?? Colors.black;
-                final colorAsString = (newColor.value & 0xFFFFFF)
-                    .toRadixString(16)
-                    .padLeft(6, '0')
-                    .toUpperCase();
+                final colorAsString = newColor.toHexTriplet();
                 log('RichTextWebController::applyRichTextStyle():selectedTextColor: colorAsString: $colorAsString');
                 selectedTextColor.value = newColor;
                 editorController.execCommand(
@@ -106,10 +101,7 @@ class RichTextWebController extends BaseRichTextController {
             context,
             selectedTextBackgroundColor.value,
             onResetToDefault: () {
-              final colorAsString = (Colors.white.value & 0xFFFFFF)
-                  .toRadixString(16)
-                  .padLeft(6, '0')
-                  .toUpperCase();
+              final colorAsString = Colors.white.toHexTriplet();
               log('RichTextWebController::applyRichTextStyle():onResetToDefault: colorAsString: $colorAsString');
               selectedTextBackgroundColor.value = Colors.white;
               editorController.execCommand(
@@ -119,10 +111,7 @@ class RichTextWebController extends BaseRichTextController {
             },
             onSelectColor: (selectedColor) {
               final newColor = selectedColor ?? Colors.white;
-              final colorAsString = (newColor.value & 0xFFFFFF)
-                  .toRadixString(16)
-                  .padLeft(6, '0')
-                  .toUpperCase();
+              final colorAsString = newColor.toHexTriplet();
               log('RichTextWebController::applyRichTextStyle():textBackgroundColor: colorAsString: $colorAsString');
               selectedTextBackgroundColor.value = newColor;
               editorController.execCommand(