chore(release): theme integration + onboarding hotfixes

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.44.0"
+}

.github/workflows/build.yml

@@ -5,7 +5,12 @@
 
 name: Flutter build and test
 
-on: push
+# CI validation runs only on pull requests into the integration branches.
+# Feature-branch pushes don't trigger anything; nothing runs on push to a
+# branch, so there are no duplicate runs.
+on:
+  pull_request:
+    branches: [develop, test, master]
 
 env:
   FLUTTER_FOLDER: '$HOME/flutter'
@@ -30,7 +35,10 @@ jobs:
         uses: flutter-actions/setup-flutter@v4
         with:
           channel: stable
-          version: 3.32.1
+          version: 3.44.0
+
+      - name: Clean
+        run: flutter clean
 
       - name: Install dependencies
         run: flutter pub get

.github/workflows/create_release_on_tag.yml

@@ -1,7 +1,7 @@
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
 
 name: Create Release
 
@@ -10,34 +10,28 @@ jobs:
     name: Create Release and Upload APK
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@master
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "adopt" # See 'Supported distributions' for available options
+          java-version: "17"
 
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
         with:
-          distribution: 'adopt' # See 'Supported distributions' for available options
-          java-version: '17'
+          flutter-version: "3.44.0"
+          channel: stable
+          cache: true
+          pub-cache: true
 
-      - name: Cache Flutter
-        id: cache-flutter
-        uses: actions/cache@v3
+      - name: Cache Gradle
+        id: cache-gradle
+        uses: actions/cache@v4
         with:
           path: |
-            flutter
-            ~/.pub-cache
-          key: flutter-${{ hashFiles('**/pubspec.lock') }}
-
-      - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
-        name: Install Flutter
-        run: git clone https://github.com/flutter/flutter.git --depth 1 -b stable $FOLDER
-
-      - name: Add Flutter to PATH
-        run: echo "$GITHUB_WORKSPACE/flutter/bin" >> $GITHUB_PATH
-
-      - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
-        name: Install dependencies
-        run: flutter pub get
+            ~/.gradle/caches
+            ~/.gradle/wrapper/
+          key: gradle-ubuntu-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
 
       - name: Configure Keystore
         run: |
@@ -59,20 +53,35 @@ jobs:
         run: |
           flutter --version
           pwd
-          
+
       - name: Build APK
         run: |
           flutter clean
           flutter pub get
-          flutter pub upgrade
           flutter build apk --release --no-tree-shake-icons
 
       - name: Create Release and upload apk
         uses: underwindfall/create-release-with-debugapk@v2.0.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with: 
+        with:
           tag_name: ${{ github.ref }}
           asset_path: build/app/outputs/flutter-apk/app-release.apk
           asset_name: carp-studies-app-${{ github.ref_name }}.apk
           asset_content_type: application/vnd.android.package-archive
+
+      # Setup Ruby/Bundler so fastlane is available
+      - name: Setup Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: false
+          working-directory: android
+
+      # Production release to Google Play runs only on tags (like the iOS
+      # App Store workflow on Xcode Cloud).
+      - if: startsWith(github.ref, 'refs/tags/')
+        run: fastlane release
+        env:
+          PLAY_STORE_JSON_KEY: PLAY_STORE_CONFIG.json
+        working-directory: android

.github/workflows/deploy_to_google_play_store_fastlane_release.yml

@@ -2,112 +2,62 @@ name: Upload to Google Store
 run-name: ${{github.actor}} is pushing to branch and deploying to Google Store
 
 on:
