Prepare iOS health release requirements

.github/scripts/portrait-avd.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Turns the AVD panel portrait, as the pre-emulator-launch-script of
+# android-emulator-runner. The tablet panels are landscape and rely on
+# hw.initialOrientation, which the emulator ignores with -no-window.
+
+set -euo pipefail
+
+CONFIG="$HOME/.android/avd/${AVD_NAME:-test}.avd/config.ini"
+
+width=$(grep '^hw.lcd.width=' "$CONFIG" | cut -d= -f2)
+height=$(grep '^hw.lcd.height=' "$CONFIG" | cut -d= -f2)
+
+# config.ini is an unordered list of key=value, so dropping the old line and
+# appending the new one is enough, and unlike sed -i that behaves the same
+# on a runner and on a Mac
+set_property() {
+  grep -v "^$1=" "$CONFIG" > "$CONFIG.tmp" || true
+  echo "$1=$2" >> "$CONFIG.tmp"
+  mv "$CONFIG.tmp" "$CONFIG"
+}
+
+# Short edge first, which leaves an already portrait panel as it is
+set_property hw.lcd.width "$((width < height ? width : height))"
+set_property hw.lcd.height "$((width < height ? height : width))"
+
+grep -E '^hw\.lcd\.(width|height)' "$CONFIG"

.github/scripts/take-screenshots.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+#
+# Drives the screenshot test in blocks of languages, a whole run's screenshots
+# do not survive the hand-over to the driver. See integration_test/README.md.
+
+set -euo pipefail
+
+blocks=5
+attempts=3
+block_timeout=10m
+
+# Homebrew installs coreutils under the g-prefixed names only
+timeout=$(command -v timeout || command -v gtimeout) || {
+  echo "Found neither timeout nor gtimeout, install coreutils"
+  exit 1
+}
+
+device_type=${1:?Usage: take-screenshots.sh <device type> [flutter drive args]}
+shift
+
+# flutter drive gives up within seconds on an offline device, so wait for it
+# to come back instead of burning the next attempt on it
+wait_for_device() {
+  adb devices | tail -n +2 | grep -q . || return 0
+  adb reconnect offline || true
+  "$timeout" 120s adb wait-for-device shell \
+    'while [ "$(getprop sys.boot_completed)" != 1 ]; do sleep 2; done' || true
+}
+
+for block in $(seq "$blocks"); do
+  for attempt in $(seq "$attempts"); do
+    status=0
+    # Both the Xcode build and the driver's connect retry forever on their own.
+    # timeout signals the whole process group, so no dart child survives.
+    "$timeout" --kill-after=30s "$block_timeout" flutter drive \
+      --driver=test_driver/screenshot_driver.dart \
+      --target=integration_test/make_screenshots_test.dart \
+      --dart-define=DEVICE_TYPE="$device_type" \
+      --dart-define=LANGUAGES="$block/$blocks" \
+      "$@" || status=$?
+
+    if [ "$status" -eq 0 ]; then
+      break
+    fi
+
+    if [ "$attempt" -eq "$attempts" ]; then
+      echo "Block $block still fails after $attempts attempts, giving up"
+      exit 1
+    fi
+
+    # Usually the device went offline while handing the images over
+    echo "Block $block failed with $status, attempt $((attempt + 1)) of $attempts"
+    wait_for_device
+  done
+done

.github/workflows/analyze.yml

@@ -1,6 +1,10 @@
 name: Analyze
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
@@ -9,7 +13,6 @@ on:
       - 'ios/Runner/Info.plist'
       - 'android/app/src/main/res/xml/locales_config.xml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'

.github/workflows/build-linux.yml

@@ -97,8 +97,8 @@ jobs:
 
       - name: Push updated config to flathub repository
         run: |
-          git config user.name "github-actions"
-          git config user.email "github-actions@github.com"
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git checkout -b release-${{ inputs.ref }}
           git add -A
           git commit -m "Update to ${{ inputs.ref }}"

.github/workflows/bump-version.yml

@@ -52,8 +52,8 @@ jobs:
 
       - name: Tag release and commit pubspec
         run: |
-          git config user.name Github-Actions
-          git config user.email github-actions@github.com
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add pubspec.yaml flatpak/de.wger.flutter.metainfo.xml
           git commit -m "Bump version to ${{ inputs.app_version }}"
           git tag ${{ inputs.app_version }}

