Merge branch 'develop' into feat/4162

.github/workflows/waldo_sessions.yml

@@ -0,0 +1,61 @@
+name: Upload builds to Waldo
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  build:
+    runs-on: macos-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup Java JDK
+        uses: actions/[email protected]
+        with:
+          distribution: 'zulu'
+          java-version: 11
+
+      # Get the flutter version from ./flutter-version.txt
+      - run: echo "FLUTTER_VERSION=$(cat flutter-version.txt)" >> $GITHUB_OUTPUT
+        id: flutter-version
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          #channel: stable
+          cache: true
+          flutter-version: ${{ steps.flutter-version.outputs.FLUTTER_VERSION }}
+          cache-key: flutter-${{ hashFiles('flutter-version.txt')}}-${{ hashFiles('packages\smooth_app\pubspec.lock')}}
+
+      - run: flutter --version
+
+      - name: Get dependencies
+        run: ci/pub_upgrade.sh
+
+      # Build apk.
+      - name: Build APK
+        run: flutter build apk --debug -t lib/entrypoints/android/main_google_play.dart
+        working-directory: ./packages/smooth_app
+
+      - name: Upload APK to Waldo
+        uses: waldoapp/gh-action-upload@v1
+        with:
+          build_path: packages/smooth_app/build/app/outputs/flutter-apk/app-debug.apk
+          upload_token: ${{ secrets.WALDO_SESSIONS_ANDROID }}
+
+      - name: Write comment
+        uses: mshick/add-pr-comment@v2
+        with:
+          message: "You can test this PR on: [https://app.waldo.com/applications/app-19d476740ba1bb36/sessions](Android)"
+
+      # TODO Build the iOS variant and upload it

.run/iOS app.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="iOS app" type="FlutterRunConfigurationType" factoryName="Flutter" folderName="iOS">
+  <configuration default="false" name="iOS/macOS app" type="FlutterRunConfigurationType" factoryName="Flutter" folderName="iOS / macOS">
     <option name="filePath" value="$PROJECT_DIR$/packages/smooth_app/lib/entrypoints/ios/main_ios.dart" />
     <method v="2" />
   </configuration>

.vscode/launch.json

