eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TF-981 Fix composer background color is broken

Browse Source
This commit is contained in:
dab246
2022-09-28 12:19:30 +07:00
committed by Dat H. Pham
parent 22aa9acd9c
commit 7c69ba820c
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/lib/presentation/extensions/color_extension.dart
+5
View File
@@ -156,5 +156,10 @@ extension AppColor on Color {
[Color(0xFF8DDAD5), Color(0xFF00CDAC)], [Color(0xFF8DDAD5), Color(0xFF00CDAC)],
[Color(0xFFDE9AF5), Color(0xFFD670EE)], [Color(0xFFDE9AF5), Color(0xFFD670EE)],
]; ];
String toHexTriplet() => '#${(value & 0xFFFFFF)
.toRadixString(16)
.padLeft(6, '0')
.toUpperCase()}';
} }
lib/features/composer/presentation/controller/rich_text_web_controller.dart
+5 -16
View File
@@ -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:custom_pop_up_menu/custom_pop_up_menu.dart';
import 'package:core/utils/app_logger.dart'; import 'package:core/utils/app_logger.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@@ -76,10 +77,7 @@ class RichTextWebController extends BaseRichTextController {
context, context,
selectedTextColor.value, selectedTextColor.value,
onResetToDefault: () { onResetToDefault: () {
final colorAsString = (Colors.black.value & 0xFFFFFF) final colorAsString = Colors.black.toHexTriplet();
.toRadixString(16)
.padLeft(6, '0')
.toUpperCase();
selectedTextColor.value = Colors.black; selectedTextColor.value = Colors.black;
editorController.execCommand( editorController.execCommand(
textStyleType.commandAction, textStyleType.commandAction,
@@ -88,10 +86,7 @@ class RichTextWebController extends BaseRichTextController {
}, },
onSelectColor: (selectedColor) { onSelectColor: (selectedColor) {
final newColor = selectedColor ?? Colors.black; final newColor = selectedColor ?? Colors.black;
final colorAsString = (newColor.value & 0xFFFFFF) final colorAsString = newColor.toHexTriplet();
.toRadixString(16)
.padLeft(6, '0')
.toUpperCase();
log('RichTextWebController::applyRichTextStyle():selectedTextColor: colorAsString: $colorAsString'); log('RichTextWebController::applyRichTextStyle():selectedTextColor: colorAsString: $colorAsString');
selectedTextColor.value = newColor; selectedTextColor.value = newColor;
editorController.execCommand( editorController.execCommand(
@@ -106,10 +101,7 @@ class RichTextWebController extends BaseRichTextController {
context, context,
selectedTextBackgroundColor.value, selectedTextBackgroundColor.value,
onResetToDefault: () { onResetToDefault: () {
final colorAsString = (Colors.white.value & 0xFFFFFF) final colorAsString = Colors.white.toHexTriplet();
.toRadixString(16)
.padLeft(6, '0')
.toUpperCase();
log('RichTextWebController::applyRichTextStyle():onResetToDefault: colorAsString: $colorAsString'); log('RichTextWebController::applyRichTextStyle():onResetToDefault: colorAsString: $colorAsString');
selectedTextBackgroundColor.value = Colors.white; selectedTextBackgroundColor.value = Colors.white;
editorController.execCommand( editorController.execCommand(
@@ -119,10 +111,7 @@ class RichTextWebController extends BaseRichTextController {
}, },
onSelectColor: (selectedColor) { onSelectColor: (selectedColor) {
final newColor = selectedColor ?? Colors.white; final newColor = selectedColor ?? Colors.white;
final colorAsString = (newColor.value & 0xFFFFFF) final colorAsString = newColor.toHexTriplet();
.toRadixString(16)
.padLeft(6, '0')
.toUpperCase();
log('RichTextWebController::applyRichTextStyle():textBackgroundColor: colorAsString: $colorAsString'); log('RichTextWebController::applyRichTextStyle():textBackgroundColor: colorAsString: $colorAsString');
selectedTextBackgroundColor.value = newColor; selectedTextBackgroundColor.value = newColor;
editorController.execCommand( editorController.execCommand(