Skip to content

Commit

Permalink
Merge branch 'develop' into nutrition_improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
g123k authored Jul 11, 2023
2 parents b687853 + d6b9501 commit 13bfe4e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
12 changes: 5 additions & 7 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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
Expand All @@ -15,7 +15,7 @@ In order to run the application, make sure you are in the `packages/smooth_app`

- 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
Expand Down Expand Up @@ -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

Expand All @@ -72,7 +70,7 @@ We are always looking for new contributors, if you're willing to help please let

## 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.
- [g123k/plugins](https://github.com/g123k/plugins) - We use our own fork of the camera plugin to be able to hotfix problems that we find in it.

## V1 Roadmap (Shipped on June 15th 2022 for Vivatech)

Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -39,14 +39,14 @@ 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](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.

<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">

Expand Down Expand Up @@ -95,7 +95,7 @@ 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 .`

Expand All @@ -105,7 +105,7 @@ In order to run the application, make sure you are in the `packages/smooth_app`

- 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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ Eco-Score

<h1>👉 Choose products that are good for you ⚕️</h1>

➜ The Nutri-Score grade, from A to E : Nutritional quality
➜ The NOVA group, from 1 to 4 : Avoid ultra-processed foods (Group 4)
➜ The Nutri-Score grade, from A to E: Nutritional quality
➜ The NOVA group, from 1 to 4: Avoid ultra-processed foods (Group 4)

<h1>👉 Choose products that are good the planet 🌍</h1>
➜ Food causes over 1/3 of global greenhouse gas emissions
➜ The Eco-Score grade, from A to E : a synthesis of 16 environmental impacts
➜ The Eco-Score grade, from A to E: a synthesis of 16 environmental impacts

<h1>👉 Contribute to Food Transparency</h1>

Expand Down Expand Up @@ -67,6 +67,6 @@ We decipher products labels for you. You'll find:

<h1>👉 More</h1>
Web version: <a href="https://world.openfoodfacts.org">https://world.openfoodfacts.org</a>
Questions, feedback : <a href="mailto:[email protected]">[email protected]</a>
Questions, feedback: <a href="mailto:[email protected]">[email protected]</a>

For cosmetics, you can install Open Beauty Facts.

0 comments on commit 13bfe4e

Please sign in to comment.