diff --git a/.github/workflows/check-ios.yml b/.github/workflows/check-ios.yml index 50d195b1..52c9358a 100644 --- a/.github/workflows/check-ios.yml +++ b/.github/workflows/check-ios.yml @@ -20,3 +20,17 @@ jobs: run: cd ./fastlane/ios/fastlane && gem install bundler:1.17.3 && bundle install && pwd && ls - name: Fastlane Precheck on marketing assets run: cd ./fastlane/ios/fastlane && pwd && ls && bundle exec fastlane run_precheck + env: + GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + FASTLANE_USER: ${{ secrets.FASTLANE_USER }} + FASTLANE_PASSWORD: ${{ secrets.FASTLANE_PASSWORD }} + FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD: ${{ secrets.FASTLANE_APPLE_APPLICATION_SPECIFIC_PASSWORD }} + MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_GIT_BASIC_AUTHORIZATION }} + MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }} + MATCH_KEYCHAIN_PASSWORD: ${{ secrets.MATCH_KEYCHAIN_PASSWORD }} + MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + PILOT_APPLE_ID: ${{ secrets.PILOT_APPLE_ID }} + SPACESHIP_CONNECT_API_ISSUER_ID: ${{ secrets.SPACESHIP_CONNECT_API_ISSUER_ID }} + SPACESHIP_CONNECT_API_KEY_ID: ${{ secrets.SPACESHIP_CONNECT_API_KEY_ID }} + SPACESHIP_CONNECT_API_KEY_FILEPATH: ./fastlane/envfiles/AuthKey_KDAUTTM76R.p8 diff --git a/crowdin.yml b/crowdin.yml index 82a8b21c..dc91ce33 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -2,64 +2,69 @@ project_id_env: CROWDIN_PROJECT_ID api_token_env: CROWDIN_PERSONAL_TOKEN preserve_hierarchy: true files: - - source: /fastlane/metadata/android/en-US/full_description.txt - dest: /fastlane/metadata/android/en-US/full_description.txt - translation: /fastlane/metadata/android/%locale%/full_description.txt + - source: /fastlane/android/metadata/en-US/54.txt + dest: /fastlane/android/metadata/en-US/54.txt + translation: /fastlane/android/metadata/%locale%/54.txt + preserve_hierarchy: true + + - source: /fastlane/android/metadata/en-US/full_description.txt + dest: /fastlane/android/metadata/en-US/full_description.txt + translation: /fastlane/android/metadata/%locale%/full_description.txt preserve_hierarchy: true - - source: /fastlane/metadata/android/en-US/short_description.txt - translation: /fastlane/metadata/android/%locale%/short_description.txt - dest: /fastlane/metadata/android/en-US/short_description.txt + - source: /fastlane/android/metadata/en-US/short_description.txt + translation: /fastlane/android/metadata/%locale%/short_description.txt + dest: /fastlane/android/metadata/en-US/short_description.txt preserve_hierarchy: true - - source: /fastlane/metadata/android/en-US/title.txt - translation: /fastlane/metadata/android/%locale%/title.txt - dest: /fastlane/metadata/android/en-US/title.txt + - source: /fastlane/android/metadata/en-US/title.txt + translation: /fastlane/android/metadata/%locale%/title.txt + dest: /fastlane/android/metadata/en-US/title.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/description.txt - translation: /fastlane/metadata/ios/%locale%/description.txt - dest: /fastlane/metadata/ios/en-US/description.txt + - source: /fastlane/ios/fastlane/metadata/en-US/description.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/description.txt + dest: /fastlane/ios/fastlane/metadata/en-US/description.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/privacy_url.txt - translation: /fastlane/metadata/ios/%locale%/privacy_url.txt - dest: /fastlane/metadata/ios/en-US/privacy_url.txt + - source: /fastlane/ios/fastlane/metadata/en-US/privacy_url.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/privacy_url.txt + dest: /fastlane/ios/fastlane/metadata/en-US/privacy_url.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/subtitle.txt - translation: /fastlane/metadata/ios/%locale%/subtitle.txt - dest: /fastlane/metadata/ios/en-US/subtitle.txt + - source: /fastlane/ios/fastlane/metadata/en-US/subtitle.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/subtitle.txt + dest: /fastlane/ios/fastlane/metadata/en-US/subtitle.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/keywords.txt - translation: /fastlane/metadata/ios/%locale%/keywords.txt - dest: /fastlane/metadata/ios/en-US/keywords.txt + - source: /fastlane/ios/fastlane/metadata/en-US/keywords.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/keywords.txt + dest: /fastlane/ios/fastlane/metadata/en-US/keywords.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/promotional_text.txt - translation: /fastlane/metadata/ios/%locale%/promotional_text.txt - dest: /fastlane/metadata/ios/en-US/promotional_text.txt + - source: /fastlane/ios/fastlane/metadata/en-US/promotional_text.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/promotional_text.txt + dest: /fastlane/ios/fastlane/metadata/en-US/promotional_text.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/support_url.txt - translation: /fastlane/metadata/ios/%locale%/support_url.txt - dest: /fastlane/metadata/ios/en-US/support_url.txt + - source: /fastlane/ios/fastlane/metadata/en-US/support_url.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/support_url.txt + dest: /fastlane/ios/fastlane/metadata/en-US/support_url.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/marketing_url.txt - translation: /fastlane/metadata/ios/%locale%/marketing_url.txt - dest: /fastlane/metadata/ios/en-US/marketing_url.txt + - source: /fastlane/ios/fastlane/metadata/en-US/marketing_url.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/marketing_url.txt + dest: /fastlane/ios/fastlane/metadata/en-US/marketing_url.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/release_notes.txt - translation: /fastlane/metadata/ios/%locale%/release_notes.txt - dest: /fastlane/metadata/ios/en-US/release_notes.txt + - source: /fastlane/ios/fastlane/metadata/en-US/release_notes.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/release_notes.txt + dest: /fastlane/ios/fastlane/metadata/en-US/release_notes.txt preserve_hierarchy: true - - source: /fastlane/metadata/ios/en-US/name.txt - translation: /fastlane/metadata/ios/%locale%/name.txt - dest: /fastlane/metadata/ios/en-US/name.txt + - source: /fastlane/ios/fastlane/metadata/en-US/name.txt + translation: /fastlane/ios/fastlane/metadata/%locale%/name.txt + dest: /fastlane/ios/fastlane/metadata/en-US/name.txt preserve_hierarchy: true - source: /screenshot-wrapping/strings/en-GB.json diff --git a/fastlane/android/metadata/en-US/54.txt b/fastlane/android/metadata/en-US/54.txt index fe54b034..e704a18e 100644 --- a/fastlane/android/metadata/en-US/54.txt +++ b/fastlane/android/metadata/en-US/54.txt @@ -1,2 +1,14 @@ -As Smoothie is still an experiment, -we look forward to hearing your initial feedback at contact@openfoodfacts.org \ No newline at end of file +The Open Food Facts project turns 10 ! We've created a completely new version of the app to celebrate. +Many thanks to all contributors who have worked during 2 years on all those new features! + +New features: +* All new design +* The product page is much more helpful +* Customize what you see when you scan a product +* Create personal lists of products + +Open Food Facts is a non-profit project to open food data from around the world. Join us on https://en.openfoodfacts.org + +Scan the barcode of food products to know which products are good for you (nutritional quality: Nutri-Score, NOVA group, additives and allergen alerts) and the planet (Eco-Score)! + +We look forward to hearing your feedback about this update at contact@openfoodfacts.org diff --git a/fastlane/android/metadata/en-US/full_description.txt b/fastlane/android/metadata/en-US/full_description.txt index da8d0339..06b62a81 100644 --- a/fastlane/android/metadata/en-US/full_description.txt +++ b/fastlane/android/metadata/en-US/full_description.txt @@ -1,14 +1,17 @@ -Smoothie. We invented the collaborative scanning app in 2012. 🀳πŸ₯« With this experimental app, we’re reinventing it from the ground up, and this time, it’s personal. +News: We invented the collaborative scanning app in 2012. 🀳πŸ₯« As we turn 10, we’re reinventing it from the ground up! -πŸ‘‰ Set your preferences without ruining your privacy -πŸ‘‰ A scan that truly matches who you are +This app lets you find food that's good for you and good for the planet by scanning their barcodes. +You will get personalized health & eco-impact info for 2.3M foods. + +