-    push:
-        branches:
-        - master
-        - test
+  push:
+    branches:
+      - test
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-          - uses: actions/checkout@v4
-          - uses: actions/setup-java@v4
-            with:
-              distribution: 'adopt' # See 'Supported distributions' for available options
-              java-version: '17'
-
-          - name: Cache Flutter
-            id: cache-flutter
-            uses: actions/cache@v3
-            with:
-              path: |
-                flutter
-                ~/.pub-cache
-              key: flutter-${{ hashFiles('**/pubspec.lock') }}
-
-          - name: Cache Gradle
-            id: cache-gradle
-            uses: actions/cache@v3
-            with: 
-              path: |
-                ~/.gradle/caches
-                ~/.gradle/wrapper/
-              key: gradle-ubuntu-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-
-          - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
-            name: Install Flutter
-            run: git clone https://github.com/flutter/flutter.git --depth 1 -b stable $FOLDER
-
-          - name: Add Flutter to PATH
-            run: echo "$GITHUB_WORKSPACE/flutter/bin" >> $GITHUB_PATH
-
-          - if: ${{ steps.cache-flutter.outputs.cache-hit != 'true' }}
-            name: Install dependencies
-            run: flutter pub get
-
-        # Setup Ruby, Bundler, and Gemfile dependencies
-          - name: Setup Fastlane
-            uses: ruby/setup-ruby@v1
-            with:
-              ruby-version: '3.3'
-              bundler-cache: false
-              working-directory: android
-
-          - name: Extract last commit message
-            id: extract-commit-message
-            run: |
-              COMMIT_MESSAGE=$(git log -1 --pretty=%B | tr -d '\n')
-              COMMIT_MESSAGE="${COMMIT_MESSAGE}"
-              echo "Commit Message: $COMMIT_MESSAGE"
-              echo "commit_message=$COMMIT_MESSAGE" >> $GITHUB_ENV
-
-          - name: Extract version code and version name from pubspec.yaml
-            id: extract-version
-            run: |
-              # Navigate to the root directory (if not already there)
-              pwd
-              cd $GITHUB_WORKSPACE
-
-              # Extract version name and version code from pubspec.yaml
-              VERSION_NAME=$(grep 'version:' pubspec.yaml | awk '{print $2}' | cut -d'+' -f1)
-              VERSION_CODE=$(grep 'version:' pubspec.yaml | awk '{print $2}' | cut -d'+' -f2)
-
-              echo "Version Name: $VERSION_NAME"
-              echo "Version Code: $VERSION_CODE"
-
-              echo "version_name=$VERSION_NAME" >> $GITHUB_ENV
-              echo "version_code=$VERSION_CODE" >> $GITHUB_ENV
-
-          - name: Create or update changelog file
-            run: |
-              pwd
-              mkdir -p ./android/fastlane/metadata/android/en-GB/changelogs
-              echo "${{ env.commit_message }}" > "./android/fastlane/metadata/android/en-GB/changelogs/${{ env.version_code }}.txt"
-
-          - name: Configure Keystore
-            run: |
-              echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks
-              echo "$PLAY_STORE_CONFIG_JSON" > PLAY_STORE_CONFIG.json
-              echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> key.properties
-              echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> key.properties
-              echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> key.properties
-              echo "storeFile=upload-keystore.jks" >> key.properties
-            env:
-              PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
-              KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
-              KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
-              KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
-              PLAY_STORE_CONFIG_JSON: ${{secrets.PLAY_STORE_CONFIG_JSON}}
-            working-directory: android
-
-          - if: github.ref == 'refs/heads/master'
-            run: fastlane release
-            env:
-              PLAY_STORE_JSON_KEY: PLAY_STORE_CONFIG.json
-            working-directory: android
-
-          - if: github.ref == 'refs/heads/test'
-            run: fastlane test
-            env:
-              PLAY_STORE_JSON_KEY: PLAY_STORE_CONFIG.json
-            working-directory: android
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "adopt" # See 'Supported distributions' for available options
+          java-version: "17"
+
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: "3.44.0"
+          channel: stable
+          cache: true
+          pub-cache: true
+
+      - name: Cache Gradle
+        id: cache-gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper/
+          key: gradle-ubuntu-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+
+      # Setup Ruby, Bundler, and Gemfile dependencies
+      - name: Setup Fastlane
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler-cache: false
+          working-directory: android
+
+      - name: Configure Keystore
+        run: |
+          echo "$PLAY_STORE_UPLOAD_KEY" | base64 --decode > app/upload-keystore.jks
+          echo "$PLAY_STORE_CONFIG_JSON" > PLAY_STORE_CONFIG.json
+          echo "keyPassword=$KEYSTORE_KEY_PASSWORD" >> key.properties
+          echo "storePassword=$KEYSTORE_STORE_PASSWORD" >> key.properties
+          echo "keyAlias=$KEYSTORE_KEY_ALIAS" >> key.properties
+          echo "storeFile=upload-keystore.jks" >> key.properties
+        env:
+          PLAY_STORE_UPLOAD_KEY: ${{ secrets.PLAY_STORE_UPLOAD_KEY }}
+          KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
+          KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
+          KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
+          PLAY_STORE_CONFIG_JSON: ${{secrets.PLAY_STORE_CONFIG_JSON}}
+        working-directory: android
+
+      - if: github.ref == 'refs/heads/test'
+        run: fastlane test
+        env:
+          PLAY_STORE_JSON_KEY: PLAY_STORE_CONFIG.json
+        working-directory: android

