enhance stringToColor with a custom defined palette from `DefaultStyles` (#2095)

* enhance stringToColor

* use individual import

---------

Co-authored-by: Łukasz Wiśniewski <lwisniewski@LP-LW-M3.fritz.box>

lib/src/common/utils/color.dart

@@ -1,6 +1,17 @@
 import 'package:flutter/material.dart';
 
-Color stringToColor(String? s, [Color? originalColor]) {
+import '../../editor/widgets/default_styles.dart';
+
+Color stringToColor(String? s,
+    [Color? originalColor, DefaultStyles? defaultStyles]) {
+  final palette = defaultStyles?.palette;
+  if (s != null && palette != null) {
+    final maybeColor = palette[s];
+    if (maybeColor != null) {
+      return maybeColor;
+    }
+  }
+
   switch (s) {
     case 'transparent':
       return Colors.transparent;

lib/src/editor/widgets/default_styles.dart

@@ -200,6 +200,7 @@ class DefaultStyles {
     this.sizeSmall,
     this.sizeLarge,
     this.sizeHuge,
+    this.palette,
   });
 
   final DefaultTextBlockStyle? h1;
@@ -236,6 +237,9 @@ class DefaultStyles {
   final DefaultTextBlockStyle? align;
   final DefaultTextBlockStyle? leading;
 
+  /// Custom palette of colors
+  final Map<String, Color>? palette;
+
   static DefaultStyles getInstance(BuildContext context) {
     final themeData = Theme.of(context);
     final defaultTextStyle = DefaultTextStyle.of(context);
@@ -518,6 +522,7 @@ class DefaultStyles {
       sizeSmall: other.sizeSmall ?? sizeSmall,
       sizeLarge: other.sizeLarge ?? sizeLarge,
       sizeHuge: other.sizeHuge ?? sizeHuge,
+      palette: other.palette ?? palette,
     );
   }
 }

lib/src/editor/widgets/text/text_line.dart

@@ -445,7 +445,7 @@ class _TextLineState extends State<TextLine> {
         if (k == Attribute.underline.key || k == Attribute.strikeThrough.key) {
           var textColor = defaultStyles.color;
           if (color?.value is String) {
-            textColor = stringToColor(color?.value, textColor);
+            textColor = stringToColor(color?.value, textColor, defaultStyles);
           }
           res = _merge(res.copyWith(decorationColor: textColor),
               s!.copyWith(decorationColor: textColor));
@@ -499,7 +499,7 @@ class _TextLineState extends State<TextLine> {
     if (color != null && color.value != null) {
       var textColor = defaultStyles.color;
       if (color.value is String) {
-        textColor = stringToColor(color.value);
+        textColor = stringToColor(color.value, null, defaultStyles);
       }
       if (textColor != null) {
         res = res.merge(TextStyle(color: textColor));
@@ -508,7 +508,8 @@ class _TextLineState extends State<TextLine> {
 
     final background = nodeStyle.attributes[Attribute.background.key];
     if (background != null && background.value != null) {
-      final backgroundColor = stringToColor(background.value);
+      final backgroundColor =
+          stringToColor(background.value, null, defaultStyles);
       res = res.merge(TextStyle(backgroundColor: backgroundColor));
     }