Merge branch 'master' into feature/flexible-routines

# Conflicts:
#	test/weight/weight_screen_test.mocks.dart

.github/workflows/build-release.yml

@@ -68,13 +68,9 @@ jobs:
 
       - name: Build AAB
         run: flutter build appbundle --release
-        env:
-          WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
 
       - name: Build APK
         run: flutter build apk --release
-        env:
-          WGER_API_KEY: ${{ secrets.WGER_API_KEY }}
 
       - name: Upload build to Play Store
         run: |

AUTHORS.md

@@ -30,6 +30,8 @@
 - Dieter Plaetinck - <https://github.com/Dieterbe>
 - Dennis van Peer - <https://github.com/Denpeer>
 - sizzlesloth - <https://github.com/sizzlesloth>
+- Arya Singh - <https://github.com/ARYPROGRAMMER>
+- Xianglin Zeng - <https://github.com/FutureYL3>
 
 ## Translators
 

Gemfile.lock

@@ -5,25 +5,25 @@ GEM
       base64
       nkf
       rexml
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.944.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.1003.0)
+    aws-sdk-core (3.212.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.84.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.95.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.170.0)
+      aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     base64 (0.2.0)
@@ -38,8 +38,8 @@ GEM
     domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.110.0)
-    faraday (1.10.3)
+    excon (0.112.0)
+    faraday (1.10.4)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -60,15 +60,15 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
+    faraday_middleware (1.2.1)
       faraday (~> 1.0)
     fastimage (2.3.1)
-    fastlane (2.220.0)
+    fastlane (2.225.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -84,6 +84,7 @@ GEM
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.0.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-apis-androidpublisher_v3 (~> 0.3)
       google-apis-playcustomapp_v1 (~> 0.1)
@@ -109,7 +110,9 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
-    fastlane-plugin-versioning (0.5.2)
+    fastlane-plugin-versioning (0.7.0)
+    fastlane-sirp (1.0.0)
+      sysrandom (~> 1.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.54.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -127,7 +130,7 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.7.0)
+    google-cloud-core (1.7.1)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
@@ -148,32 +151,31 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.6)
+    http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.7.2)
-    jwt (2.8.1)
+    json (2.8.1)
+    jwt (2.9.3)
       base64
-    mini_magick (4.13.1)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     naturally (2.2.1)
     nkf (0.2.0)
-    optparse (0.5.0)
+    optparse (0.6.0)
     os (1.1.4)
     plist (3.7.1)
-    public_suffix (5.1.0)
+    public_suffix (6.0.1)
     rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.9)
-      strscan
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -186,7 +188,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
-    strscan (3.1.0)
+    sysrandom (1.0.5)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -196,15 +198,15 @@ GEM
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
     uber (0.1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     word_wrap (1.0.0)
-    xcodeproj (1.24.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (~> 3.2.4)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)

README.md

@@ -43,29 +43,9 @@ Alternatively, you can use the test server (the db is reset every day):
 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.22
+The app currently uses flutter 3.24
 
 ### 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.
-
-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
-```
-
-Alternatively, add the key as an environment variables, e.g. by running the `source`
-command on the file.
-
-### 4
 
 Start the application with ``flutter run`` or use your IDE
 (please note that depending on how you run your emulator you will need to change the IP address of

android/app/build.gradle

@@ -30,27 +30,6 @@ if (keystorePropertiesFile.exists()) {
     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 }
 
-// Key for wger.de REST API
-def wgerProperties = new Properties()
-def localMapsPropertiesFile = rootProject.file('../fastlane/metadata/envfiles/wger.properties')
-if (localMapsPropertiesFile.exists()) {
-    project.logger.info('Load maps properties from local file')
-    localMapsPropertiesFile.withReader('UTF-8') { reader ->
-        wgerProperties.load(reader)
-    }
-} else {
-    project.logger.info('Load maps properties from environment')
-    try {
-        wgerProperties['WGER_API_KEY'] = System.getenv('WGER_API_KEY')
-    } catch (NullPointerException e) {
-        project.logger.warn('Failed to load WGER_API_KEY from environment.', e)
-    }
-}
-def wgerApiKey = wgerProperties.getProperty('WGER_API_KEY')
-if (wgerApiKey == null) {
-    wgerApiKey = ""
-    project.logger.error('Wger Api Key not configured. Set it in `/fastlane/metadata/android/envfiles/wger.properties` or in the environment variable `WGER_API_KEY`')
-}
 
 android {
     compileSdkVersion 34
@@ -80,7 +59,6 @@ android {
         targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        manifestPlaceholders += [WGER_API_KEY: wgerApiKey]
     }
 
     signingConfigs {

android/app/src/main/AndroidManifest.xml

@@ -28,9 +28,6 @@
         android:icon="@mipmap/ic_launcher"
         android:networkSecurityConfig="@xml/network_security_config">
 
-        <meta-data
-            android:name="wger.api_key"
-            android:value="${WGER_API_KEY}" />
         <meta-data
             android:name="wger.check_min_app_version"
             android:value="true" />

android/build.gradle

@@ -6,13 +6,36 @@ allprojects {
 }
 
 rootProject.buildDir = '../build'
+
 subprojects {
+
+    // Workaround for APK builds - https://github.com/flutter/flutter/issues/153281
+    afterEvaluate { project ->
+        if (project.extensions.findByName("android") != null) {
+            Integer pluginCompileSdk = project.android.compileSdk
+            if (pluginCompileSdk != null && pluginCompileSdk < 31) {
+                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)."
+                                + "\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 31
+                }
+            }
+        }
+    }
+
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }
 
+
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

fastlane/metadata/android/README.md

@@ -4,7 +4,7 @@
 
 If we use a new version, update the version used by
 
-* Github Actions in `android-release.yaml` in this repository
+* Github Actions in `build-release.yml` in this repository
 * Fdroid build recipe
   in [their repo](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/de.wger.flutter.yml).
   Since this can potentially take some time, it should happen well in advance
@@ -41,5 +41,7 @@ If necessary, edit the created release on github
 
 ## 5. Merge pull requests
 
-* in the flathub repo: https://github.com/flathub/de.wger.flutter
+* in the flathub
+  repo: https://github.com/flathub/de.wger.flutter/compare/master...wger-project:de.wger.flutter:master
+* in the fork sync master https://github.com/wger-project/de.wger.flutter
 * in the flutter repo: https://github.com/wger-project/flutter/branches