Merge branch 'master' into fix/mark-current-workout-day

.gitattributes

@@ -0,0 +1 @@
+fastlane/metadata/**/images/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/actions/flutter-common/action.yml

@@ -9,7 +9,7 @@ runs:
       uses: subosito/flutter-action@v2
       with:
         channel: stable
-        flutter-version: 3.35.5
+        flutter-version: 3.38.3
         cache: true
 
     - name: Install Flutter dependencies

.github/workflows/build-android.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -36,7 +36,7 @@ jobs:
       - name: Build APK
         run: flutter build apk --release
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-apk
           path: build/app/outputs/flutter-apk/app-release.apk
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -67,7 +67,7 @@ jobs:
       - name: Build AAB
         run: flutter build appbundle --release
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-aab
           path: build/app/outputs/bundle/release/app-release.aab

.github/workflows/build-apple.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -31,7 +31,7 @@ jobs:
           cd build/ios/iphoneos
           zip -r Runner.app.zip Runner.app
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-ios
           path: build/ios/iphoneos/Runner.app.zip
@@ -41,7 +41,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -61,7 +61,7 @@ jobs:
           cd build/ios/archive
           zip -r Runner.xcarchive.zip Runner.xcarchive
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-ipa
           path: build/ios/archive/Runner.xcarchive.zip
@@ -71,7 +71,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -84,7 +84,7 @@ jobs:
           cd build/macos/Build/Products/Release
           zip -r wger.app.zip wger.app
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-macos
           path: build/macos/Build/Products/Release/wger.app.zip

.github/workflows/build-linux.yml

@@ -25,7 +25,7 @@ jobs:
         #   runner: ubuntu-24.04-arm
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -39,7 +39,7 @@ jobs:
           sudo apt install -y pkg-config libgtk-3-dev liblzma-dev libstdc++-12-dev --no-install-recommends
           flutter build linux --release
           tar -zcvf linux-${{ matrix.platform }}.tar.gz build/linux/${{ matrix.platform }}/release/bundle
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-linux
           path: |
@@ -56,25 +56,30 @@ jobs:
     steps:
 
       - name: Checkout flatpak-flathub repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: wger-project/de.wger.flutter
 
       - name: Bump version and update manifest
         run: |
-          pip install pyyaml toml packaging
-          git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.7.3 ../flatpak-flutter
+          git clone https://github.com/TheAppgineer/flatpak-flutter.git --branch 0.7.5 ../flatpak-flutter
+          pip install -r ../flatpak-flutter/requirements.txt
           python bump-wger-version.py ${{ inputs.ref }}
           ../flatpak-flutter/flatpak-flutter.py --app-module wger flatpak-flutter.json
 
-      - name: Push updated config to flathub repository
-        uses: cpina/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          destination-github-username: wger-project
-          destination-repository-name: de.wger.flutter
-          user-email: github-actions@github.com
-          target-branch: release-${{ inputs.ref }}
-          create-target-branch-if-needed: true
-          commit-message: Update to ${{ inputs.ref }}
+      # TODO: this is currently commented out because it seems the action used below
+      #       doesn't work anymore. This is probably not all that surprising as it
+      #       isn't being developed anymore. This should be update so that the process
+      #       works automatically again, till then this can be done manually.
+
+      #- name: Push updated config to flathub repository
+      #  uses: cpina/github-action-push-to-another-repository@main
+      #  env:
+      #    SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
+      #  with:
+      #    destination-github-username: wger-project
+      #    destination-repository-name: de.wger.flutter
+      #    user-email: github-actions@github.com
+      #    target-branch: release-${{ inputs.ref }}
+      #    create-target-branch-if-needed: true
+      #    commit-message: Update to ${{ inputs.ref }}

.github/workflows/build-windows.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ inputs.ref }}
 
@@ -25,7 +25,7 @@ jobs:
       - name: Build .exe
         run: flutter build windows --release
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v5
         with:
           name: builds-windows
           path: build\windows\x64\runner\Release\wger.exe

.github/workflows/bump-version.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
 
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # needed to push changes
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -7,8 +7,10 @@ on:
   pull_request:
     branches: [ master, ]
     paths:
-      - '**.dart'
+      - '**/*.dart'
       - 'pubspec.yaml'
+      - '.github/actions/flutter-common/action.yml'
+      - '.github/workflows/ci.yml'
   workflow_call:
   workflow_dispatch:
 