.gitignore

@@ -122,6 +122,15 @@ android/fastlane/report.xml
 
 # CARP related
 carp/carpspec.yaml
-assets/carp/
-assets/carp/lang/_da.json
-assets/carp/lang/_en.json
+# Ignore local study config but keep the asset dirs (via .gitkeep) so release
+# builds don't fail on missing/empty asset directories.
+assets/carp/*
+!assets/carp/lang/
+assets/carp/lang/*
+!assets/carp/lang/.gitkeep
+!assets/carp/resources/
+assets/carp/resources/*
+!assets/carp/resources/.gitkeep
+
+# FVM Version Cache
+.fvm/

.vscode/launch.json

@@ -27,18 +27,44 @@
       ],
       "flutterMode": "debug"
     },
+    {
+      // profile mode using the DEV CAWS instance - for measuring jank/perf
+      "name": "DEV (profile) - carp-studies-app",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": [
+        "--dart-define",
+        "deployment-mode=dev",
+        "--dart-define",
+        "debug-level=info"
+      ],
+      "flutterMode": "profile"
+    },
+    {
+      // release mode using the DEV CAWS instance - production-speed sanity check
+      "name": "DEV (release) - carp-studies-app",
+      "request": "launch",
+      "type": "dart",
+      "toolArgs": [
+        "--dart-define",
+        "deployment-mode=dev",
+        "--dart-define",
+        "debug-level=info"
+      ],
+      "flutterMode": "release"
+    },
     {
       // debug mode using the TEST CAWS instance
-      "name": "TEST - carp-studies-app",
+      "name": "TEST - carp-studies-app (release)",
       "request": "launch",
       "type": "dart",
       "toolArgs": [
         "--dart-define",
         "deployment-mode=test",
         "--dart-define",
-        "debug-level=debug"
+        "debug-level=none"
       ],
-      "flutterMode": "debug"
+      "flutterMode": "release"
     },
     {
       // debug mode using COMPUTEROME CAWS instance
@@ -52,6 +78,22 @@
         "debug-level=debug"
       ],
       "flutterMode": "debug"
+    },
+    {
+      // end-to-end join-study flow on a device/simulator (local deployment).
+      // The test also forces local + debug internally, so it runs correctly
+      // even without these defines.
+      "name": "Integration - join study flow (LOCAL)",
+      "request": "launch",
+      "type": "dart",
+      "program": "integration_test/join_study_flow_test.dart",
+      "toolArgs": [
+        "--dart-define",
+        "deployment-mode=local",
+        "--dart-define",
+        "debug-level=debug"
+      ],
+      "flutterMode": "debug"
     }
   ]
 }