πŸ‘‰ Set your food preferences without ruining your privacy

+

πŸ‘‰ A scan that truly matches who you are

βœ… Green: the product matches your criteria πŸ›‘ Red: there is a problem ⬜️ Gray: Help us answer you by photographing the products -πŸ‘‰ Compare in 15 seconds the 3 brands of tomato sauces left on the shelf. -πŸ‘‰ Get a tailored comparison of any food category +

πŸ‘‰ Compare in a few seconds those 3 different tomato sauces left on the shelf.

+

πŸ‘‰ Get a tailored comparison of any food category

-== Criteria you can pick == +

Food criteria you can pick

🌍 Environment βš•οΈ Health 🏭 Additives & Ultra processed foods @@ -16,3 +19,54 @@ Smoothie. We invented the collaborative scanning app in 2012. 🀳πŸ₯« With this 🌾 Allergens Nutri-Score Eco-Score + +

πŸ‘‰ Scan, find & compare more than 2,3 million food products

+ +

πŸ‘‰ Choose products that are good for you βš•οΈ

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

πŸ‘‰ Choose products that are good the planet 🌍

+➜ Food causes over 1/3 of global greenhouse gas emissions +➜ The Eco-Score grade, from A to E : a synthesis of 16 environmental impacts + +

πŸ‘‰ Contribute to Food Transparency

