Merge branch 'development' into issue1206

Author: samruddhi-Rahegaonkar

.github/workflows/pull_request.yml

@@ -2,7 +2,7 @@ name: Badge Magic PR CI
 
 on:
   pull_request:
-    branches: [ "flutter_app" ]
+    branches: [ "development" ]
 
 env:
   ANDROID_EMULATOR_API: 34

.github/workflows/pull_request_closed.yml

@@ -2,7 +2,7 @@ name: Delete Screenshots
 
 on:
   pull_request_target:
-    branches: [ "flutter_app" ]
+    branches: [ "development" ]
     types:
       - closed
 

.github/workflows/push.yml

@@ -2,14 +2,24 @@ name: Badge Magic Push CI
 
 on:
   push:
-    branches: ["flutter_app"]
+    branches: ["development"]
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   ANDROID_EMULATOR_API: 34
   ANDROID_EMULATOR_ARCH: x86_64
   IPHONE_DEVICE_MODEL: iPhone 16 Pro Max
   IPAD_DEVICE_MODEL: iPad Pro 13-inch (M4)
+  BARECHECK_GITHUB_APP_TOKEN: ${{ secrets.BARECHECK_GITHUB_APP_TOKEN }}
+  ENCRYPTED_F10B5E0E5262_IV: ${{ secrets.ENCRYPTED_F10B5E0E5262_IV }}
+  ENCRYPTED_F10B5E0E5262_KEY: ${{ secrets.ENCRYPTED_F10B5E0E5262_KEY }}
+  ENCRYPTED_IOS_IV: ${{ secrets.ENCRYPTED_IOS_IV }}
+  ENCRYPTED_IOS_KEY: ${{ secrets.ENCRYPTED_IOS_KEY }}
+  STORE_PASS: ${{ secrets.STORE_PASS }}
+  ALIAS: ${{ secrets.ALIAS }}
+  KEY_PASS: ${{ secrets.KEY_PASS }}
+  MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }}
+  MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
 
 jobs:
   common:
@@ -23,7 +33,7 @@ jobs:
 
       - name: Common Workflow
         uses: ./.github/actions/common
-
+        
       - name: Hydrate and Update Version
         id: flutter-version
         run: |
@@ -102,14 +112,14 @@ jobs:
           name: AAB Generated
           path: build/app/outputs/bundle
 
-      - name: Upload APK/AAB to apk branch
+      - name: Upload APK/AAB to app branch
         if: ${{ github.repository == 'fossasia/badgemagic-app' }}
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
-          git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
-          cd apk
+          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
+          cd app
           
           branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
 
@@ -134,14 +144,14 @@ jobs:
 
           ls
 
-          echo "Pushing to apk branch"
+          echo "Pushing to app branch"
 
           git checkout --orphan temporary
           git add --all .
           git commit -am "[Auto] Update APK/AAB's from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
-          git branch -D apk
-          git branch -m apk
-          git push --force origin apk
+          git branch -D app
+          git branch -m app
+          git push --force origin app
 
       - name: Push app in open testing track
         if: ${{ github.repository == 'fossasia/badgemagic-app' }}
@@ -220,8 +230,8 @@ jobs:
       - name: Create and Upload Assets
         run: |
           echo "${{ needs.common.outputs.VERSION_CODE }}" > ./versionCode.txt
-          git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
-          gh release upload ${{ steps.run-release-drafter.outputs.tag_name }} apk/badge-magic-flutter_app-release.apk ./versionCode.txt --clobber
+          git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
+          gh release upload ${{ steps.run-release-drafter.outputs.tag_name }} app/badge-magic-development-release.apk ./versionCode.txt --clobber
 
   screenshots-android:
     name: Screenshots (Android)

android/settings.gradle

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version "8.10.1" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.21" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.0" apply false
 }
 
 include ":app"

lib/bademagic_module/bluetooth/connect_state.dart

@@ -24,7 +24,18 @@ class ConnectState extends RetryBleState {
         logger.d("Device connected");
         toast.showToast('Device connected successfully.');
 
-        return WriteState(device: scanResult.device, manager: manager);
+        final writeState =
+            WriteState(device: scanResult.device, manager: manager);
+        final result = await writeState.process();
+        try {
+          await scanResult.device.disconnect();
+          logger.d("Device disconnected after transfer");
+          await Future.delayed(const Duration(seconds: 1));
+          logger.d("Waited 1s after disconnect");
+        } catch (e) {
+          logger.e("Error during disconnect after transfer: $e");
+        }
+        return result;
       } else {
         throw Exception("Failed to connect to the device");
       }
@@ -33,7 +44,14 @@ class ConnectState extends RetryBleState {
       rethrow;
     } finally {
       if (!connected) {
-        await scanResult.device.disconnect();
+        try {
+          await scanResult.device.disconnect();
+          logger.d("Device disconnected in finally block");
+          await Future.delayed(const Duration(seconds: 1));
+          logger.d("Waited 1s after disconnect (finally)");
+        } catch (e) {
+          logger.e("Error during disconnect in finally: $e");
+        }
       }
     }
   }

lib/bademagic_module/bluetooth/write_state.dart

