feat: Add multiple badge Sizes

fix: multiple calls for initstate

fix: text fitting to height

fix: text according to badge size

fix: routing error of draw badge

fix: emoji rendering issue

fix: emoji and text renders correctly on any badge size

fix: optimize Converters class for readability and maintainability

fix: conflicts

fix: removed unnecessary comments

fix: conflicts in homescreen

fix: build fails

fix: update expected hex output for scaled characters in converters_test

Author: samruddhi-Rahegaonkar

.github/workflows/pull_request.yml

@@ -3,7 +3,6 @@ name: Badge Magic PR CI
 on:
   pull_request:
     branches: [ "development" ]
-    branches: [ "flutter_app" ]
 
 env:
   ANDROID_EMULATOR_API: 34
@@ -84,3 +83,4 @@ jobs:
         with:
           IPHONE_DEVICE_MODEL: ${{ env.IPHONE_DEVICE_MODEL }}
           IPAD_DEVICE_MODEL: ${{ env.IPAD_DEVICE_MODEL }}
+      

.github/workflows/push.yml

@@ -3,7 +3,6 @@ name: Badge Magic Push CI
 on:
   push:
     branches: ["development"]
-    branches: ["flutter_app"]
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -113,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/}}
 
@@ -145,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' }}
@@ -231,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)
@@ -256,4 +255,4 @@ jobs:
         uses: ./.github/actions/screenshot-ios
         with:
           IPHONE_DEVICE_MODEL: ${{ env.IPHONE_DEVICE_MODEL }}
-          IPAD_DEVICE_MODEL: ${{ env.IPAD_DEVICE_MODEL }}
+          IPAD_DEVICE_MODEL: ${{ env.IPAD_DEVICE_MODEL }}

lib/bademagic_module/models/screen_size.dart

@@ -0,0 +1,26 @@
+class ScreenSize {
+  final int width;
+  final int height;
+  final String name;
+
+  const ScreenSize(
+      {required this.width, required this.height, required this.name});
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is ScreenSize &&
+          runtimeType == other.runtimeType &&
+          width == other.width &&
+          height == other.height &&
+          name == other.name;
+
+  @override
+  int get hashCode => width.hashCode ^ height.hashCode ^ name.hashCode;
+}
+
+const List<ScreenSize> supportedScreenSizes = [
+  ScreenSize(width: 44, height: 11, name: "Small (44x11)"),
+  ScreenSize(width: 64, height: 16, name: "Medium (64x16)"),
+  ScreenSize(width: 128, height: 32, name: "Large (128x32)"),
+];

lib/bademagic_module/utils/byte_array_utils.dart

@@ -29,8 +29,7 @@ List<int> hexStringToByteArray(String hexString) {
   return data;
 }
 
-List<List<bool>> hexStringToBool(String hexString) {
-  int rows = 11;
+List<List<bool>> hexStringToBool(String hexString, int rows) {
   if (hexString.length % 2 != 0 || !isValidHex(hexString)) {
     throw ArgumentError("Invalid hex string: $hexString");
   }
@@ -39,23 +38,18 @@ List<List<bool>> hexStringToBool(String hexString) {
   int rowIndex = 0;
 
   for (int i = 0; i < hexString.length; i += 2) {
-    // Convert the hex string into a byte (int)
     int byte = int.parse(hexString.substring(i, i + 2), radix: 16);
-
-    // Convert the byte into a binary representation and then into booleans
     for (int bit = 7; bit >= 0; bit--) {
       boolArray[rowIndex].add(((byte >> bit) & 1) == 1);
     }
-
-    // Move to the next row after filling current one
     rowIndex = (rowIndex + 1) % rows;
   }
 
   return boolArray;
 }
 
-List<List<int>> byteArrayToBinaryArray(List<int> byteArray) {
-  List<List<int>> binaryArray = List.generate(11, (_) => []);
+List<List<int>> byteArrayToBinaryArray(List<int> byteArray, int rows) {
+  List<List<int>> binaryArray = List.generate(rows, (_) => []);
 
   int rowIndex = 0;
   for (int byte in byteArray) {
@@ -66,32 +60,27 @@ List<List<int>> byteArrayToBinaryArray(List<int> byteArray) {
 
     binaryArray[rowIndex].addAll(binaryRepresentation);
 
-    rowIndex = (rowIndex + 1) % 11;
+    rowIndex = (rowIndex + 1) % rows;
   }
 
-  logger.d(
-      "binaryArray: $binaryArray"); // Use print instead of logger for standalone example
+  logger.d("binaryArray: $binaryArray");
   return binaryArray;
 }
 
 String hexToBin(String hex) {
-  // Convert hex to binary string
   String binaryString = BigInt.parse(hex, radix: 16).toRadixString(2);
-
-  // Pad the binary string with leading zeros if necessary to ensure it's a multiple of 8 bits
   int paddingLength = (8 - (binaryString.length % 8)) % 8;
   binaryString = binaryString.padLeft(binaryString.length + paddingLength, '0');
   logger.d("binaryString: $binaryString");
   return binaryString;
 }
 
-List<List<int>> binaryStringTo2DList(String binaryString) {
-  int maxHeight = 11;
+List<List<int>> binaryStringTo2DList(String binaryString, int maxHeight) {
   List<List<int>> binary2DList = List.generate(maxHeight, (_) => []);
 
   for (int x = 0; x < binaryString.length; x++) {
     int a = 0;
-    for (int y = a; y < 11; y++) {
+    for (int y = a; y < maxHeight; y++) {
       for (int z = 0; z < 8; z++) {
         binary2DList[y].add(int.parse(binaryString[x++]));
         if (x >= binaryString.length) {
@@ -102,6 +91,9 @@ List<List<int>> binaryStringTo2DList(String binaryString) {
         break;
       }
     }
+    if (x >= binaryString.length) {
+      break;
+    }
   }
   logger.d("binary2DList: $binary2DList");
   return binary2DList;