@@ -7,7 +7,7 @@
       "program": "packages/smooth_app/lib/entrypoints/android/main_google_play.dart"
     },
     {
-      "name": "iOS",
+      "name": "iOS/macOS",
       "type": "dart",
       "request": "launch",
       "program": "packages/smooth_app/lib/entrypoints/ios/main_ios.dart"

CONTRIBUTING.md

@@ -3,19 +3,19 @@
 
 We have predefined run configurations for Android Studio and Visual Studio Code
 
-In order to run the application, make sure you are in the `packages/smooth_app` directory and run these commands :
+In order to run the application, make sure you are in the `packages/smooth_app` directory and run these commands:
 
 - `flutter pub get .`
 - On Android 🤖: flutter run -t lib/entrypoints/android/main_google_play.dart
-- On iOS 🍎: flutter run -t lib/entrypoints/ios/main_ios.dart
+- On iOS/macOS 🍎: flutter run -t lib/entrypoints/ios/main_ios.dart
 
 ## Contributing
 
 - You don't have to do anything to the CHANGELOG.md yourself, this is done automatically.
 
 - Please ensure to add a before/after screenshot when doing a PR that has visual impacts.
 
-- Please name your pull request following this scheme: `type: What you did` this allows us to automatically generate the changelog
+- Please name your pull request following this scheme: `type: What you did` this allows us to automatically generate the changelog.
 Following `type`s are allowed:
 
   - `feat`, for Features
@@ -45,19 +45,17 @@ Following `type`s are allowed:
 
 [Track crashes](https://sentry.io/organizations/openfoodfacts/issues/?project=5376745)
 
-<br><br>
-
 ## Contributing - What can I work on ?
 
 Are you a developer? A graphic designer? Full of innovative ideas to help users improve their mode of consumption? Then join us!
 We are always looking for new contributors, if you're willing to help please let us know, we'll be pleased to introduce you to the project.
 
 - On GitHub, [you can start here to get some inspiration](https://github.com/openfoodfacts/smooth-app/issues/525)
-- You can join the Open Food Facts's Slack here : [Get an invite](https://slack.openfoodfacts.org) - [Open our Slack](https://openfoodfacts.slack.com).
+- You can join the Open Food Facts's Slack here: [Get an invite](https://slack.openfoodfacts.org) - [Open our Slack](https://openfoodfacts.slack.com).
 
 ### Weekly meetings
 
- We usually meet on Thursdays at 15:30 GMT (UTC) at <https://meet.google.com/gnp-frks-esc>. Please email [email protected] if you want to be added to the Calendar invite for convenience
+ We usually meet on Thursdays at 15:30 GMT (UTC) at <https://meet.google.com/gnp-frks-esc>. Please email [email protected] if you want to be added to the Calendar invite for convenience.
 
 ## Wiki & Doc
 
@@ -70,10 +68,6 @@ We are always looking for new contributors, if you're willing to help please let
 - [Project Smoothie Landing page](https://github.com/openfoodfacts/smoothielanding)
 - Private app signing for iOS certificates repository - please ask @teolemon
 
-## Custom dependencies (forked versions)
-
-- [g123k/plugins](https://github.com/g123k/plugins) - We use our own fork of the camera plugin to be able to hotfix problems in it we find.
-
 ## V1 Roadmap (Shipped on June 15th 2022 for Vivatech)
 
 - [x] We should be able to ship the Smoothie code to the main listing on Android and iOS

README.md

@@ -5,7 +5,7 @@
 </picture>
 <br>
 
-## Smooth App : The new Open Food Facts mobile app for Android and iPhone
+## Smooth App: The new Open Food Facts mobile app for Android and iPhone
 
 [![SmoothApp Post-Submit Tests](https://github.com/openfoodfacts/smooth-app/actions/workflows/postsubmit.yml/badge.svg)](https://github.com/openfoodfacts/smooth-app/actions/workflows/postsubmit.yml)
 [![Create internal releases](https://github.com/openfoodfacts/smooth-app/actions/workflows/internal-release.yml/badge.svg)](https://github.com/openfoodfacts/smooth-app/actions/workflows/internal-release.yml)
@@ -39,23 +39,24 @@ Starting this April, we invite all users and contributors to build a vision for
 
 ## Current Release
 
-Latest commit deployed to Apple App Store: Released on Nov 29th as Build 835
-Latest commit deployed to PlayStore: 792 from Nov 6th 11AM
+- Latest commit deployed to Apple App Store: Released on Nov 29th as Build 835
+- Latest commit deployed to PlayStore: 792 from Nov 6th 11AM
 
 ## Presentation
 
 - This new mobile application aims to showcase Open Food Facts's power to a broad range of users through a smooth user experience and sleek user interface. It is a <b> Flutter application </b> by [Open Food Facts](https://github.com/openfoodfacts).
 - We pioneered the collaborative scanning app in 2012. With this experimental app, we’re reinventing it from the ground up.
-- Install it on [Android](https://play.google.com/store/apps/details?id=org.openfoodfacts.scanner) or [iPhone/iPad](https://apps.apple.com/app/open-food-facts/id588797948). Note that a internal development build ([Android](https://play.google.com/apps/internaltest/4699092342921529278) or [iPhone/iPad](https://testflight.apple.com/join/c2tiBHgd) )if you'd like to use the results of your PRs quicker.
+- Install it on **Android** ([Google Play](https://play.google.com/store/apps/details?id=org.openfoodfacts.scanner), [F-Droid](https://f-droid.org/fr/packages/openfoodfacts.github.scrachx.openfood/) or [Amazon App Store](https://www.amazon.com/Open-Food-Facts-food-Nutriscore/dp/B00U49IVIU)) or [iPhone/iPad](https://apps.apple.com/app/open-food-facts/id588797948). Note that a internal development build ([Android](https://play.google.com/apps/internaltest/4699092342921529278) or **iPhone/iPad** ([App Store](https://testflight.apple.com/join/c2tiBHgd)) if you'd like to use the results of your PRs quicker.
 
 <img alt="app showcase" height='175' src="https://user-images.githubusercontent.com/1689815/168430524-3adc923a-1ce3-4233-9af5-02e9d49a76ca.png" align="left" hspace="1" vspace="1">
 
 - Smooth-app is developed in parallel to the [openfoodfacts-dart](https://github.com/openfoodfacts/openfoodfacts-dart) plugin, which provides a high level interface with the Open Food Facts API and [openfoodfacts_flutter_lints](https://github.com/openfoodfacts/openfoodfacts_flutter_lints) which provides specific linting
 - Every new interaction with the API should be implemented in the plugin in order to provide these new features to other developers.
+- We support desktop platforms (Linux, macOS and Windows), but **only for development**
 
 <br>
 
-<details><summary><h2> Features of the app </h2></summary>
+<details><summary><h2>Features of the app</h2></summary>
 
 ## Features
 
@@ -95,17 +96,17 @@ Latest commit deployed to PlayStore: 792 from Nov 6th 11AM
 
 We have predefined run configurations for Android Studio and Visual Studio Code
 
-In order to run the application, make sure you are in the `packages/smooth_app` directory and run these commands :
+In order to run the application, make sure you are in the `packages/smooth_app` directory and run these commands:
 
 - `flutter pub get .`
 
 - On Android 🤖: `flutter run -t lib/entrypoints/android/main_google_play.dart`
 
-- On iOS 🍎: `flutter run -t lib/entrypoints/ios/main_ios.dart`
+- On iOS/macOS 🍎: `flutter run -t lib/entrypoints/ios/main_ios.dart`
 
 - Troubleshooting🚀: If you get an error like `App depends on scanner shared from path which depends on camera_platform_interface from git, version solving failed.`  then run
   - `flutter pub cache clean` or manually delete  the  
-  - `C:\Users\~\AppData\Local\Pub\Cache`  file .
+  - `C:\Users\~\AppData\Local\Pub\Cache`  file.
  Then redo the above procedure to run the app.
 
 - [Contributing Guidelines](https://github.com/openfoodfacts/smooth-app/blob/develop/CONTRIBUTING.md)

packages/app_store/apple_app_store/lib/src/apple_app_store.dart

@@ -9,7 +9,7 @@ class AppleAppStore extends AppStore {
   AppleAppStore(this.appId)
       : assert(appId.isNotEmpty),
         assert(!appId.startsWith('id')),
-        assert(Platform.isIOS);
+        assert(Platform.isIOS || Platform.isMacOS);
 
   final String appId;
   final InAppReview _inAppReview = InAppReview.instance;