Merge branch 'master' into feature/ingredient-images

# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart

Author: rolandgeider

.github/workflows/android-release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: 11.x
+          java-version: 17.x
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
@@ -25,7 +25,7 @@ jobs:
         uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-          flutter-version: '3.0.x'
+          flutter-version: '3.7.x'
 
       - name: Decrypt config files
         run: |
@@ -46,11 +46,10 @@ jobs:
         run: flutter pub get
 
       - name: Extract version information
-        id: get_version
         run: |
-          echo ::set-output name=VERSION_V::$(echo $GITHUB_REF | cut -d / -f 3)
-          echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3 | cut -c 2-)
-          echo ::set-output name=BUILD::$(flutter pub run cider version | cut -d '+' -f 2)
+          echo "VERSION_V=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV
+          echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3 | cut -c 2-)" >> $GITHUB_ENV
+          echo "BUILD=$(flutter pub run cider version | cut -d '+' -f 2)" >> $GITHUB_ENV
 
       # Note: the original tag that triggered the workflow is in the form vX.Y.Z
       #       but the pubspec.yaml is committed in the commit after that one.
@@ -61,30 +60,30 @@ jobs:
       #       one without the v and push it.
       - name: Bump version
         run: |
-          flutter pub run cider version ${{ steps.get_version.outputs.VERSION }}+${{ steps.get_version.outputs.BUILD }}
+          flutter pub run cider version ${{ env.VERSION }}+${{ env.BUILD }}
           flutter pub run cider bump build
 
           git config user.name Github-actions
           git config user.email [email protected]
           git add .
           git commit -m "Bump version to $( flutter pub run cider version )"
-          git tag ${{ steps.get_version.outputs.VERSION }}
+          git tag ${{ env.VERSION }}
           git push origin HEAD:master --tags
-          git push origin --delete ${{ steps.get_version.outputs.VERSION_V }}
+          git push origin --delete ${{ env.VERSION_V }}
 
       - name: Build AAB
         run: flutter build appbundle --release
         env:
           WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
 
       - name: Upload build to Play Store
-        uses: maierj/fastlane-action@v2.1.0
+        uses: maierj/fastlane-action@v2.2.1
         with:
           lane: production
 
       - name: Make Github release
         uses: softprops/action-gh-release@v1
         with:
           files: build/app/outputs/bundle/release/app-release.aab
-          tag_name: ${{ steps.get_version.outputs.VERSION }}
+          tag_name: ${{ env.VERSION }}
           body_path: CHANGELOG.md

.github/workflows/ci.yml

@@ -1,26 +1,25 @@
 name: Continous Integration
 on:
   push:
-    branches: [ master ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
   pull_request:
-    branches: [ master ]
+    branches: [ pull_request, master ]
     paths:
       - '**.dart'
       - 'pubspec.yaml'
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:  
     - uses: actions/checkout@v1
 
     - name: Install Flutter
       uses: subosito/flutter-action@v1
       with:
         channel: 'stable'
-        flutter-version: '3.0.x'
+        flutter-version: '3.7.x'
 
     - run: dart --version
     - run: flutter --version

.github/workflows/dependabot.yml

@@ -7,27 +7,27 @@ on:
     paths:
       - '**.dart'
 
-    
+
 jobs:
   linting:
     runs-on: ubuntu-latest
     steps:
 
       - name: Checkout code
         uses: actions/checkout@v2
-      
+
       - name: Setup Flutter
         uses: subosito/flutter-action@v1
         with:
           channel: 'stable'
-          flutter-version: '3.0.x'
+          flutter-version: '3.7.x'
 
       - name: Get dependencies
         run: flutter pub get
 
-      - name: Check for formatting issues (run "flutter format . ")
-        run: flutter format --line-length=100 .
-      
+      - name: Check for formatting issues (run "dart format . ")
+        run: dart format --line-length=100 .
+
       - name: Push a commit with the changed files
         continue-on-error: true
         run: |

.github/workflows/linter.yml

@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/
@@ -47,3 +47,7 @@ app.*.map.json
 /fastlane/metadata/envfiles/wger.properties
 /fastlane/metadata/envfiles/keys.jks
 /fastlane/metadata/envfiles/key.properties
+
+# Others
+/vendor/bundle/ruby/
+/coverage/

.gitignore

@@ -1,3 +1,4 @@
 {
-    "dart.lineLength": 100
+    "dart.lineLength": 100,
+    "diffEditor.ignoreTrimWhitespace": true,
 }

.vscode/settings.json

@@ -13,6 +13,11 @@
 - Marko Milosevic - <https://github.com/TaarnStar>
 - Karthik Reddy (Axel) - <https://github.com/AxelBlaz3>
 - Ogundoyin Toluwani - <https://github.com/Tolu007>
+- Nenza Nurfirmansyah - <https://github.com/nenzan>
+- Florian Schmitz - <https://github.com/floodoo>
+- Adam Bujdoš - <https://github.com/bujdy>
+- Aman Negi - <https://github.com/AmanNegi>
+- Sandi Milohanic - <https://github.com/sandimilohanic>
 
 ## Translators
 
@@ -51,3 +56,11 @@
 - Japanese
 
   - Kosei TANAKA <[email protected]> (97)
+
+- Bahasa Indonesia
+
+  - Nenza Nurfirmansyah <[email protected]> (73)
+
+- Croatian
+  
+  - Sandi Milohaic <[email protected]>

AUTHORS.md

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)