+ +➜ Open Food Facts is made by everyone, for everyone! +➜ In short, we're "the Wikipedia of food", as the press nicknamed the project. Open Food Facts has also enabled the creation of over 150+ apps like Date Limite, Yuka or FoodVisor. +➜ Use it to make better food choices +➜ The app is also collaborative. If the product is missing, contribute pictures and data to get the Nutri-Score, food processing level (NOVA) & Eco-Score. +➜ Make a difference today by photographing a product from your kitchen. +➜ Open Food Facts is a non-profit project made by thousands of volunteers from around the world. Why don't you join us ? + +

πŸ‘‰ Decipher food labels

+ +We decipher products labels for you. You'll find: +➜ Nutrition: The Nutriscore (nutritional score), nutrients, fat, transfat, carbohydrates, sugars, fiber, protein, salt & sodium. +➜ Environment: The Ecoscore (including carbon footprint (CO2 emissions), packaging (as well as recycling instructions), environmental labels (organic, quality etc.), and origins of ingredients) +➜ Other: brands, allergens, labels (bio, gluten free, vegan, vegetarian, halal, kosher...), traceability information (packaging codes, origins, food factories) +➜ On wines and beers, you'll find the alcohol content. + +

πŸ‘‰ Our grades are science-based, and Open Food Facts is helping science!

+➜ We don't make up things. We rely on peer-reviewed science. +➜ The Nutri-Score has been created by the independent French team led by Professor Hercberg. +➜ The NOVA groups on food processing have been designed by the international team of Professor Monteiro. +➜ The additives synthesis is based on reviews by EFSA on exposure levels on food additives. +➜ The Eco-Score is based on ground breaking data by ADEME, the French environmental agency, adapted for the world. +➜ The Open Food Facts community is collaborating with research teams across the planet for research that benefits all. + +

πŸ‘‰ Your food, your data. Privacy-friendly app.

+➜ You can use the app anonymously +➜ Your food data is yours, and is never sent online + +

πŸ‘‰ Set up allergen alerts on products

+➜ Do you have a Milk, Gluten, Eggs, Soybeans, Nuts, Fish, Celery, Mustard, Sulphites, Peanuts, Sesame seeds, Crustaceans, Molluscs or Lupin allergy ? +➜ Speed up your shopping with an initial screening with Open Food Facts. +➜ Be careful that the info & the detection may not be 100% accurate. Always double check by yourself, with the packaging. + +

πŸ‘‰ More

