Merge branch 'develop' into fix/4663

openfoodfacts · Dec 7, 2023 · 6e8126a · 6e8126a
2 parents 87c0077 + b91a784
commit 6e8126a
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 24 deletions.
diff --git a/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/android-release-to-org-openfoodfacts-scanner.yml
@@ -63,7 +63,7 @@ jobs:
       - run: echo Release type ${{ inputs.RELEASE_TYPE }} + Build type ${{ inputs.BUILD_TYPE }} + Tag name null if not github release ${{ inputs.TAG_NAME }}
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml b/.github/workflows/ios-release-to-org-openfoodfacts-scanner.yml
@@ -57,7 +57,7 @@ jobs:
         run: bundle install
         working-directory: ./packages/smooth_app/android/
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'zulu'
           java-version: ${{ env.JAVA_VERSION }}

diff --git a/.github/workflows/postsubmit.yml b/.github/workflows/postsubmit.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'zulu'
           java-version: 11

diff --git a/.github/workflows/waldo_sessions.yml b/.github/workflows/waldo_sessions.yml
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.13.0
+        uses: actions/setup-java@v4.0.0
         with:
           distribution: 'zulu'
           java-version: 11

diff --git a/packages/smooth_app/android/Gemfile.lock b/packages/smooth_app/android/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/tianhaoz95/fastlane-plugin-flutter_version
-  revision: 20966d43d5ef4af3388d74bf1a2272e8a6c95852
+  revision: a0eee28f559b1e740d1cf8c1f5c4fb1d9a127884
   specs:
     fastlane-plugin-flutter_version (1.1.15)
 

diff --git a/packages/smooth_app/ios/Gemfile.lock b/packages/smooth_app/ios/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/tianhaoz95/fastlane-plugin-flutter-version
-  revision: 20966d43d5ef4af3388d74bf1a2272e8a6c95852
+  revision: a0eee28f559b1e740d1cf8c1f5c4fb1d9a127884
   specs:
     fastlane-plugin-flutter_version (1.1.15)
 

diff --git a/packages/smooth_app/lib/pages/image/uploaded_image_gallery.dart b/packages/smooth_app/lib/pages/image/uploaded_image_gallery.dart
@@ -8,6 +8,7 @@ import 'package:smooth_app/database/dao_int.dart';
 import 'package:smooth_app/database/local_database.dart';
 import 'package:smooth_app/generic_lib/design_constants.dart';
 import 'package:smooth_app/generic_lib/widgets/images/smooth_image.dart';
+import 'package:smooth_app/generic_lib/widgets/smooth_back_button.dart';
 import 'package:smooth_app/pages/crop_page.dart';
 import 'package:smooth_app/pages/image_crop_page.dart';
 import 'package:smooth_app/widgets/smooth_app_bar.dart';
@@ -43,6 +44,9 @@ class UploadedImageGallery extends StatelessWidget {
         backgroundColor: Colors.black,
         foregroundColor: WHITE_COLOR,
         elevation: 0,
+        leading: const SmoothBackButton(
+          iconColor: Colors.white,
+        ),
       ),
       body: GridView.builder(
         itemCount: imageIds.length,

diff --git a/packages/smooth_app/pubspec.lock b/packages/smooth_app/pubspec.lock
@@ -17,6 +17,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.13.0"
+  ansicolor:
+    dependency: transitive
+    description:
+      name: ansicolor
+      sha256: "8bf17a8ff6ea17499e40a2d2542c2f481cd7615760c6d34065cb22bfd22e6880"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   app_settings:
     dependency: "direct main"
     description:
@@ -297,10 +305,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: b502a681ba415272ecc41400bd04fe543ed1a62632137dc84d25a91e7746f55f
+      sha256: "224a77051d52a11fbad53dd57827594d3bd24f945af28bd70bab376d68d437f0"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -401,10 +409,10 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: "7035152271ff67b072a211152846e9f1259cf1be41e34cd3e0b5463d2d6b8419"
+      sha256: "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6"
       url: "https://pub.dev"
     source: hosted
-    version: "9.1.0"
+    version: "9.1.1"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -611,10 +619,10 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
+      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -632,10 +640,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_native_splash
-      sha256: d93394f22f73e810bda59e11ebe83329c5511d6460b6b7509c4e1f3c92d6d625
+      sha256: c4d899312b36e7454bedfd0a4740275837b99e532d81c8477579d8183db1de6c
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.5"
+    version: "2.3.6"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
@@ -1165,10 +1173,10 @@ packages:
     dependency: "direct dev"
     description:
       name: path_provider_platform_interface
-      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   path_provider_windows:
     dependency: transitive
     description:
@@ -1253,10 +1261,10 @@ packages:
     dependency: "direct dev"
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.7"
   pointycastle:
     dependency: transitive
     description:

diff --git a/packages/smooth_app/pubspec.yaml b/packages/smooth_app/pubspec.yaml
@@ -31,7 +31,7 @@ dependencies:
   latlong2: 0.9.0
   matomo_tracker: 4.1.1
   package_info_plus: 4.2.0
-  device_info_plus: 9.1.0
+  device_info_plus: 9.1.1
   permission_handler: 10.4.3
   photo_view: 0.14.0
   uuid: 3.0.7
@@ -48,7 +48,7 @@ dependencies:
   audioplayers: 5.2.1
   percent_indicator: 4.2.3
   flutter_email_sender: 6.0.2
-  flutter_native_splash: 2.3.5
+  flutter_native_splash: 2.3.6
   image: ^4.0.17
   auto_size_text: 3.0.0
   crop_image: 1.0.11
@@ -66,7 +66,7 @@ dependencies:
   webview_flutter: 3.0.4
   flutter_custom_tabs: 1.0.4
   flutter_image_compress: 2.1.0
-  connectivity_plus: 5.0.1
+  connectivity_plus: 5.0.2
   dart_ping: 9.0.1
   dart_ping_ios: 4.0.2
   flutter_animation_progress_bar: 2.3.1
@@ -110,9 +110,9 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mockito: 5.4.2
-  path_provider_platform_interface: 2.1.0
-  plugin_platform_interface: 2.1.4
-  flutter_lints: 2.0.2
+  path_provider_platform_interface: 2.1.1
+  plugin_platform_interface: 2.1.7
+  flutter_lints: 2.0.3
   openfoodfacts_flutter_lints:
     git: https://github.com/openfoodfacts/openfoodfacts_flutter_lints.git