Merge branch 'master' into ux_fixes

.github/workflows/build-release.yml

@@ -12,14 +12,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 17.x
+          java-version: '17'
+          distribution: 'oracle'
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3
+          ruby-version: '3.2'
 
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
@@ -63,17 +64,17 @@ jobs:
           flutter build linux --release
           cd flatpak/scripts
           dart pub get
-          dart flatpak_packager.dart --meta ../flatpak_meta.json --github
+          dart flatpak_packager.dart --meta ../flatpak_meta.json --github --addTodaysVersion ${{ env.VERSION }}
 
       - name: Build AAB
         run: flutter build appbundle --release
         env:
           WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
 
       - name: Upload build to Play Store
-        uses: maierj/[email protected]
-        with:
-          lane: production
+        run: |
+          bundle install
+          bundle exec fastlane android production
 
       - name: Make Github release
         uses: softprops/action-gh-release@v1
@@ -120,6 +121,6 @@ jobs:
           git add pubspec.yaml
           git commit -m "Bump version to $( flutter pub run cider version )"
           git tag ${{ env.VERSION }}
-          git push ${{ env.VERSION }}
-          git push --delete ${{ env.VERSION_V }}
+          git push origin ${{ env.VERSION }}
+          git push origin --delete ${{ env.VERSION_V }}
           git push

AUTHORS.md

@@ -23,9 +23,14 @@
 - artchiee - <https://github.com/artchiee>
 - Tejas Bir Singh - <https://github.com/tejasbirsingh>
 - Abhishek Saini - <https://github.com/Abhisheksainii>
+- Hanaa Allohibi - <https://github.com/hn-n>
+- Shey Alnasrawi - <https://github.com/Milksheyke>
 
 ## Translators
 
+- Saudi Arabian
+  - Hanaa Allohibi <Gmail: programmerHanaa> 
+
 - German
 
   - mondstern <[email protected]> (2)

Gemfile.lock

@@ -3,25 +3,25 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    addressable (2.8.5)
+    addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.853.0)
-    aws-sdk-core (3.187.0)
-      aws-eventstream (~> 1, >= 1.0.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.877.0)
+    aws-sdk-core (3.190.2)
+      aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.5)
+      aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.72.0)
-      aws-sdk-core (~> 3, >= 3.184.0)
+    aws-sdk-kms (1.76.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.137.0)
-      aws-sdk-core (~> 3, >= 3.181.0)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.6)
-    aws-sigv4 (1.6.1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -32,10 +32,10 @@ GEM
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.6.20231109)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.104.0)
+    excon (0.109.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -64,8 +64,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.7)
-    fastlane (2.217.0)
+    fastimage (2.3.0)
+    fastlane (2.219.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +84,7 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
       http-cookie (~> 1.0.5)
@@ -92,7 +93,7 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (~> 0.1.1)
+      optparse (>= 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
@@ -107,7 +108,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-versioning (0.5.2)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.52.0)
+    google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.2)
       addressable (~> 2.5, >= 2.5.1)
@@ -122,19 +123,19 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-playcustomapp_v1 (0.13.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-storage_v1 (0.29.0)
+    google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.0)
-      google-cloud-env (~> 1.0)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.3.1)
-    google-cloud-storage (1.45.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.29.0)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -149,17 +150,17 @@ GEM
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.6.3)
+    json (2.7.1)
     jwt (2.7.1)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.3.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    optparse (0.1.1)
+    optparse (0.4.0)
     os (1.1.4)
-    plist (3.7.0)
+    plist (3.7.1)
     public_suffix (5.0.4)
     rake (13.1.0)
     representable (3.2.0)
@@ -185,7 +186,7 @@ GEM
       unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
-    tty-screen (0.8.1)
+    tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)

README.md

@@ -8,11 +8,11 @@ If you want to contribute, hop on the Discord server and say hi!
 
 
 <p>
-<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png" width="200" />
+<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01%20-%20dashboard.png" width="200" alt="" />
 
-<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04%20-%20measurements.png" width="200" />
+<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04%20-%20measurements.png" width="200" alt="" />
 
-<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05%20-%20nutritional%20plan.png" width="200" />
+<img src="https://raw.githubusercontent.com/wger-project/flutter/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05%20-%20nutritional%20plan.png" width="200" alt="" />
 </p>
 
 ## Installation
@@ -40,30 +40,31 @@ Alternatively, you can use the test server (the db is reset every day):
 
 ### 2
 
-Install Flutter, and all its dependencies, and create a new virtual device:
+Install Flutter and all its dependencies, and create a new virtual device:
 <https://flutter.dev/docs/get-started/install>.
 
 The app currently uses flutter 3.16
 
 ### 3
+The application will complain about an API key not being set. You can just
+ignore this during development, this is only important if you want to register
+directly over the app. If you just want to login, you can skip this section.
 
-Create a new file ``wger.properties`` in ``fastlane/metadata/envfiles/``:
+If you want to register directly over the app, you need to set a user on the backend
+that is allowed to do this. For this, create/register a new user, generate an api key
+and run ``python3 manage.py add-user-rest theusername`` (you can later list all the
+registered users with ``python3 manage.py list-users-api``).
+
+Then create a new file ``wger.properties`` in ``fastlane/metadata/envfiles/`` and
+add the key:
 
 ```properties
 WGER_API_KEY=123456
 ```
 
-On Linux and macOS, add these as environment variables, e.g. by running the `source`
+Alternatively, add the key as an environment variables, e.g. by running the `source`
 command on the file.
 
-To just run/develop the app it only needs to have any value for WGER_API_KEY, but
-you need a correct value if you want to register via the app. For this, you need
-to allow (a probably dedicated) user on the wger server to register users on its
-behalf. For this, generate an API KEY by visiting <http://localhost:8000/de/user/api-key>
-on your local instance and then run ``python3 manage.py add-user-rest the username``
-
-You can later list all the registered users with: ``python3 manage.py list-users-api``
-
 ### 4
 
 Start the application with ``flutter run`` or use your IDE
@@ -74,7 +75,7 @@ You can run the tests with the ``flutter test``
 
 ## Translation
 
-Translate the app to your language on  [Weblate](https://hosted.weblate.org/engage/wger/).
+Translate the app to your language on [Weblate](https://hosted.weblate.org/engage/wger/).
 
 [![translation status](https://hosted.weblate.org/widgets/wger/-/mobile/multi-blue.svg)](https://hosted.weblate.org/engage/wger/)
 

fastlane/report.xml

@@ -5,12 +5,12 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000184">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000203">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: upload_to_play_store" time="120.387155">
+      <testcase classname="fastlane.lanes" name="1: upload_to_play_store" time="174.567673">
 
       </testcase>
 

flatpak/flatpak_meta.json

@@ -3,14 +3,8 @@
     "lowercaseAppName": "wger",
     "githubReleaseOrganization": "wger-project",
     "githubReleaseProject": "flutter",
-    "localReleases": [
-
-    ],
-    "localReleaseAssets": [
-
-    ],
     "localLinuxBuildDir": "../build/linux",
-    "appDataPath": "de.wger.flutter.appdata.xml",
+    "appStreamPath": "de.wger.flutter.metainfo.xml",
     "desktopPath": "de.wger.flutter.desktop",
     "icons": {
         "64x64": "logo64.png",