+Web version: https://world.openfoodfacts.org +Questions, feedback : contact@openfoodfacts.org + +For cosmetics, you can install Open Beauty Facts. diff --git a/fastlane/android/metadata/en-US/short_description.txt b/fastlane/android/metadata/en-US/short_description.txt index a5cdb25b..46b44fa3 100644 --- a/fastlane/android/metadata/en-US/short_description.txt +++ b/fastlane/android/metadata/en-US/short_description.txt @@ -1 +1 @@ -This is a smooth new experimental app from the makers of Open Food Facts. \ No newline at end of file +A more personal, helpful & knowledgeable Open Food Facts, private by default! diff --git a/fastlane/ios/fastlane/Gemfile.lock b/fastlane/ios/fastlane/Gemfile.lock index 23e7fdc3..c1d07420 100644 --- a/fastlane/ios/fastlane/Gemfile.lock +++ b/fastlane/ios/fastlane/Gemfile.lock @@ -1,8 +1,8 @@ GIT remote: https://github.com/tianhaoz95/fastlane-plugin-flutter-version - revision: 30dd7cf8825a1a208c939f24b4839b3b80dba6b6 + revision: 1b39fe95c0325005c5f7bdf2aabcbce1b5820e5a specs: - fastlane-plugin-flutter_version (1.1.12) + fastlane-plugin-flutter_version (1.1.15) GEM remote: https://rubygems.org/ @@ -14,13 +14,13 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.586.0) - aws-sdk-core (3.130.2) + aws-partitions (1.591.0) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.56.0) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.57.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) @@ -72,7 +72,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.205.2) + fastlane (2.206.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -112,9 +112,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.19.0) + google-apis-androidpublisher_v3 (0.21.0) google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.4.2) + google-apis-core (0.5.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -127,7 +127,7 @@ GEM google-apis-core (>= 0.4, < 2.a) google-apis-playcustomapp_v1 (0.7.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.13.0) + google-apis-storage_v1 (0.14.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) @@ -155,7 +155,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.1) - json (2.6.1) + json (2.6.2) jwt (2.3.0) memoist (0.16.2) mini_magick (4.11.0) @@ -169,7 +169,7 @@ GEM plist (3.6.0) public_suffix (4.0.7) rake (13.0.6) - representable (3.1.1) + representable (3.2.0) declarative (< 0.1.0) trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) diff --git a/fastlane/ios/fastlane/metadata/en-US/apple_tv_privacy_policy.txt b/fastlane/ios/fastlane/metadata/en-US/apple_tv_privacy_policy.txt deleted file mode 100644 index 8b137891..00000000 --- a/fastlane/ios/fastlane/metadata/en-US/apple_tv_privacy_policy.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fastlane/ios/fastlane/metadata/en-US/description.txt b/fastlane/ios/fastlane/metadata/en-US/description.txt index 43756598..8f636101 100644 --- a/fastlane/ios/fastlane/metadata/en-US/description.txt +++ b/fastlane/ios/fastlane/metadata/en-US/description.txt @@ -1,23 +1,72 @@ -Smoothie. We invented the collaborative scanning app in 2012. With this experimental app, we’re reinventing it from the ground up, and this time, it’s personal. +News: We invented the collaborative scanning app in 2012. As we turn 10, we’re reinventing it from the ground up! -=== Set your preferences without ruining your privacy === - -=== A scan that truly matches who you are === +This app lets you find food that's good for you and good for the planet by scanning their barcodes. +You will get personalized health & eco-impact info for 2.3M foods. +

Set your food preferences without ruining your privacy

+

A scan that truly matches who you are

Green: the product matches your criteria Red: there is a problem Gray: Help us answer you by photographing the products +

Compare in a few seconds those 3 different tomato sauces left on the shelf.

+

Get a tailored comparison of any food category

+ +

Food criteria you can pick

+Environment +Health +Additives & Ultra processed foods +Salt +Allergens +Nutri-Score +Eco-Score + +

Scan, find & compare more than 2,3 million food products

+ +

Choose products that are good for you βš•οΈ

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

Choose products that are good the planet 🌍

+➜ Food causes over 1/3 of global greenhouse gas emissions +➜ The Eco-Score grade, from A to E : a synthesis of 16 environmental impacts + +

Contribute to Food Transparency

+ +➜ Open Food Facts is made by everyone, for everyone! +➜ In short, we're "the Wikipedia of food", as the press nicknamed the project. Open Food Facts has also enabled the creation of over 150+ apps like Date Limite, Yuka or FoodVisor. +➜ Use it to make better food choices +➜ The app is also collaborative. If the product is missing, contribute pictures and data to get the Nutri-Score, food processing level (NOVA) and Eco-Score. +➜ Make a difference today by photographing a product from your kitchen. +➜ Open Food Facts is a non-profit project made by thousands of volunteers from around the world. Why don't you join us ? + +

Decipher food labels

