Merge pull request #41 from UNIZAR-30226-2023-01/dev

last release

.github/workflows/production.yml

@@ -1,51 +1,65 @@
-name: Upload APK as Release
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Set up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: 2.x
-
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Build APK
-        run: flutter build apk
-
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        with:
-          tag_name: v${{ github.run_number }}
-          release_name: Release v${{ github.run_number }}
-          draft: false
-          prerelease: false
-
-      - name: Upload APK
-        id: upload_asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: build/app/outputs/flutter-apk/app-release.apk
-          asset_name: MyApp-v${{ github.run_number }}.apk
-          asset_content_type: application/vnd.android.package-archive
-
-
-      # - name: Create a Release APK
-      #   uses: ncipollo/release-action@v1
-      #   with:
-      #     artifacts: "build/app/outputs/apk/release/*.apk"
-      #     token: ${{ secrets.TOKEN }}
+# name: Upload APK as Release
+
+# on:
+#   push:
+#     branches:
+#       - main
+#       - dev
+
+# jobs:
+#   build:
+#     runs-on: ubuntu-latest
+
+#     steps:
+#       - name: Set up Flutter
+#         uses: subosito/flutter-action@v2
+#         with:
+#           flutter-version: 3.x
+
+#       - name: Checkout code
+#         uses: actions/checkout@v2
+
+#       - name: Create Release Tag
+#         id: create_release_tag
+#         run: echo ::set-output name=tag::v${{ github.run_number }}
+
+#       - name: Build APK
+#         run: flutter build apk
+
+#       # - name: Create Release
+#       #   id: create_release
+#       #   uses: actions/create-release@v1
+#       #   env:
+#       #     GITHUB_TOKEN: ${{ secrets.TOKEN }}
+#       #   with:
+#       #     tag_name: v${{ github.run_number }}
+#       #     release_name: Release v${{ github.run_number }}
+#       #     draft: false
+#       #     prerelease: false
+
+#       # - name: Upload APK
+#       #   id: upload_asset
+#       #   uses: actions/upload-release-asset@v1
+#       #   env:
+#       #     GITHUB_TOKEN: ${{ secrets.TOKEN }}
+#       #   with:
+#       #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+#       #     asset_path: build/app/outputs/flutter-apk/app-release.apk
+#       #     asset_name: MyApp-v${{ github.run_number }}.apk
+#       #     asset_content_type: application/vnd.android.package-archive
+
+
+#       # - name: Create a Release APK
+#       #   uses: ncipollo/release-action@v1
+#       #   with:
+#       #     artifacts: "build/app/outputs/apk/release/*.apk"
+#       #     token: ${{ secrets.TOKEN }}
+
+
+
+#       - name: Create a Release APK
+#         uses: ncipollo/release-action@v1
+#         with:
+#           artifacts: "build/app/outputs/apk/release/*.apk"
+#           tag: ${{ steps.create_release_tag.outputs.tag }}
+#           token: ${{ secrets.TOKEN }}

lib/components/communications/socket_io.dart

@@ -350,6 +350,7 @@ Future<void> resume(String roomID, BuildContext context) async {
             s.player2 = data[0]["dark"],
 
             // print(s.room),
+            Navigator.pop(context),
             Navigator.push(
               context,
               MaterialPageRoute(builder: (context) => const GamePage()),