Merge branches 'issue#329' and 'development' of https://github.com/samruddhi-Rahegaonkar/badgemagic-app into issue#329

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,7 +2,7 @@ name: Badge Magic Push CI
 
 on:
   push:
-    branches: ["flutter_app"]
+    branches: ["development"]
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -112,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/}}
 
@@ -144,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' }}
@@ -230,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)