Merge remote-tracking branch 'origin/refactorbadgemessageprovider' into refactorbadgemessageprovider

Author: Your Name

.github/workflows/pull_request_comment.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Download artifacts
         id: download-artifacts
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var artifacts = await github.rest.actions.listWorkflowRunArtifacts({
@@ -82,7 +82,7 @@ jobs:
         
       - name: Fetch PR Number
         id: fetch-pr-number
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var fs = require('fs')
@@ -115,7 +115,7 @@ jobs:
           
       - name: Build success
         if: ${{ github.event.workflow_run.conclusion == 'success' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var issue_number = ${{ steps.fetch-pr-number.outputs.pr_number }};
@@ -238,7 +238,7 @@ jobs:
 
       - name: Build failed
         if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var issue_number = ${{ steps.fetch-pr-number.outputs.pr_number }};

lib/providers/draw_badge_provider.dart

@@ -10,27 +10,33 @@ class DrawBadgeProvider extends ChangeNotifier {
 
   List<List<bool>> _drawViewGrid =
       List.generate(11, (_) => List.generate(44, (_) => false));
-
   final List<List<bool>> _previewGrid =
       List.generate(11, (_) => List.generate(44, (_) => false));
+  final List<List<List<bool>>> _undoStack = [];
+  final List<List<List<bool>>> _redoStack = [];
 
   bool isDrawing = true;
   DrawShape _selectedShape = DrawShape.freehand;
   BadgeAnimation currentAnimation = LeftAnimation();
 
+  // ========== GETTERS ==========
   List<List<bool>> getDrawViewGrid() {
     // Merge preview + permanent grid
-    final combined = List.generate(
-        rows,
-        (i) => List.generate(cols, (j) {
-              return _drawViewGrid[i][j] || _previewGrid[i][j];
-            }));
-    return combined;
+    return List.generate(
+      rows,
+      (i) => List.generate(
+        cols,
+        (j) => _drawViewGrid[i][j] || _previewGrid[i][j],
+      ),
+    );
   }
 
   DrawShape get selectedShape => _selectedShape;
   bool getIsDrawing() => isDrawing;
+  bool get canUndo => _undoStack.isNotEmpty;
+  bool get canRedo => _redoStack.isNotEmpty;
 
+  // ========== STATE SETTERS ==========
   void toggleIsDrawing(bool drawing) {
     isDrawing = drawing;
     notifyListeners();
@@ -47,6 +53,7 @@ class DrawBadgeProvider extends ChangeNotifier {
         _previewGrid[row][col] = value;
       } else {
         _drawViewGrid[row][col] = value;
+        notifyListeners();
       }
     }
   }
@@ -60,6 +67,7 @@ class DrawBadgeProvider extends ChangeNotifier {
   }
 
   void commitGridUpdate() {
+    _pushToUndoStack();
     for (int i = 0; i < rows; i++) {
       for (int j = 0; j < cols; j++) {
         if (_previewGrid[i][j]) {
@@ -72,12 +80,14 @@ class DrawBadgeProvider extends ChangeNotifier {
   }
 
   void resetDrawViewGrid() {
+    _pushToUndoStack();
     _drawViewGrid =
         List.generate(rows, (_) => List.generate(cols, (_) => false));
     notifyListeners();
   }
 
   void updateDrawViewGrid(List<List<bool>> badgeData) {
+    _pushToUndoStack();
     for (int i = 0; i < rows; i++) {
       for (int j = 0; j < cols; j++) {
         _drawViewGrid[i][j] =
@@ -92,10 +102,41 @@ class DrawBadgeProvider extends ChangeNotifier {
     final col = (position.dx / cellSize).floor();
     return GridPosition(row, col);
   }
+
+  // ========== UNDO / REDO ==========
+  void _pushToUndoStack() {
+    _undoStack.add(_copyGrid(_drawViewGrid));
+    _redoStack.clear(); // Invalidate redo stack on new action
+  }
+
+  void pushToUndoStack() {
+    _pushToUndoStack(); // Existing private method
+  }
+
+  void undo() {
+    if (_undoStack.isNotEmpty) {
+      _redoStack.add(_copyGrid(_drawViewGrid));
+      _drawViewGrid = _undoStack.removeLast();
+      notifyListeners();
+    }
+  }
+
+  void redo() {
+    if (_redoStack.isNotEmpty) {
+      _undoStack.add(_copyGrid(_drawViewGrid));
+      _drawViewGrid = _redoStack.removeLast();
+      notifyListeners();
+    }
+  }
+
+  List<List<bool>> _copyGrid(List<List<bool>> grid) {
+    return grid.map((row) => List<bool>.from(row)).toList();
+  }
 }
 
 class GridPosition {
   final int x;
   final int y;
+
   GridPosition(this.x, this.y);
 }

lib/view/draw_badge_screen.dart

@@ -97,25 +97,32 @@ class _DrawBadgeState extends State<DrawBadge> {
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      // Main action buttons - centered and closer together
                       Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          _buildCompactButton(true, Icons.edit, 'Draw'),
-                          const SizedBox(width: 8),
-                          _buildCompactButton(false, Icons.delete, 'Erase'),
-                          const SizedBox(width: 8),
-                          _buildResetButton(),
-                          const SizedBox(width: 8),
-                          _buildSaveButton(fileHelper),
-                          const SizedBox(width: 8),
-                          _buildShapesToggleButton(),
+                          Flexible(
+                              child: _buildCompactButton(
+                                  true, Icons.edit, 'Draw')),
+                          const SizedBox(width: 2),
+                          Flexible(
+                              child: _buildCompactButton(
+                                  false, Icons.delete, 'Erase')),
+                          const SizedBox(width: 2),
+                          Flexible(child: _buildResetButton()),
+                          const SizedBox(width: 2),
+                          Flexible(child: _buildSaveButton(fileHelper)),
+                          const SizedBox(width: 2),
+                          Flexible(child: _buildShapesToggleButton()),
+                          const SizedBox(width: 2),
+                          Flexible(child: _buildUndoButton()),
+                          const SizedBox(width: 2),
+                          Flexible(child: _buildRedoButton()),
                         ],
                       ),
+                      const SizedBox(height: 8),
                     ],
                   ),
                 ),
-
                 // Shape options - only show when toggled, fixed height
                 if (_showShapeOptions)
                   Container(
@@ -126,16 +133,16 @@ class _DrawBadgeState extends State<DrawBadge> {
                       children: [
                         _buildCompactShapeCard(
                             context, DrawShape.freehand, Icons.gesture, 'Free'),
-                        const SizedBox(width: 6),
+                        const SizedBox(width: 2),
                         _buildCompactShapeCard(context, DrawShape.square,
                             Icons.crop_square, 'Square'),
-                        const SizedBox(width: 6),
+                        const SizedBox(width: 2),
                         _buildCompactShapeCard(context, DrawShape.rectangle,
                             Icons.rectangle_outlined, 'Rect'),
-                        const SizedBox(width: 6),
+                        const SizedBox(width: 2),
                         _buildCompactShapeCard(context, DrawShape.circle,
                             Icons.circle_outlined, 'Circle'),
-                        const SizedBox(width: 6),
+                        const SizedBox(width: 2),
                         _buildCompactShapeCard(context, DrawShape.triangle,
                             Icons.change_history, 'Triangle'),
                       ],
@@ -202,7 +209,7 @@ class _DrawBadgeState extends State<DrawBadge> {
 
   Widget _buildSaveButton(FileHelper fileHelper) {
     return TextButton(
-      onPressed: () {
+      onPressed: () async {
         List<List<int>> badgeGrid = drawToggle
             .getDrawViewGrid()
             .map((e) => e.map((e) => e ? 1 : 0).toList())
@@ -211,19 +218,19 @@ class _DrawBadgeState extends State<DrawBadge> {
             Converters.convertBitmapToLEDHex(badgeGrid, false);
 
         if (widget.isSavedCard!) {
-          fileHelper.updateBadgeText(widget.filename!, hexString);
+          await fileHelper.updateBadgeText(widget.filename!, hexString);
         } else if (widget.isSavedClipart!) {
-          fileHelper.updateClipart(widget.filename!, badgeGrid);
+          await fileHelper.updateClipart(widget.filename!, badgeGrid);
         } else {
-          fileHelper.saveImage(drawToggle.getDrawViewGrid());
+          await fileHelper.saveImage(drawToggle.getDrawViewGrid());
         }
 
-        fileHelper.generateClipartCache();
+        await fileHelper.generateClipartCache();
         ToastUtils().showToast("Clipart Saved Successfully");
 
-        Future.delayed(const Duration(milliseconds: 800), () {
+        if (mounted) {
           Navigator.of(context).popUntil((route) => route.isFirst);
-        });
+        }
       },
       style: TextButton.styleFrom(
         padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
@@ -271,6 +278,62 @@ class _DrawBadgeState extends State<DrawBadge> {
     );
   }
 
+  Widget _buildUndoButton() {
+    return AnimatedBuilder(
+      animation: drawToggle,
+      builder: (context, _) {
+        final bool canUndo = drawToggle.canUndo;
+        final Color buttonColor = canUndo ? Colors.black : Colors.grey;
+
+        return TextButton(
+          onPressed: canUndo
+              ? () {
+                  drawToggle.undo();
+                }
+              : null,
+          style: TextButton.styleFrom(
+            padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+            minimumSize: const Size(60, 40),
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(Icons.undo, color: buttonColor, size: 20),
+              const SizedBox(height: 2),
+              Text('Undo', style: TextStyle(color: buttonColor, fontSize: 10)),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
+  Widget _buildRedoButton() {
+    return AnimatedBuilder(
+      animation: drawToggle,
+      builder: (context, _) {
+        final bool canRedo = drawToggle.canRedo;
+        final Color buttonColor = canRedo ? Colors.black : Colors.grey;
+
+        return TextButton(
+          onPressed: canRedo ? drawToggle.redo : null,
+          style: TextButton.styleFrom(
+            padding: const EdgeInsets.symmetric(vertical: 4, horizontal: 12),
+            minimumSize: const Size(60, 40),
+          ),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Icon(Icons.redo, color: buttonColor, size: 20),
+              const SizedBox(height: 2),
+              Text('Redo', style: TextStyle(color: buttonColor, fontSize: 10)),
+            ],
+          ),
+        );
+      },
+    );
+  }
+
   Widget _buildCompactShapeCard(
       BuildContext context, DrawShape shape, IconData icon, String label) {
     final isSelected = drawToggle.selectedShape == shape;