@@ -16,8 +18,10 @@ jobs:
   test:
     name: Run tests
     runs-on: ubuntu-latest
+    env:
+      TZ: Europe/Berlin
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common

.github/workflows/make-release.yml

@@ -61,12 +61,13 @@ jobs:
       - build_linux
     steps:
       - name: Checkout application
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
+          lfs: true
           ref: ${{ github.event.inputs.version }}
 
       - name: Download builds
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           path: /tmp/
 
@@ -105,7 +106,7 @@ jobs:
   #      - build_apple
   #    steps:
   #      - name: Checkout application
-  #        uses: actions/checkout@v5
+  #        uses: actions/checkout@v6
   #        with:
   #          ref: feature/build-process
   #        #          ref: ${{ github.event.inputs.version }}
@@ -114,7 +115,7 @@ jobs:
   #        uses: ./.github/actions/flutter-common
   #
   #      - name: Download builds
-  #        uses: actions/download-artifact@v5
+  #        uses: actions/download-artifact@v6
   #        with:
   #          path: /tmp/
   #
@@ -133,7 +134,7 @@ jobs:
 
     steps:
       - name: Download builds
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
 
       - name: Make Github release
         uses: softprops/action-gh-release@v2

.github/workflows/screenshots.yml

@@ -0,0 +1,157 @@
+name: Update screenshots
+on:
+  workflow_dispatch:
+
+jobs:
+  screenshots_apple:
+    name: 'iOS'
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Install CocoaPods
+        run: |
+          cd ios
+          pod install || true
+          cd ..
+
+      - name: Boot iOS simulator
+        id: boot
+        run: |
+          SIMULATOR=$(xcrun simctl list devices available | awk -F '[()]' '/iPhone 17/{print $2; exit}')
+          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
+
+      - 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"
+
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots-ios
+          path: fastlane/metadata/ios/**/images/iPhone 6.9/*.png
+
+  screenshots_android:
+    name: 'Android - ${{ matrix.device.name }}'
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        device:
+          - name: "Phone"
+            profile: pixel_7_pro
+            device_type: androidPhone
+            folder: phoneScreenshots
+          - name: "Tablet 7in"
+            profile: 7in WSVGA (Tablet)
+            device_type: androidTabletSmall
+            folder: sevenInchScreenshots
+          - name: "Tablet 10in"
+            profile: pixel_tablet
+            device_type: androidTabletBig
+            folder: tenInchScreenshots
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Common flutter setup
+        uses: ./.github/actions/flutter-common
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Accept Android SDK licenses
+        run: yes | sdkmanager --licenses || true
+
+      # Free up disk space on the runner. List taken from
+      # https://github.com/flathub-infra/vorarbeiter/blob/main/.github/workflows/build.yml
+      #
+      # If needed, consult the list of available software for other candidates to remove:
+      # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
+      - name: Free up disk space
+        run: |
+          sudo swapoff -a || true
+          sudo rm -rf /opt/ghc /usr/local/.ghcup || true
+          sudo rm -rf /opt/hostedtoolcache/CodeQL || true
+          sudo rm -rf /opt/hostedtoolcache/PyPy
+          sudo rm -rf /usr/local/julia* /usr/share/java /usr/share/kotlinc
+          sudo rm -rf /opt/hostedtoolcache/go /opt/az /opt/microsoft /opt/pipx
+          sudo rm -rf /usr/share/miniconda /home/runner/.rustup /home/packer/.rustup /home/runneradmin/.rustup
+          sudo rm -rf /etc/skel/.rustup /opt/hostedtoolcache/node /opt/google-cloud-sdk
+          sudo rm -rf /usr/share/az_* /opt/google /usr/lib/firefox /usr/local/aws-*
+          sudo rm -rf /usr/libexec/gcc /opt/actionarchivecache /opt/hostedtoolcache/Ruby
+          sudo rm -rf /var/lib/mysql /usr/local/n
+          sudo rm -rf /swapfile || true
+          sudo rm -rf /usr/share/dotnet /usr/share/swift
+          sudo rm -rf /usr/local/share/boost /usr/local/share/powershell
+          sudo rm -rf /usr/lib/google-cloud-sdk 
+          sudo rm -rf /usr/local/graalvm /usr/local/share/chromium
+          sudo rm -rf /usr/local/lib/node_modules
+          sudo rm -rf /usr/lib/dotnet /usr/lib/php /usr/share/mysql
+          sudo rm -rf /usr/lib/llvm-*
+          sudo rm -rf /usr/lib/mono
+          sudo apt-get clean || true
+          sudo rm -rf /var/lib/apt/lists/*
+
+      - name: Generate screenshots
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 36
+          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
+          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 }}
+
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v5
+        with:
+          name: screenshots-android-${{ matrix.device.folder }}
+          path: fastlane/metadata/android/**/images/${{ matrix.device.folder }}/*.png
+
+  commit_screenshots:
+    name: 'Commit and push'
+    needs:
+      - screenshots_apple
+      - screenshots_android
+
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Download all screenshot artifacts
+        uses: actions/download-artifact@v6
+        with:
+          path: screenshots
+
+      - 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/
+
+      - name: Commit screenshots to repository
+        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 add fastlane/metadata/android fastlane/metadata/ios || true
+          if git diff --staged --quiet; then
+            echo "No new or changed screenshots to commit."
+          else
+            BRANCH=$(git rev-parse --abbrev-ref HEAD)
+             git commit -m "Update screenshots"
+             git push origin HEAD:"${BRANCH}"
+          fi

AUTHORS.md

@@ -2,6 +2,10 @@
 
 Thank you all for contributing to the project, you are true heroes! 🫶
 
+*Generated on 2025-11-10*
+
+---
+
 ## Contributors
 
 - thisisyoussef - [https://github.com/thisisyoussef](https://github.com/thisisyoussef)
@@ -89,7 +93,7 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - Thilina Herath - [https://github.com/thilinatnt](https://github.com/thilinatnt)
 - ToldYouThat
 - Yair Chen - [https://github.com/chenyair](https://github.com/chenyair)
-- henok3878 - [https://github.com/henok3878](https://github.com/henok3878)
+- henok3878 - [https://github.com/h3nock](https://github.com/h3nock)
 - Patrick Witter - [https://github.com/patrickwitter](https://github.com/patrickwitter)
 - ton-An - [https://github.com/ton-An](https://github.com/ton-An)
 - Prakash Shekhar - [https://github.com/prakash-shekhar](https://github.com/prakash-shekhar)
@@ -100,40 +104,50 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - Jannik Norden
 - Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
 - Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
-- Dylan Aird - [https://github.com/Dolaned](https://github.com/Dolaned)
 
 ## Translators
 
+### Amharic
+
+- henok3878 - [https://github.com/h3nock](https://github.com/h3nock)
+
+### Arabic
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Hanaa - [https://github.com/hn-n](https://github.com/hn-n)
+- Ahmed zein - [https://github.com/Ahmed-Zein](https://github.com/Ahmed-Zein)
+
+### Catalan
+
+- Zixu Sun - [https://github.com/ziixu](https://github.com/ziixu)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
+
+### Chinese (Simplified Han script)
+
+- Herb Huang
+
+### Chinese (Simplified)
+
+- 纪颖志 - [https://github.com/jiyingzhi](https://github.com/jiyingzhi)
+- Yi-Han Hsiung - [https://github.com/AaronHsiung](https://github.com/AaronHsiung)
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- Eddie Tang - [https://github.com/EDED2314](https://github.com/EDED2314)
+- Jing - [https://github.com/jingcheng16](https://github.com/jingcheng16)
+- sr-c - [https://github.com/sr-c](https://github.com/sr-c)
+- tony - [https://github.com/tonyxxliu](https://github.com/tonyxxliu)
+- yiter
+
 ### Chinese (Traditional Han script)
 
 - Peter Dave Hello - [https://github.com/PeterDaveHello](https://github.com/PeterDaveHello)
 
-### Polish
+### Chinese (Traditional)
 
-- Karol Solecki - [https://github.com/karolsol](https://github.com/karolsol)
-- Piotr Strebski - [https://github.com/strebski](https://github.com/strebski)
-- Dawid Panyło
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Marcin Schoenknecht
-- Patryk - [https://github.com/byakurau](https://github.com/byakurau)
-- Michał Homza - [https://github.com/HagiaHaya](https://github.com/HagiaHaya)
-- Jacob - [https://github.com/devzom](https://github.com/devzom)
-
-### Serbian
-
-- Mladen Trišić - [https://github.com/mtrisic](https://github.com/mtrisic)
-
-### Dutch
-
-- Joey Haalboom - [https://github.com/JoeyHaalboom](https://github.com/JoeyHaalboom)
-
-### Russian
-
-- Алексей Курышко - [https://github.com/alexkuryshko](https://github.com/alexkuryshko)
-- lightningcpu - [https://github.com/lightningcpu](https://github.com/lightningcpu)
-- Кирилл Александрович Злобин - [https://github.com/gungstarbeiter](https://github.com/gungstarbeiter)
-- Ivan Katkov - [https://github.com/Porphyrion](https://github.com/Porphyrion)
-- Nikita Epifanov
+- hugoalh
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- Chung-Wei Chung - [https://github.com/webb790709](https://github.com/webb790709)
+- HY Cheng
 
 ### Croatian
 
@@ -141,18 +155,78 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
 - SMilohanic - [https://github.com/sandimilohanic](https://github.com/sandimilohanic)
 
-### Portuguese
+### Czech
 
-- Edson Wolf - [https://github.com/edsonblwolf](https://github.com/edsonblwolf)
+- Fjuro - [https://github.com/Fjuro](https://github.com/Fjuro)
+- Fjuro
+- CaptainDolphy - [https://github.com/CaptainDolphy](https://github.com/CaptainDolphy)
+- Roman Kalivoda - [https://github.com/RKCZ](https://github.com/RKCZ)
+
+### Dutch
+
+- Joey Haalboom - [https://github.com/JoeyHaalboom](https://github.com/JoeyHaalboom)
+
+### English
+
+- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+
+### French
+
+- William - [https://github.com/WilliamR312](https://github.com/WilliamR312)
+- florent4014 - [https://github.com/florent4014](https://github.com/florent4014)
 - Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Wilton Rodrigues
-- Guilherme Salomão - [https://github.com/salomaoparkour](https://github.com/salomaoparkour)
-- Bruno de Moura - [https://github.com/bruunomooura](https://github.com/bruunomooura)
-- Dalton Scavassa
-- Stefan Taiguara - [https://github.com/Teitei011](https://github.com/Teitei011)
-- Eduardo Menges Mattje - [https://github.com/EduMenges](https://github.com/EduMenges)
-- Edu Cavalheiro - [https://github.com/EduCavalheiro](https://github.com/EduCavalheiro)
-- João Goulart - [https://github.com/usehalter](https://github.com/usehalter)
+- Xav Basco
+- David Olewski - [https://github.com/Arigowin](https://github.com/Arigowin)
+- yoyomax80400 - [https://github.com/yoyomax80400](https://github.com/yoyomax80400)
+- loued - [https://github.com/Loued](https://github.com/Loued)
+- Célian
+- MrSniikyz - [https://github.com/BabyGeek](https://github.com/BabyGeek)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- J. Lavoie
+- Antoine Vibien - [https://github.com/r1llettes](https://github.com/r1llettes)
+- Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
+
+### German
+
+- kvnrmnn - [https://github.com/rmnn92](https://github.com/rmnn92)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Victor Jouhoff - [https://github.com/jouhoffv](https://github.com/jouhoffv)
+- m4skedbyte
+- Axel Steinbrecher
+- Christoph Suesser - [https://github.com/TheFitzZZ](https://github.com/TheFitzZZ)
+- Luis Lüscher - [https://github.com/lslschr](https://github.com/lslschr)
+- mondstern
+- J. Lavoie
+- Marvin M - [https://github.com/M123-dev](https://github.com/M123-dev)
+- Lydia
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+
+### Greek
+
+- Dimitrys Meliates
+- Antonis-geo - [https://github.com/Antonis-geo](https://github.com/Antonis-geo)
+
+### Hebrew
+
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- n,rdo
+- Tomer Ben Rachel - [https://github.com/TomerPacific](https://github.com/TomerPacific)
+
+### Hindi
+
+- pavan arun bagwe - [https://github.com/pavanb0](https://github.com/pavanb0)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Debayan Sutradhar - [https://github.com/rnayabed](https://github.com/rnayabed)
+
+### Indonesian
+
+- aryakdaniswara - [https://github.com/aryakdaniswara](https://github.com/aryakdaniswara)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Debi Maulana Ahsan Halla
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
 
 ### Italian
 
@@ -171,32 +245,41 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - mondstern
 - Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
 
-### French
+### Japanese
 
-- William - [https://github.com/WilliamR312](https://github.com/WilliamR312)
-- florent4014 - [https://github.com/florent4014](https://github.com/florent4014)
 - Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Xav Basco
-- David Olewski - [https://github.com/Arigowin](https://github.com/Arigowin)
-- yoyomax80400 - [https://github.com/yoyomax80400](https://github.com/yoyomax80400)
-- loued - [https://github.com/Loued](https://github.com/Loued)
-- Célian
-- MrSniikyz - [https://github.com/BabyGeek](https://github.com/BabyGeek)
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-- J. Lavoie
-- Antoine Vibien - [https://github.com/r1llettes](https://github.com/r1llettes)
-- Stefano Rossi - [https://github.com/stefanorossiti](https://github.com/stefanorossiti)
+- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
+- sasukeiscool - [https://github.com/sasukeiscool](https://github.com/sasukeiscool)
+- yiter
 
-### Ukrainian
+### Norwegian Bokmål
 
-- Максим Горпиніч - [https://github.com/Maksim2005UA](https://github.com/Maksim2005UA)
 - Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-- Максим Горпиніч
+- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
+
+### Polish
+
+- Karol Solecki - [https://github.com/karolsol](https://github.com/karolsol)
+- Piotr Strebski - [https://github.com/strebski](https://github.com/strebski)
+- Dawid Panyło
 - Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Dan - [https://github.com/Kefir2105](https://github.com/Kefir2105)
-- Dan
-- Tymofii Lytvynenko
-- Artem - [https://github.com/defaultpage](https://github.com/defaultpage)
+- Marcin Schoenknecht
+- Patryk - [https://github.com/byakurau](https://github.com/byakurau)
+- Michał Homza - [https://github.com/HagiaHaya](https://github.com/HagiaHaya)
+- Jacob - [https://github.com/devzom](https://github.com/devzom)
+
+### Portuguese
+
+- Edson Wolf - [https://github.com/edsonblwolf](https://github.com/edsonblwolf)
+- Anonymous - [https://github.com/weblate](https://github.com/weblate)
+- Wilton Rodrigues
+- Guilherme Salomão - [https://github.com/salomaoparkour](https://github.com/salomaoparkour)
+- Bruno de Moura - [https://github.com/bruunomooura](https://github.com/bruunomooura)
+- Dalton Scavassa
+- Stefan Taiguara - [https://github.com/Teitei011](https://github.com/Teitei011)
+- Eduardo Menges Mattje - [https://github.com/EduMenges](https://github.com/EduMenges)
+- Edu Cavalheiro - [https://github.com/EduCavalheiro](https://github.com/EduCavalheiro)
+- João Goulart - [https://github.com/usehalter](https://github.com/usehalter)
 
 ### Portuguese (Brazil)
 
@@ -210,99 +293,26 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - Luigi Henrick Feitoza Silva - [https://github.com/luigihenrick](https://github.com/luigihenrick)
 - João Hortêncio Moraes - [https://github.com/joaohortencio](https://github.com/joaohortencio)
 
-### Tamil
-
-- தமிழ்நேரம் - [https://github.com/TamilNeram](https://github.com/TamilNeram)
-
-### Chinese (Simplified Han script)
-
-- Herb Huang
-
-### Hindi
-
-- pavan arun bagwe - [https://github.com/pavanb0](https://github.com/pavanb0)
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Debayan Sutradhar - [https://github.com/rnayabed](https://github.com/rnayabed)
-
-### Turkish
-
-- Oğuz Ersen - [https://github.com/oersen](https://github.com/oersen)
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-- Cem Avcı - [https://github.com/cem256](https://github.com/cem256)
-- Oğuz Ersen
-- Cenk Cidecio - [https://github.com/ccidecio](https://github.com/ccidecio)
-- ToldYouThat
-
-### German
-
-- kvnrmnn - [https://github.com/rmnn92](https://github.com/rmnn92)
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-- Victor Jouhoff - [https://github.com/jouhoffv](https://github.com/jouhoffv)
-- m4skedbyte
-- Axel Steinbrecher
-- Christoph Suesser - [https://github.com/TheFitzZZ](https://github.com/TheFitzZZ)
-- Luis Lüscher - [https://github.com/lslschr](https://github.com/lslschr)
-- mondstern
-- J. Lavoie
-- Marvin M - [https://github.com/M123-dev](https://github.com/M123-dev)
-- Lydia
-- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
-
-### Indonesian
-
-- aryakdaniswara - [https://github.com/aryakdaniswara](https://github.com/aryakdaniswara)
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Debi Maulana Ahsan Halla
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-
-### Catalan
-
-- Zixu Sun - [https://github.com/ziixu](https://github.com/ziixu)
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
-
-### Chinese (Simplified)
-
-- 纪颖志 - [https://github.com/jiyingzhi](https://github.com/jiyingzhi)
-- Yi-Han Hsiung - [https://github.com/AaronHsiung](https://github.com/AaronHsiung)
-- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
-- Eddie Tang - [https://github.com/EDED2314](https://github.com/EDED2314)
-- Jing - [https://github.com/jingcheng16](https://github.com/jingcheng16)
-- sr-c - [https://github.com/sr-c](https://github.com/sr-c)
-- tony - [https://github.com/tonyxxliu](https://github.com/tonyxxliu)
-- yiter
-
-### Greek
-
-- Dimitrys Meliates
-- Antonis-geo - [https://github.com/Antonis-geo](https://github.com/Antonis-geo)
-
-### Czech
-
-- Fjuro - [https://github.com/Fjuro](https://github.com/Fjuro)
-- Fjuro
-- CaptainDolphy - [https://github.com/CaptainDolphy](https://github.com/CaptainDolphy)
-- Roman Kalivoda - [https://github.com/RKCZ](https://github.com/RKCZ)
-
-### Arabic
+### Portuguese (Portugal)
 
 - Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Hanaa - [https://github.com/hn-n](https://github.com/hn-n)
-- Ahmed zein - [https://github.com/Ahmed-Zein](https://github.com/Ahmed-Zein)
 
-### Hebrew
+### Romanian
 
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- n,rdo
-- Tomer Ben Rachel - [https://github.com/TomerPacific](https://github.com/TomerPacific)
+- Bogdan Bujor - [https://github.com/qSharpy](https://github.com/qSharpy)
+- dimii27 - [https://github.com/dimii27](https://github.com/dimii27)
 
-### Japanese
+### Russian
 
-- Anonymous - [https://github.com/weblate](https://github.com/weblate)
-- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
-- sasukeiscool - [https://github.com/sasukeiscool](https://github.com/sasukeiscool)
-- yiter
+- Алексей Курышко - [https://github.com/alexkuryshko](https://github.com/alexkuryshko)
+- lightningcpu - [https://github.com/lightningcpu](https://github.com/lightningcpu)
+- Кирилл Александрович Злобин - [https://github.com/gungstarbeiter](https://github.com/gungstarbeiter)
+- Ivan Katkov - [https://github.com/Porphyrion](https://github.com/Porphyrion)
+- Nikita Epifanov
+
+### Serbian
+
+- Mladen Trišić - [https://github.com/mtrisic](https://github.com/mtrisic)
 
 ### Spanish
 
@@ -317,33 +327,26 @@ Thank you all for contributing to the project, you are true heroes! 🫶
 - Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
 - martingetzel - [https://github.com/martingetzel](https://github.com/martingetzel)
 
-### Chinese (Traditional)
+### Tamil
 
-- hugoalh
-- Tsz Hong CHAN - [https://github.com/tomyan112](https://github.com/tomyan112)
-- Chung-Wei Chung - [https://github.com/webb790709](https://github.com/webb790709)
-- HY Cheng
+- தமிழ்நேரம் - [https://github.com/TamilNeram](https://github.com/TamilNeram)
 
-### Portuguese (Portugal)
+### Turkish
 
+- Oğuz Ersen - [https://github.com/oersen](https://github.com/oersen)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Cem Avcı - [https://github.com/cem256](https://github.com/cem256)
+- Oğuz Ersen
+- Cenk Cidecio - [https://github.com/ccidecio](https://github.com/ccidecio)
+- ToldYouThat
+
+### Ukrainian
+
+- Максим Горпиніч - [https://github.com/Maksim2005UA](https://github.com/Maksim2005UA)
+- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
+- Максим Горпиніч
 - Anonymous - [https://github.com/weblate](https://github.com/weblate)
-
-### Romanian
-
-- Bogdan Bujor - [https://github.com/qSharpy](https://github.com/qSharpy)
-- dimii27 - [https://github.com/dimii27](https://github.com/dimii27)
-
-### English
-
-- guillem - [https://github.com/gbuendia](https://github.com/gbuendia)
-- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-
-### Norwegian Bokmål
-
-- Roland Geider - [https://github.com/rolandgeider](https://github.com/rolandgeider)
-- Allan Nordhøy - [https://github.com/comradekingu](https://github.com/comradekingu)
-
-### Amharic
-
-- henok3878 - [https://github.com/henok3878](https://github.com/henok3878)
+- Dan - [https://github.com/Kefir2105](https://github.com/Kefir2105)
+- Dan
+- Tymofii Lytvynenko
+- Artem - [https://github.com/defaultpage](https://github.com/defaultpage)

Gemfile.lock

@@ -1,18 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.7)
-      base64
-      nkf
-      rexml
+    CFPropertyList (3.0.8)
     abbrev (0.1.2)
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1163.0)
-    aws-sdk-core (3.232.0)
+    aws-partitions (1.1190.0)
+    aws-sdk-core (3.239.2)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -20,23 +17,24 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.112.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.199.0)
-      aws-sdk-core (~> 3, >= 3.231.0)
+    aws-sdk-s3 (1.206.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
-    base64 (0.3.0)
-    bigdecimal (3.2.3)
+    base64 (0.2.0)
+    bigdecimal (3.3.1)
     claide (1.1.0)
     colored (1.2)
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     digest-crc (0.7.0)
       rake (>= 12.0.0, < 14.0.0)
@@ -56,9 +54,9 @@ GEM
       faraday-rack (~> 1.0)
       faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-cookie_jar (0.0.7)
+    faraday-cookie_jar (0.0.8)
       faraday (>= 0.8.0)
-      http-cookie (~> 1.0.0)
+      http-cookie (>= 1.0.0)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
@@ -73,15 +71,18 @@ GEM
     faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.4.0)
-    fastlane (2.228.0)
+    fastlane (2.229.1)
       CFPropertyList (>= 2.3, < 4.0.0)
+      abbrev (~> 0.1.2)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
+      base64 (~> 0.2.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored (~> 1.2)
       commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -101,7 +102,9 @@ GEM
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3.0)
       naturally (~> 2.2)
+      nkf (~> 0.2.0)
       optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
@@ -161,23 +164,23 @@ GEM
     httpclient (2.9.0)
       mutex_m
     jmespath (1.6.2)
-    json (2.15.0)
+    json (2.17.1)
     jwt (2.10.2)
       base64
     logger (1.7.0)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    multi_json (1.17.0)
+    multi_json (1.18.0)
     multipart-post (2.4.1)
     mutex_m (0.3.0)
     nanaimo (0.4.0)
     naturally (2.3.0)
     nkf (0.2.0)
-    optparse (0.6.0)
+    optparse (0.8.0)
     os (1.1.4)
     plist (3.7.2)
-    public_suffix (6.0.2)
-    rake (13.3.0)
+    public_suffix (7.0.0)
+    rake (13.3.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -225,6 +228,7 @@ PLATFORMS
   arm64-darwin-22
   arm64-darwin-23
   arm64-darwin-24
+  arm64-darwin-25
   x86_64-linux
 
 DEPENDENCIES
@@ -235,4 +239,4 @@ DEPENDENCIES
   mutex_m
 
 BUNDLED WITH
-   2.6.9
+   2.7.2

android/app/build.gradle

@@ -39,7 +39,7 @@ 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 flutter.minSdkVersion
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

android/build.gradle

@@ -17,19 +17,19 @@ subprojects {
     afterEvaluate { project ->
         if (project.extensions.findByName("android") != null) {
             Integer pluginCompileSdk = project.android.compileSdk
-            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
+            if (pluginCompileSdk != null && pluginCompileSdk < 34) {
                 project.logger.error(
                         "Warning: Overriding compileSdk version in Flutter plugin: "
                                 + project.name
                                 + " from "
                                 + pluginCompileSdk
-                                + " to 31 (to work around https://issuetracker.google.com/issues/199180389)."
+                                + " to 36 (to work around https://issuetracker.google.com/issues/199180389)."
                                 + "\nIf there is not a new version of " + project.name + ", consider filing an issue against "
                                 + project.name
                                 + " to increase their compileSdk to the latest (otherwise try updating to the latest version)."
                 )
                 project.android {
-                    compileSdk 34
+                    compileSdk 36
                 }
             }
         }

android/gradle.properties

@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx2048M
-android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip

android/settings.gradle

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.1.20" apply false
+    id "com.android.application" version "8.13.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.21" apply false
 }
 
 include ":app"