+ +We decipher products labels for you. You'll find: +➜ Nutrition: The Nutriscore (nutritional score), nutrients, fat, transfat, carbohydrates, sugars, fiber, protein, salt & sodium. +➜ Environment: The Ecoscore (including carbon footprint (CO2 emissions), packaging (as well as recycling instructions), environmental labels (organic, quality etc.), and origins of ingredients) +➜ Other: brands, allergens, labels (bio, gluten free, vegan, vegetarian, halal, kosher...), traceability information (packaging codes, origins, food factories) +➜ On wines and beers, you'll find the alcohol content. + +

Our grades are science-based, and Open Food Facts is helping science!

+➜ We don't make up things. We rely on peer-reviewed science. +➜ The Nutri-Score has been created by the independent French team led by Professor Hercberg. +➜ The NOVA groups on food processing have been designed by the international team of Professor Monteiro. +➜ The additives synthesis is based on reviews by EFSA on exposure levels on food additives. +➜ The Eco-Score is based on ground breaking data by ADEME, the French environmental agency, adapted for the world. +➜ The Open Food Facts community is collaborating with research teams across the planet for research that benefits all. -=== Compare in 15 seconds the 3 brands of tomato sauces left on the shelf === +

Your food, your data. Privacy-friendly app.

+➜ You can use the app anonymously +➜ Your food data is yours, and is never sent online -=== Get a tailored comparison of any food category === +

Set up allergen alerts on products

+➜ Do you have a Milk, Gluten, Eggs, Soybeans, Nuts, Fish, Celery, Mustard, Sulphites, Peanuts, Sesame seeds, Crustaceans, Molluscs or Lupin allergy ? +➜ Speed up your shopping with an initial screening with Open Food Facts. +➜ Be careful that the info and the detection may not be 100% accurate. Always double check by yourself, with the packaging. -=== Criteria you can pick === +

More

+Web version: https://world.openfoodfacts.org +Questions, feedback : contact@openfoodfacts.org -- Environment -- Health -- Additives & Ultra processed foods -- Salt -- Allergens -- Nutri-Score -- Eco-Score +For cosmetics, you can install Open Beauty Facts. diff --git a/fastlane/ios/fastlane/metadata/en-US/name.txt b/fastlane/ios/fastlane/metadata/en-US/name.txt index fb8811f5..9249b3aa 100644 --- a/fastlane/ios/fastlane/metadata/en-US/name.txt +++ b/fastlane/ios/fastlane/metadata/en-US/name.txt @@ -1 +1 @@ -Smooth App +Open Food Facts diff --git a/fastlane/ios/fastlane/metadata/en-US/promotional_text.txt b/fastlane/ios/fastlane/metadata/en-US/promotional_text.txt index 8b137891..a89e96fd 100644 --- a/fastlane/ios/fastlane/metadata/en-US/promotional_text.txt +++ b/fastlane/ios/fastlane/metadata/en-US/promotional_text.txt @@ -1 +1 @@ - +Scan the barcode of food products to know which products are good for you (Nutri-Score, processed foods, additives, allergen alerts) and the planet (Eco-Score) ! diff --git a/fastlane/ios/fastlane/metadata/en-US/release_notes.txt b/fastlane/ios/fastlane/metadata/en-US/release_notes.txt index 8b137891..261b1010 100644 --- a/fastlane/ios/fastlane/metadata/en-US/release_notes.txt +++ b/fastlane/ios/fastlane/metadata/en-US/release_notes.txt @@ -1 +1,12 @@ +The Open Food Facts project turns 10 ! We've created a completely new version of the app to celebrate. +Many thanks to all contributors who have worked during 2 years on all those new features! +New features: +* All new design +* The product page is much more helpful +* Customize what you see when you scan a product +* Create personal lists of products + +Open Food Facts is a non-profit project to open food data from around the world. Join us on https://en.openfoodfacts.org + +Scan the barcode of food products to know which products are good for you (nutritional quality: Nutri-Score, NOVA group, additives and allergen alerts) and the planet (Eco-Score)! diff --git a/fastlane/ios/fastlane/metadata/en-US/subtitle.txt b/fastlane/ios/fastlane/metadata/en-US/subtitle.txt index 8b137891..731c2b6d 100644 --- a/fastlane/ios/fastlane/metadata/en-US/subtitle.txt +++ b/fastlane/ios/fastlane/metadata/en-US/subtitle.txt @@ -1 +1 @@ - +Food scanner