Fixed color parsing.

Author: vusters

Diff for: lib/util/utils.dart

@@ -343,6 +343,8 @@ class Utils {
 
   static Color? getColor(dynamic value) {
     if (value is String) {
+      value = value.trim();
+
       // Check for hexadecimal color pattern (with or without alpha). It begins with #
       RegExp hexColor = RegExp(r'^#?([0-9a-fA-F]{6}|[0-9a-fA-F]{8})$');
       if (hexColor.hasMatch(value)) {
@@ -352,6 +354,10 @@ class Utils {
         if (hexValue.length == 6) {
           hexValue = 'FF$hexValue'; // Add full opacity for RGB values
         }
+        // else move alpha to the front (Flutter specific)
+        else if (hexValue.length == 8) {
+          hexValue = "${hexValue.substring(6, 8)}${hexValue.substring(0, 6)}";
+        }
         // Convert to an integer and create a Color object
         try {
           return Color(int.parse('0x$hexValue'));
@@ -360,7 +366,16 @@ class Utils {
           print('Failed to convert hex to Color: $e');
           return null;
         }
+      } else if (value.startsWith("0x")) {
+        try {
+          return Color(int.parse(value));
+        } catch (e) {
+          debugPrint("fail to convert 0x to Color");
+          return null;
+        }
       }
+
+      // check for name values
       switch (value) {
         case '.transparent':
         case 'transparent':

Diff for: test/utils_test.dart

@@ -310,6 +310,66 @@ void main() {
       expect(hotelsSortWithRestaurantKey.last['price'], 100);
     });
   });
+
+  group('getColor Tests', () {
+    const myColor = Color(0xff123456);
+
+    test('color hex with #', () {
+      expect(Utils.getColor('#123456'), equals(myColor));
+    });
+
+    test('color hex without #', () {
+      expect(Utils.getColor('123456'), equals(myColor));
+    });
+
+    test('hex with alpha and #', () {
+      expect(Utils.getColor('#123456ff'), equals(myColor));
+    });
+
+    test('hex with alpha', () {
+      expect(Utils.getColor('123456ff'), equals(myColor));
+    });
+
+    test('returns null for invalid hex string', () {
+      expect(Utils.getColor('12345g'), isNull);
+    });
+
+    test('returns Color for valid integer color value', () {
+      expect(Utils.getColor(0xff123456), equals(const Color(0xff123456)));
+    });
+
+    test('test color as a string', () {
+      expect(Utils.getColor("0xff123456"), equals(const Color(0xff123456)));
+    });
+
+    test('returns correct Color for named color strings', () {
+      expect(Utils.getColor('red'), equals(Colors.red));
+      expect(Utils.getColor('blue'), equals(Colors.blue));
+    });
+
+    test('returns Colors.transparent for transparent string', () {
+      expect(Utils.getColor('transparent'), equals(Colors.transparent));
+    });
+
+    test('returns null for non-string, non-int types', () {
+      expect(Utils.getColor([255, 0, 0]), isNull);
+    });
+
+    test('returns null for undefined named colors', () {
+      expect(Utils.getColor('not a color'), isNull);
+    });
+
+    test('returns correct Color for transparent keyword variations', () {
+      expect(Utils.getColor('.transparent'), equals(Colors.transparent));
+    });
+
+    // Additional tests for each named color
+    test('returns correct Color for each named color string', () {
+      expect(Utils.getColor('black'), equals(Colors.black));
+      expect(Utils.getColor('white'), equals(Colors.white));
+      // Continue testing all other named colors...
+    });
+  });
 }
 
 void assertIconEquality(IconModel first, IconModel second) {