Merge branch 'development' into issue#1268

samruddhi-Rahegaonkar · web-flow · commit 6f6c123bde10 · 2025-07-31T14:59:24.000+05:30
diff --git a/.github/workflows/flutter_upgrade.yml b/.github/workflows/flutter_upgrade.yml
@@ -56,7 +56,7 @@ jobs:
 
           PR_URL=$(gh pr create --title "chore(deps): upgrade Flutter to ${{ env.latest_flutter_version }}" \
                        --body "This PR updates Flutter version in pubspec.yaml to the latest stable release." \
-                       --base flutter_app \
+                       --base development \
                        --head $BRANCH_NAME)
 
           # Close and reopen the PR to trigger workflows
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ The Badge Magic Android app lets you create moving text and draw clipart for LED
 
 ## Download
 
-* [Latest Release Build](https://github.com/fossasia/badgemagic-app/raw/apk/badge-magic-flutter_app-release.apk) in the apk branch
+* [Latest Release Build](https://github.com/fossasia/badgemagic-app/raw/apk/badge-magic-development-release.apk) in the apk branch
 
 ## Permissions
 * **Bluetooth**: For sending org.fossasia.badgemagic.data to the badge.
diff --git a/lib/view/draw_badge_screen.dart b/lib/view/draw_badge_screen.dart
@@ -1,4 +1,3 @@
-import 'package:badgemagic/bademagic_module/utils/byte_array_utils.dart';
 import 'package:badgemagic/bademagic_module/utils/converters.dart';
 import 'package:badgemagic/bademagic_module/utils/file_helper.dart';
 import 'package:badgemagic/bademagic_module/utils/toast_utils.dart';
@@ -14,7 +13,6 @@ class DrawBadge extends StatefulWidget {
   final bool? isSavedCard;
   final bool? isSavedClipart;
   final List<List<int>>? badgeGrid;
-
   const DrawBadge({
     super.key,
     this.filename,
@@ -28,15 +26,12 @@ class DrawBadge extends StatefulWidget {
 }
 
 class _DrawBadgeState extends State<DrawBadge> {
-  late DrawBadgeProvider drawToggle;
+  var drawToggle = DrawBadgeProvider();
 
   @override
-  void initState() {
-    super.initState();
-    drawToggle = DrawBadgeProvider();
-    WidgetsBinding.instance.addPostFrameCallback((_) {
-      _setLandscapeOrientation();
-    });
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    _setLandscapeOrientation();
   }
 
   @override
@@ -45,67 +40,27 @@ class _DrawBadgeState extends State<DrawBadge> {
     super.dispose();
   }
 
-  Future<void> _resetPortraitOrientation() async {
-    try {
-      await SystemChrome.setPreferredOrientations([
-        DeviceOrientation.portraitUp,
-        DeviceOrientation.portraitDown,
-      ]);
-    } catch (e) {
-      logger.e('Error setting portrait orientation', error: e);
-    }
-  }
-
-  Future<void> _setLandscapeOrientation() async {
-    try {
-      await SystemChrome.setPreferredOrientations([
-        DeviceOrientation.landscapeRight,
-        DeviceOrientation.landscapeLeft,
-      ]);
-    } catch (e) {
-      logger.e('Error setting landscape orientation', error: e);
-    }
+  void _resetPortraitOrientation() {
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.portraitUp,
+      DeviceOrientation.portraitDown,
+    ]);
   }
 
-  Future<void> _saveImage() async {
-    try {
-      List<List<int>> badgeGrid = drawToggle
-          .getDrawViewGrid()
-          .map((e) => e.map((e) => e ? 1 : 0).toList())
-          .toList();
-      List<String> hexString =
-          Converters.convertBitmapToLEDHex(badgeGrid, false);
-
-      if (widget.isSavedCard == true) {
-        await FileHelper().updateBadgeText(
-          widget.filename ?? '',
-          hexString,
-        );
-      } else if (widget.isSavedClipart == true) {
-        await FileHelper().updateClipart(
-          widget.filename ?? '',
-          badgeGrid,
-        );
-      } else {
-        await FileHelper().saveImage(drawToggle.getDrawViewGrid());
-      }
-
-      await FileHelper().generateClipartCache();
-      ToastUtils().showToast("Clipart Saved Successfully");
-    } catch (e) {
-      logger.e('Error saving image', error: e);
-    }
+  void _setLandscapeOrientation() {
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.landscapeRight,
+      DeviceOrientation.landscapeLeft,
+    ]);
   }
 
   @override
   Widget build(BuildContext context) {
-    return PopScope(
-      canPop: true,
-      // ignore: deprecated_member_use
-      onPopInvoked: (didPop) async {
-        if (didPop) {
-          await _resetPortraitOrientation();
-        }
+    FileHelper fileHelper = FileHelper();
+    return WillPopScope(
+      onWillPop: () async {
+        _resetPortraitOrientation();
+        return true;
       },
       child: CommonScaffold(
         index: 1,
@@ -154,7 +109,7 @@ class _DrawBadgeState extends State<DrawBadge> {
                               Text(
                                 'Draw',
                                 style: TextStyle(
-                                  color: drawToggle.getIsDrawing()
+                                  color: drawToggle.isDrawing
                                       ? colorPrimary
                                       : Colors.black,
                                 ),
@@ -172,14 +127,14 @@ class _DrawBadgeState extends State<DrawBadge> {
                             children: [
                               Icon(
                                 Icons.delete,
-                                color: drawToggle.getIsDrawing()
+                                color: drawToggle.isDrawing
                                     ? Colors.black
                                     : colorPrimary,
                               ),
                               Text(
                                 'Erase',
                                 style: TextStyle(
-                                  color: drawToggle.getIsDrawing()
+                                  color: drawToggle.isDrawing
                                       ? Colors.black
                                       : colorPrimary,
                                 ),
@@ -195,19 +150,62 @@ class _DrawBadgeState extends State<DrawBadge> {
                           },
                           child: const Column(
                             children: [
-                              Icon(Icons.refresh, color: Colors.black),
-                              Text('Reset',
-                                  style: TextStyle(color: Colors.black))
+                              Icon(
+                                Icons.refresh,
+                                color: Colors.black,
+                              ),
+                              Text(
+                                'Reset',
+                                style: TextStyle(color: Colors.black),
+                              )
                             ],
                           ),
                         ),
                         TextButton(
                           onPressed: () async {
-                            await _saveImage();
+                            try {
+                              List<List<int>> badgeGrid = drawToggle
+                                  .getDrawViewGrid()
+                                  .map((e) => e.map((e) => e ? 1 : 0).toList())
+                                  .toList();
+                              List<String> hexString =
+                                  Converters.convertBitmapToLEDHex(
+                                      badgeGrid, false);
+
+                              if (widget.isSavedCard!) {
+                                await fileHelper.updateBadgeText(
+                                    widget.filename!, hexString);
+                              } else if (widget.isSavedClipart!) {
+                                await fileHelper.updateClipart(
+                                    widget.filename!, badgeGrid);
+                              } else {
+                                await fileHelper
+                                    .saveImage(drawToggle.getDrawViewGrid());
+                              }
+
+                              await fileHelper.generateClipartCache();
+
+                              ToastUtils()
+                                  .showToast("Clipart Saved Successfully");
+
+                              await Future.delayed(
+                                  const Duration(milliseconds: 800));
+
+                              if (mounted) {
+                                Navigator.of(context)
+                                    .popUntil((route) => route.isFirst);
+                              }
+                            } catch (e) {
+                              ToastUtils().showToast(
+                                  "Failed to save badge: ${e.toString()}");
+                            }
                           },
                           child: const Column(
                             children: [
-                              Icon(Icons.save, color: Colors.black),
+                              Icon(
+                                Icons.save,
+                                color: Colors.black,
+                              ),
                               Text('Save',
                                   style: TextStyle(color: Colors.black))
                             ],
diff --git a/lib/view/widgets/badge_delete_dialog.dart b/lib/view/widgets/badge_delete_dialog.dart
@@ -2,80 +2,67 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
 class DeleteBadgeDialog extends StatelessWidget {
-  const DeleteBadgeDialog({
-    super.key,
-  });
+  const DeleteBadgeDialog({super.key});
 
   @override
   Widget build(BuildContext context) {
     return Dialog(
+      insetPadding: EdgeInsets.symmetric(horizontal: 24.w),
       shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(5.r),
+        borderRadius: BorderRadius.circular(12.r),
       ),
-      child: Container(
-        height: 110.h,
-        width: 300.w,
-        decoration: BoxDecoration(
-          color: Colors.white,
-          borderRadius: BorderRadius.circular(5.r),
-        ),
+      child: Padding(
+        padding: EdgeInsets.all(20.w),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            SizedBox(
-              height: 10.h,
-            ),
             Row(
               children: [
-                SizedBox(
-                  width: 20,
-                ),
-                Icon(Icons.delete, color: Colors.black),
-                SizedBox(
-                  width: 10,
-                ),
-                Text(
-                  'Delete',
-                  style: TextStyle(
-                    fontSize: 16.sp,
-                    fontWeight: FontWeight.w500,
+                Icon(Icons.delete_outline, color: Colors.red),
+                SizedBox(width: 10.w),
+                Expanded(
+                  child: Text(
+                    'Delete Badge',
+                    style: TextStyle(
+                      fontSize: 18.sp,
+                      fontWeight: FontWeight.w600,
+                    ),
                   ),
                 ),
               ],
             ),
-            SizedBox(
-              height: 7.h,
-            ),
-            Row(
-              children: [
-                SizedBox(
-                  width: 20,
-                ),
-                Text('Are you sure want to delete this badge?',
-                    style: TextStyle(fontSize: 14.sp)),
-              ],
-            ),
-            SizedBox(
-              height: 10.h,
+            SizedBox(height: 16.h),
+            Text(
+              'Are you sure you want to delete this badge? This action cannot be undone.',
+              style: TextStyle(fontSize: 15.sp),
             ),
+            SizedBox(height: 24.h),
             Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
                 TextButton(
-                  onPressed: () {
-                    Navigator.of(context).pop(false);
-                  },
-                  child: const Text(
+                  onPressed: () => Navigator.of(context).pop(false),
+                  child: Text(
                     'Cancel',
-                    style: TextStyle(color: Colors.red),
+                    style: TextStyle(
+                      color: Theme.of(context).colorScheme.secondary,
+                      fontSize: 14.sp,
+                    ),
                   ),
                 ),
-                TextButton(
-                  onPressed: () {
-                    Navigator.of(context).pop(true);
-                  },
-                  child: const Text(
-                    'OK',
-                    style: TextStyle(color: Colors.red),
+                SizedBox(width: 8.w),
+                ElevatedButton(
+                  style: ElevatedButton.styleFrom(
+                    backgroundColor: Colors.red,
+                    padding:
+                        EdgeInsets.symmetric(horizontal: 20.w, vertical: 10.h),
+                    minimumSize: Size(64.w, 36.h),
+                  ),
+                  onPressed: () => Navigator.of(context).pop(true),
+                  child: Text(
+                    'Delete',
+                    style: TextStyle(fontSize: 14.sp, color: Colors.white),
                   ),
                 ),
               ],
diff --git a/pubspec.lock b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
+      sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f
       url: "https://pub.dev"
     source: hosted
-    version: "82.0.0"
+    version: "85.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
+      sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d"
       url: "https://pub.dev"
     source: hosted
-    version: "7.4.5"
+    version: "7.7.1"
   archive:
     dependency: transitive
     description:
@@ -117,10 +117,10 @@ packages:
     dependency: "direct dev"
     description:
       name: dart_style
-      sha256: "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af"
+      sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   dbus:
     dependency: transitive
     description:
@@ -387,10 +387,10 @@ packages:
     dependency: "direct main"
     description:
       name: logger
-      sha256: "2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999"
+      sha256: "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.6.0"
+    version: "2.6.1"
   logging:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
