feat: Added the logic to display the user drawn clipart to the badge. (…

…#981)

lib/bademagic_module/bluetooth/base_ble_state.dart

@@ -45,8 +45,6 @@ abstract class RetryBleState extends BleState {
         attempt++;
         if (attempt < _maxRetries) {
           logger.d("Retrying ($attempt/$_maxRetries)...");
-          await Future.delayed(
-              const Duration(seconds: 2)); // Wait before retrying
         } else {
           logger.e("Max retries reached. Last exception: $lastException");
           lastException =

lib/bademagic_module/utils/converters.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 import 'package:badgemagic/bademagic_module/utils/byte_array_utils.dart';
 import 'package:badgemagic/bademagic_module/utils/data_to_bytearray_converter.dart';
+import 'package:badgemagic/bademagic_module/utils/file_helper.dart';
 import 'package:badgemagic/bademagic_module/utils/image_utils.dart';
 import 'package:badgemagic/providers/imageprovider.dart';
 import 'package:get_it/get_it.dart';
@@ -10,6 +11,7 @@ class Converters {
       GetIt.instance.get<InlineImageProvider>();
   DataToByteArrayConverter converter = DataToByteArrayConverter();
   ImageUtils imageUtils = ImageUtils();
+  FileHelper fileHelper = FileHelper();
 
   int controllerLength = 0;
 
@@ -18,10 +20,20 @@ class Converters {
     for (int x = 0; x < message.length; x++) {
       if (message[x] == '<' && message[min(x + 5, message.length - 1)] == '>') {
         int index = int.parse(message[x + 2] + message[x + 3]);
-        List<String> hs =
-            await imageUtils.generateLedHex(controllerData.vectors[index]);
-        hexStrings.addAll(hs);
-        x += 5;
+        var key = controllerData.imageCache.keys.toList()[index];
+        if (key is List) {
+          String filename = key[0];
+          logger.d("Filename: $filename");
+          List<List<int>>? image = await fileHelper.readFromFile(filename);
+          logger.d("Image: $image");
+          hexStrings = convertBitmapToLEDHex(image!, true);
+          x += 5;
+        } else {
+          List<String> hs =
+              await imageUtils.generateLedHex(controllerData.vectors[index]);
+          hexStrings.addAll(hs);
+          x += 5;
+        }
       } else {
         if (converter.charCodes.containsKey(message[x])) {
           hexStrings.add(converter.charCodes[message[x]]!);
@@ -33,7 +45,8 @@ class Converters {
 
   //function to convert the bitmap to the LED hex format
   //it takes the 2D list of pixels and converts it to the LED hex format
-  static List<String> convertBitmapToLEDHex(List<List<int>> image) {
+  static List<String> convertBitmapToLEDHex(
+      List<List<int>> image, bool isDrawn) {
     // Determine the height and width of the image
     int height = image.length;
     int width = image.isNotEmpty ? image[0].length : 0;
@@ -132,7 +145,7 @@ class Converters {
 
       allHexs.add(lineHex.toString()); // Store completed hexadecimal line
     }
-
+    logger.d("All hexs: $allHexs");
     return allHexs; // Return list of hexadecimal strings
   }
 }

lib/bademagic_module/utils/file_helper.dart

@@ -28,23 +28,14 @@ class FileHelper {
     return File(path).writeAsString(data);
   }
 
-  // static Future<String> _readFromFile(String filename) async {
-  //   try {
-  //     final path = await _getFilePath(filename);
-  //     return await File(path).readAsString();
-  //   } catch (e) {
-  //     return ''; // Return an empty string if there's an error
-  //   }
-  // }
-
   static String _generateUniqueFilename() {
     final String uniqueId = uuid.v4();
     final String timestamp = DateTime.now().millisecondsSinceEpoch.toString();
     return 'data_${timestamp}_$uniqueId.json';
   }
 
   // Add a new image to the cache
-  void addToCache(Uint8List imageData) {
+  void addToCache(Uint8List imageData, String filename) {
     int key;
     if (imageCacheProvider.availableKeys.isNotEmpty) {
       // Reuse the lowest available key
@@ -57,7 +48,11 @@ class FileHelper {
         key++;
       }
     }
-    imageCacheProvider.imageCache[key] = imageData;
+    //storing the user drawn clipart to the badge in the form of a list
+    //the first element of the list is the filename and the second element is the key
+    //while parsing the vector we can take the filename and generate the hex for that vector
+    //therefore transfering the vector to the physiacl badge will be easier.
+    imageCacheProvider.imageCache[[filename, key]] = imageData;
   }
 
   // Remove an image from the cache
@@ -70,13 +65,14 @@ class FileHelper {
   }
 
   // Generate a Uint8List from a 2D list (image data) and add it to the cache
-  Future<void> _addImageDataToCache(List<List<dynamic>> imageData) async {
+  Future<void> _addImageDataToCache(
+      List<List<dynamic>> imageData, String filename) async {
     // Convert List<List<dynamic>> to List<List<int>>
     List<List<int>> intImageData =
         imageData.map((list) => list.cast<int>()).toList();
     Uint8List imageBytes =
         await imageUtils.convert2DListToUint8List(intImageData);
-    addToCache(imageBytes);
+    addToCache(imageBytes, filename);
   }
 
   // Read all files, parse the 2D lists, and add to cache
@@ -92,7 +88,7 @@ class FileHelper {
           final List<dynamic> decodedData = jsonDecode(content);
           final List<List<dynamic>> imageData =
               decodedData.cast<List<dynamic>>();
-          await _addImageDataToCache(imageData);
+          await _addImageDataToCache(imageData, file.path.split('/').last);
         }
       }
     }
@@ -126,6 +122,28 @@ class FileHelper {
     logger.d('Image saved to file: $filename');
 
     //Add the image to the image cache after saving it to a file
-    await _addImageDataToCache(image);
+    await _addImageDataToCache(image, filename);
+  }
+
+  Future<List<List<int>>?> readFromFile(String filename) async {
+    try {
+      final path = await _getFilePath(filename);
+      final file = File(path);
+      if (await file.exists()) {
+        final content = await file.readAsString();
+        final List<dynamic> decodedData = jsonDecode(content);
+        final List<List<dynamic>> image = decodedData.cast<List<dynamic>>();
+        //COnvert the List<list<Dynamic>> to List<List<int>>
+        List<List<int>> imageData =
+            image.map((list) => list.cast<int>()).toList();
+        return imageData;
+      } else {
+        logger.d('File not found: $filename');
+        return null;
+      }
+    } catch (e) {
+      logger.e('Error reading file: $e');
+      return null;
+    }
   }
 }

lib/bademagic_module/utils/image_utils.dart

@@ -223,6 +223,6 @@ class ImageUtils {
       }
     }
     logger.d("Pixel Array generated = $pixelArray");
-    return Converters.convertBitmapToLEDHex(pixelArray);
+    return Converters.convertBitmapToLEDHex(pixelArray, false);
   }
 }

lib/providers/imageprovider.dart

@@ -53,7 +53,7 @@ class InlineImageProvider extends ChangeNotifier {
   //Map to store the cache of the images generated
   //Image caches are generated at the splash screen
   //The cache generation time acts as a delay in the splash screen
-  Map<int, Uint8List?> imageCache = {};
+  Map<Object, Uint8List?> imageCache = {};
 
   //function that generates the image cache
   //it fills the map with the Unit8List(byte Array) of the images
@@ -71,7 +71,14 @@ class InlineImageProvider extends ChangeNotifier {
     notifyListeners();
   }
 
-  void insertInlineImage(int index) {
+  void insertInlineImage(Object key) {
+    int index = 0;
+    if (key is int) {
+      index = key;
+    } else if (key is List) {
+      index = key[1];
+    }
+    logger.d('Inserting image at index: $index');
     String placeholder = index < 10 ? '<<0$index>>' : '<<$index>>';
     int cursorPos =
         message.selection.baseOffset == -1 ? 0 : message.selection.baseOffset;

lib/view/special_text_field.dart

@@ -17,7 +17,12 @@ class InlineImageText extends SpecialText {
     final String key = toString();
 
     // Parse the index from the placeholder text
-    final int vectorIndex = int.parse(key.substring(2, key.length - 2));
+    final int index = int.parse(key.substring(2, key.length - 2));
+    Object vectorIndex = index;
+    var keyAt = textData.imageCache.keys.toList()[index];
+    if (keyAt is List) {
+      vectorIndex = keyAt;
+    }
 
     return ImageSpan(MemoryImage(textData.imageCache[vectorIndex]!),
         imageWidth: 25.w,

lib/view/widgets/vectorview.dart

@@ -14,6 +14,7 @@ class _VectorGridViewState extends State<VectorGridView> {
   Widget build(BuildContext context) {
     InlineImageProvider inlineImageProvider =
         Provider.of<InlineImageProvider>(context);
+    List keys = inlineImageProvider.imageCache.keys.toList();
     return GridView.builder(
       shrinkWrap: true,
       gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
@@ -24,7 +25,7 @@ class _VectorGridViewState extends State<VectorGridView> {
       itemBuilder: (context, index) {
         return GestureDetector(
             onTap: () {
-              inlineImageProvider.insertInlineImage(index);
+              inlineImageProvider.insertInlineImage(keys[index]);
             },
             child: Card(
               shape: RoundedRectangleBorder(
@@ -35,10 +36,11 @@ class _VectorGridViewState extends State<VectorGridView> {
               elevation: 5,
               child: Padding(
                   padding: const EdgeInsets.all(10.0),
-                  child: Image.memory(inlineImageProvider.imageCache[index]!)),
+                  child: Image.memory(
+                      inlineImageProvider.imageCache[keys[index]]!)),
             ));
       },
-      itemCount: inlineImageProvider.imageCache.length,
+      itemCount: keys.length,
     );
   }
 }

test/converters_test.dart

@@ -25,7 +25,7 @@ void main() {
       [0, 1]
     ];
 
-    List<String> result = Converters.convertBitmapToLEDHex(image);
+    List<String> result = Converters.convertBitmapToLEDHex(image, false);
 
     expect(result, ["1008"]);
   });