@@ -47,6 +47,15 @@ class WriteState extends NormalBleState {
     } catch (e) {
       logger.e("Failed to write characteristic: $e");
       throw Exception("Failed to transfer data. Please try again.");
+    } finally {
+      try {
+        logger.d("Disconnecting from device after write attempt...");
+        await device.disconnect();
+        await Future.delayed(const Duration(milliseconds: 700));
+        logger.d("Device disconnected and delay complete.");
+      } catch (e) {
+        logger.e("Error during disconnect: $e");
+      }
     }
   }
 }

lib/view/draw_badge_screen.dart

@@ -1,3 +1,4 @@
+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';
@@ -13,24 +14,29 @@ class DrawBadge extends StatefulWidget {
   final bool? isSavedCard;
   final bool? isSavedClipart;
   final List<List<int>>? badgeGrid;
-  const DrawBadge(
-      {super.key,
-      this.filename,
-      this.isSavedCard = false,
-      this.isSavedClipart = false,
-      this.badgeGrid});
+
+  const DrawBadge({
+    super.key,
+    this.filename,
+    this.isSavedCard = false,
+    this.isSavedClipart = false,
+    this.badgeGrid,
+  });
 
   @override
   State<DrawBadge> createState() => _DrawBadgeState();
 }
 
 class _DrawBadgeState extends State<DrawBadge> {
-  var drawToggle = DrawBadgeProvider();
+  late DrawBadgeProvider drawToggle;
 
   @override
-  void didChangeDependencies() {
-    super.didChangeDependencies();
-    _setLandscapeOrientation();
+  void initState() {
+    super.initState();
+    drawToggle = DrawBadgeProvider();
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      _setLandscapeOrientation();
+    });
   }
 
   @override
@@ -39,27 +45,67 @@ class _DrawBadgeState extends State<DrawBadge> {
     super.dispose();
   }
 
-  void _resetPortraitOrientation() {
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.portraitUp,
-      DeviceOrientation.portraitDown,
-    ]);
+  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 _setLandscapeOrientation() {
-    SystemChrome.setPreferredOrientations([
-      DeviceOrientation.landscapeRight,
-      DeviceOrientation.landscapeLeft,
-    ]);
+  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);
+    }
   }
 
   @override
   Widget build(BuildContext context) {
-    FileHelper fileHelper = FileHelper();
-    return WillPopScope(
-      onWillPop: () async {
-        _resetPortraitOrientation();
-        return true; // Allows back navigation
+    return PopScope(
+      canPop: true,
+      // ignore: deprecated_member_use
+      onPopInvoked: (didPop) async {
+        if (didPop) {
+          await _resetPortraitOrientation();
+        }
       },
       child: CommonScaffold(
         index: 1,
@@ -79,9 +125,7 @@ class _DrawBadgeState extends State<DrawBadge> {
                   children: [
                     Column(
                       children: [
-                        SizedBox(
-                          width: 100,
-                        ),
+                        const SizedBox(width: 100),
                         BMBadge(
                           providerInit: (provider) => drawToggle = provider,
                           badgeGrid: widget.badgeGrid
@@ -110,7 +154,7 @@ class _DrawBadgeState extends State<DrawBadge> {
                               Text(
                                 'Draw',
                                 style: TextStyle(
-                                  color: drawToggle.isDrawing
+                                  color: drawToggle.getIsDrawing()
                                       ? colorPrimary
                                       : Colors.black,
                                 ),
@@ -128,14 +172,14 @@ class _DrawBadgeState extends State<DrawBadge> {
                             children: [
                               Icon(
                                 Icons.delete,
-                                color: drawToggle.isDrawing
+                                color: drawToggle.getIsDrawing()
                                     ? Colors.black
                                     : colorPrimary,
                               ),
                               Text(
                                 'Erase',
                                 style: TextStyle(
-                                  color: drawToggle.isDrawing
+                                  color: drawToggle.getIsDrawing()
                                       ? Colors.black
                                       : colorPrimary,
                                 ),
@@ -151,46 +195,19 @@ 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: () {
-                            List<List<int>> badgeGrid = drawToggle
-                                .getDrawViewGrid()
-                                .map((e) => e.map((e) => e ? 1 : 0).toList())
-                                .toList();
-                            List<String> hexString =
-                                Converters.convertBitmapToLEDHex(
-                                    badgeGrid, false);
-                            widget.isSavedCard!
-                                ? fileHelper.updateBadgeText(
-                                    widget.filename!,
-                                    hexString,
-                                  )
-                                : widget.isSavedClipart!
-                                    ? fileHelper.updateClipart(
-                                        widget.filename!, badgeGrid)
-                                    : fileHelper.saveImage(
-                                        drawToggle.getDrawViewGrid());
-                            fileHelper.generateClipartCache();
-                            ToastUtils()
-                                .showToast("Clipart Saved Successfully");
+                          onPressed: () async {
+                            await _saveImage();
                           },
                           child: const Column(
                             children: [
-                              Icon(
-                                Icons.save,
-                                color: Colors.black,
-                              ),
+                              Icon(Icons.save, color: Colors.black),
                               Text('Save',
                                   style: TextStyle(color: Colors.black))
                             ],