.github/workflows/ci.yml

@@ -1,11 +1,14 @@
-name: Continous Integration
+name: Continuous Integration
 on:
+  # Direct pushes are only validated on master (post-merge); everything else
+  # is covered by the pull_request trigger, avoiding duplicate runs for
+  # same-repo PR branches.
   push:
+    branches: [ master, ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
   pull_request:
-    branches: [ master, ]
     paths:
       - '**/*.dart'
       - 'pubspec.yaml'

.github/workflows/linter.yml.bak

@@ -31,8 +31,8 @@ jobs:
       - name: Push a commit with the changed files
         continue-on-error: true
         run: |
-          git config user.name Github-actions
-          git config user.email github-actions@github.com
+          git config user.name git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add .
           git commit -m "Automatic linting"
           git push

.github/workflows/screenshots.yml

@@ -12,8 +12,26 @@ permissions:
 
 jobs:
   screenshots_apple:
-    name: 'iOS'
+    name: 'Apple - ${{ matrix.device.name }}'
     runs-on: macos-latest
+    # A clean run takes about 30 minutes, the script may retry a block twice
+    timeout-minutes: 75
+    strategy:
+      # The jobs write into separate folders and a flaky one should not take
+      # the healthy ones down with it
+      fail-fast: false
+      matrix:
+        device:
+          # Apple only needs the largest device per family, the smaller ones
+          # are scaled down by App Store Connect
+          - name: "iPhone 6.9in"
+            simulator: iPhone 17 Pro Max
+            device_type: iOSPhoneBig
+            folder: iPhone 6.9
+          - name: "iPad 13in"
+            simulator: iPad Pro 13-inch
+            device_type: iOSTabletBig
+            folder: iPad 13
     steps:
       - uses: actions/checkout@v7
 
@@ -23,34 +41,50 @@ jobs:
       - name: Boot iOS simulator
         id: boot
         run: |
-          SIMULATOR=$(xcrun simctl list devices available | awk -F '[()]' '/iPhone 17/{print $2; exit}')
+          # Match the UDID explicitly, some device names contain parentheses themselves
+          SIMULATOR=$(xcrun simctl list devices available \
+            | grep -m1 '${{ matrix.device.simulator }}' \
+            | grep -oE '[0-9A-F]{8}(-[0-9A-F]{4}){3}-[0-9A-F]{12}')
+          if [ -z "$SIMULATOR" ]; then
+            echo "No available simulator matching '${{ matrix.device.simulator }}'"
+            xcrun simctl list devices available
+            exit 1
+          fi
           echo "SIMULATOR=$SIMULATOR" >> $GITHUB_ENV
           xcrun simctl boot "$SIMULATOR" || true
           open -a Simulator || true
           n=0; until xcrun simctl bootstatus "$SIMULATOR" -b || [ $n -ge 60 ]; do sleep 1; n=$((n+1)); done
 
+      # The image ships no GNU coreutils, take-screenshots.sh needs gtimeout
+      - name: Install coreutils
+        run: brew install coreutils
+
       - name: Generate screenshots
-        run: |
-          flutter drive --driver=test_driver/screenshot_driver.dart --target=integration_test/make_screenshots_test.dart --dart-define=DEVICE_TYPE=iOSPhoneBig -d "$SIMULATOR"
+        run: .github/scripts/take-screenshots.sh ${{ matrix.device.device_type }} -d "$SIMULATOR"
 
       - name: Upload screenshots
         uses: actions/upload-artifact@v7
         with:
-          name: screenshots-ios
-          path: fastlane/metadata/ios/**/images/iPhone 6.9/*.png
+          name: screenshots-ios-${{ matrix.device.device_type }}
+          path: fastlane/metadata/ios/**/images/${{ matrix.device.folder }}/*.png
 
   screenshots_android:
     name: 'Android - ${{ matrix.device.name }}'
     runs-on: ubuntu-latest
+    # A clean run takes about 25 minutes, the script may retry a block twice
+    timeout-minutes: 60
     strategy:
+      # The jobs write into separate folders and a flaky one should not take
+      # the healthy ones down with it
+      fail-fast: false
       matrix:
         device:
           - name: "Phone"
-            profile: pixel_7_pro
+            profile: pixel_10
             device_type: androidPhone
             folder: phoneScreenshots
           - name: "Tablet 7in"
-            profile: 7in WSVGA (Tablet)
+            profile: small_tablet
             device_type: androidTabletSmall
             folder: sevenInchScreenshots
           - name: "Tablet 10in"
@@ -70,7 +104,23 @@ jobs:
           sudo udevadm trigger --name-match=kvm
 
       - name: Accept Android SDK licenses
-        run: yes | sdkmanager --licenses || true
+        run: yes | "${ANDROID_HOME:?}/cmdline-tools/latest/bin/sdkmanager" --licenses || true
+
+      # The runner image ships command line tools 12.0, which does not have the
+      # device definitions we need.
+      - name: Install current SDK command line tools
+        run: |
+          SDK="${ANDROID_HOME:?}/cmdline-tools"
+          yes | "$SDK/latest/bin/sdkmanager" --install "cmdline-tools;22.0"
+          rm -rf "$SDK/latest"
+          mv "$SDK/22.0" "$SDK/latest"
+          "$SDK/latest/bin/sdkmanager" --version
+
+      # Fail here rather than after the system image download
+      - name: Check the device profile exists
+        run: |
+          "${ANDROID_HOME:?}/cmdline-tools/latest/bin/avdmanager" list device --compact \
+            | grep -qx '${{ matrix.device.profile }}'
 
       # Free up disk space on the runner. List taken from
       # https://github.com/flathub-infra/vorarbeiter/blob/main/.github/workflows/build.yml
@@ -109,15 +159,16 @@ jobs:
           target: google_apis
           arch: x86_64
           profile: ${{ matrix.device.profile }}
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          emulator-options: -no-snapshot-save -no-window -no-metrics -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          script: |           
-            flutter drive --driver=test_driver/screenshot_driver.dart --target=integration_test/make_screenshots_test.dart --dart-define=DEVICE_TYPE=${{ matrix.device.device_type }}
+          pre-emulator-launch-script: .github/scripts/portrait-avd.sh
+          # The action runs every line of this as its own sh -c, so no loops here
+          script: .github/scripts/take-screenshots.sh ${{ matrix.device.device_type }}
 
       - name: Upload screenshots
         uses: actions/upload-artifact@v7
         with:
-          name: screenshots-android-${{ matrix.device.folder }}
+          name: screenshots-android-${{ matrix.device.device_type }}
           path: fastlane/metadata/android/**/images/${{ matrix.device.folder }}/*.png
 
   commit_screenshots:
@@ -141,17 +192,19 @@ jobs:
       - name: Merge artifacts into fastlane/metadata
         run: |
           set -euo pipefail
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-phoneScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-sevenInchScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-android-tenInchScreenshots/" fastlane/metadata/android/
-          rsync --archive --checksum --itemize-changes "screenshots/screenshots-ios/" fastlane/metadata/ios/
+          for artifact in screenshots/screenshots-android-*/; do
+            rsync --archive --checksum --itemize-changes "$artifact" fastlane/metadata/android/
+          done
+          for artifact in screenshots/screenshots-ios-*/; do
+            rsync --archive --checksum --itemize-changes "$artifact" fastlane/metadata/ios/
+          done
 
       - name: Commit screenshots to a dated branch
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git add fastlane/metadata/android fastlane/metadata/ios || true
           if git diff --staged --quiet; then
             echo "No new or changed screenshots to commit."

android/app/build.gradle

@@ -40,10 +40,14 @@ android {
     defaultConfig {
         // Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "de.wger.flutter"
-        minSdkVersion flutter.minSdkVersion
+        minSdkVersion 26
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+
+        // Overridden by the debug build type. Set here rather than per build
+        // type so the profile variant has it as well
+        resValue "string", "app_name", "wger"
     }
 
     signingConfigs {
@@ -59,7 +63,11 @@ android {
             signingConfig signingConfigs.release
         }
         debug {
+            // Own application id and name, so a debug build can sit next to the
+            // installed release one on the same device. The launcher icon keeps
+            // the wger logo on a different background, see src/debug/res
             applicationIdSuffix ".debug"
+            resValue "string", "app_name", "wger - debug"
         }
     }
 }

android/app/src/debug/res/values/colors.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Background of the adaptive launcher icon. Overrides the release blue so
+         a debug build is recognisable at a glance next to the installed app -->
+    <color name="ic_launcher_background">#e63946</color>
+</resources>