github.com/openfoodfacts/openfoodfacts-androidapp commits

New Crowdin translations (#2555)

* New translations strings.xml (Arabic)

* New translations strings.xml (Kurdish)

* New tra...

a4c592fc4bed341d84d40b96d1bc472ade7700e5 authored almost 6 years ago

New Crowdin translations (#2549)

* New translations strings.xml (Kurdish)

* New tr...

7af4bd90c5aeb65255df69c61ad56bd1ba69e8b7 authored almost 6 years ago

Update fragment_add_product_ingredients.xml

c1c8bb8ba594c568d8dc51391c44c326ec7139f0 authored almost 6 years ago

Update fragment_add_product_ingredients.xml

159744eea218f6fdcbfa465b5d95ecebd7dd867b authored almost 6 years ago

updated (#2545)

f92ecabbafa8e5876a916e50c2fff7b3fa73ce1d authored almost 6 years ago

New Crowdin translations (#2540)

* New translations strings.xml (Spanish)

4418f7faf9312ffdf63f39dbac741f3115ccd8fc authored almost 6 years ago

Update .travis.yml

22ddb5fab9b69e4bd8c2cc1b3c29ee7d9a19b5b8 authored almost 6 years ago

Update .travis.yml

3088d3f9b348a54781c5f7ebf66a994c9e4ded23 authored almost 6 years ago

Travis (#2541) (#2546)

* Use a custom script command

+ Launch unit test
+ by default, travis launch gradle connecte...

96b3fd8821941e0d84b284e3899fcbd27d5700e2 authored almost 6 years ago

#2512 Multiple lists with same name.

5031b9178d540d7e2c24fcc025d7a6174b30524c authored almost 6 years ago

+ Fix #2359, #2483translation issue (#2507)

* + Fix #2359
+ Fix #2483

* + merge methods getLanguageTrimmed and getLanguage

925588ba8d7b6ffafccc371cc2e127ab2dbe5fe0 authored almost 6 years ago

The issue: co2Ion was marked as INVISIBLE -> novaIcon was on the left of the fragment (#2531)

TODO: change the layout so every images can be marked as GONE ( to gain horizontal place).

a8e2de0c2a49159341b1cc333429fa9648b7edf2 authored almost 6 years ago

Fixes #2400 : Add a "Send updated nutrition photo" button below nutrition image (#2435)

* Updated RX Java2 dependencies

Update preferences.xml

Updated RX Java2 dependencies

* ...

48c7344551bebe2aa7e97957368ee053b0f6b683 authored almost 6 years ago

Fix #2086 propose a new way to delete item on swipe (#2521)

* Fix #2086 propose a new way to swipe :)

* Remove commented code

* - change icon + backgr...

02f8ec2d6def722cf49131991b8fee395109bb07 authored almost 6 years ago

Fix #2187 Crash in the product page in the OBF flavor and new issue with Question (#2514)

* + Fix #2187 Crash in the product page in the OBF flavor
+ Fix issue if not question found (ja...

17679f3adcf8a911818b387a43a8c945adacf565 authored almost 6 years ago

New Crowdin translations (#2523)

* New translations strings.xml (Spanish)

* New translations long_description.txt (Spanish)

11b46b65dc973608e0e2be26cf59ef24cddbe67f authored almost 6 years ago

Merge pull request #2510 from deniger/2057

+ Fix #2057 Nutrition grade is displayed for products that don't have it

f2f0b8203f512f51814d70a4377f32b9bc7a90be authored almost 6 years ago

Merge pull request #2517 from mustaqmustu/change

added toasts when user changes language and country

37333e4c64566703caf7bf739802fb69ccb93aca authored almost 6 years ago

Fix #1973 with more robust code to display the number of products (#2513)

f68b2066979faa1c6895664482caf8211e059ade authored almost 6 years ago

Merge branch 'master' into change

e995fdd3558998810e568f554e2e2cbfa68fef7c authored almost 6 years ago

Icon of extract ingredients button is mismatching (#2519)

* updated

* updated fragment_add_product_ingredients.xml

* Update fragment_add_product_ing...

27b19fabd7bddc1f398a80db31fdeefe56ff97fa authored almost 6 years ago

- try to modify the way icons are resized (#2522)

- try to avoid java.lang.NullPointerException: Attempt to invoke virtual method 'void android.wi...

438d6176eb4531e2678fe2e5edc9f0421f9d73f6 authored almost 6 years ago

New Crowdin translations (#2518)

* New translations strings.xml (Santali)

* New translations strings.xml (Sardinian)

* New ...

5405dca49d778c8800c300cb6b0d07ea86b928c1 authored almost 6 years ago

Allow rotation of front, nutrient and ingredient images during editing (#2092)

* Allow rotation of front, nutrient and ingredient images during editing

* Add import removed...

4013db81272bafaf63560aebf04b848414b0e821 authored almost 6 years ago

Merge pull request #2367 from dobriseb/Import_ingredients.json

Import ingredients.json

9697f5ff7c029d30ae247f3768dc0992cef7f57e authored almost 6 years ago

Update LoadTaxonomiesService.java

25865d836ef561da00edfc06c3484e29b9364b55 authored almost 6 years ago

Merge remote-tracking branch 'upstream/master' into Import_ingredients.json

8a4c04cb0dfd9dfd15efb3fe47f3be5f7211ad9d authored almost 6 years ago

Clean up commented code + strings.xml

9b66bce65970dd93ccc4fe1886d37e2c0415f0c4 authored almost 6 years ago

Merge pull request #2509 from deniger/2347

Fix #2347 Allow to go back to the main screen from compare mode

60d8d14d441d78fdfdde7bd20ac8f6e764e3170b authored almost 6 years ago

Merge pull request #2508 from deniger/2355

Fix #2355 Exception for E306 - org.json.JSONException

422daef20c807008eaee128ae66a7cabbe8a61b5 authored almost 6 years ago

Merge pull request #2450 from mustaqmustu/patch-1

fixes #2442 :Disable notification of taxonomy download

4f7e2ff9bced514508b48ed8c146445ac3ef2c1e authored almost 6 years ago

New Crowdin translations (#2503)

* New translations strings.xml (Catalan)

* New translations strings.xml (French)

* New tra...

c52a1044f2d0d52798291ee2acf30dfbc4733ec0 authored almost 6 years ago

added toasts

410c5eb7374fcde4e83947680430e5b3045410f0 authored almost 6 years ago

updated dagger version

68951fb993a7834e6acf4436de752bb4817f571e authored almost 6 years ago

Merge branch 'upstream'

# Conflicts:
# app/src/main/java/openfoodfacts/github/scrachx/openfood/views/category/activity/C...

4336a59682f3ad680cb4f54ce520a5e43b990226 authored almost 6 years ago

Merge remote-tracking branch 'upstream/master' into Import_ingredients.json

044b74afe2b02bb37be321d6b5dc9a5132e2f707 authored almost 6 years ago

review from @deniger

e1200a17e439e917cc1bfb5580a9c57e9f58b4e3 authored almost 6 years ago

Fix #2504 App crashes when going to "Product Image" tab (#2511)

* Fix #2504 App crashes when going to "Product Image" tab

* review log text

29810e0d0c101bc4e1478b2aab3783fc5a4a6256 authored almost 6 years ago

more robust code to fix #1933 and #2447 (#2476)

* - Fix #1933 more robust code to avoid the IndexOutOfBoundsException exception
- Fix #2447 avo...

b51b788d2e27a91890bfce3aeee10974a625624c authored almost 6 years ago

+ Fix #2057 Nutrition grade is displayed for products that don't have it

+ Add more utils methods to avoid duplicated code while retrieving nutrition grade

f433b683c70e97c1e2f42c0986c576854ed7e4d1 authored almost 6 years ago

Merge remote-tracking branch 'upstream/master' into Import_ingredients.json

210530592c8d260bb3140bdb5637098d97530450 authored almost 6 years ago

Fix #2347 Allow to go back to the main screen from compare mode

Add a toolbar as done in edit, history,... activities

cdb9ac5e42ef07f067d19bb91351f9954b827866 authored almost 6 years ago

- Fix #2355 Exception for E306 - org.json.JSONException

- The first entry from JsonObject is used and no supposition is done about the wikipedia id.

8c1d470cae4b003cc93f65dcbab8bfb6d697a3b2 authored almost 6 years ago

Update LoadTaxonomiesService.java

45511dac17a7492bc0ff4d082df6422064267287 authored almost 6 years ago

Update strings.xml

f69e75211d70eabce2a694c750bdbf53180f2016 authored almost 6 years ago

updated

dd954409a6f2296e1d39fbe06861df257ee3b175 authored almost 6 years ago

Update LoadTaxonomiesService.java

8cfd271358425836848cf8c71c43f8953f27a8b6 authored almost 6 years ago

Update LoadTaxonomiesService.java

6532675fc74d3b498a3c240327123196f71019f1 authored almost 6 years ago

Merge branch 'master' of https://github.com/openfoodfacts/openfoodfacts-androidapp

2c92f86ef4ff4539b1a2be38c6058c3fee17a9b7 authored almost 6 years ago

fix double placeholder in single placeholder string

e7f68ec7e0fba79fabbfbdfd07378111c1939cdc authored almost 6 years ago

Fix #2321 "I'm eating this" should be removed and display default list (#2498)

* Fixes #2321 : I'm eating this should be in view mode, not edit mode

* compare button change...

b8b854bc49e46fd7654a857e4e5e8eb063e72ef1 authored almost 6 years ago

New Crowdin translations (#2500)

* New translations strings.xml (Afrikaans)

* Ne...

b148320a9168a3b80cdce022a80c5ef8440f212b authored almost 6 years ago

Merge branch 'master' of https://github.com/openfoodfacts/openfoodfacts-androidapp

6050dac4c1fe9c27c04fa33b343f3c01cf5b9937 authored almost 6 years ago

extract strings from compare view #2499

8fbd63915cc5485adfaf541ba322cd47f2429a75 authored almost 6 years ago

Fix #1868 Check if any change is made in editing (#2494)

* - Fix #1868 Check if any change is made in editing
- Other fix: refresh product overview if c...

a2f316766acd1f00c0781c3964ae478b2dcf75bc authored almost 6 years ago

New Crowdin translations (#2496)

* New translations short_description.txt (Swedish)

* New translations strings.xml (Swedish)
...

b247a35188ae957a77e01db9b756d86c7767c102 authored almost 6 years ago

- Fix #2488 The link to rate the app is broken (#2489)

72cdeb392416c5526d601525b6ee48b7edf6dbc0 authored almost 6 years ago

Merge pull request #2497 from tomdaly/bugfix-2493

Refactor detectBarCodeInImage method (#2493)

269f2915702230df272ebdaa9cc831413b2dd1f4 authored almost 6 years ago

Merge pull request #2492 from tomdaly/bugfix-2444

Add Uri null check for share image intent (#2444)
Thanks @tomdaly 👍

4a7a39d9ace12fb7c21239cefc14e9d57ecb4778 authored almost 6 years ago

Refactor detectBarCodeInImage method (#2493)

Add try-with-resources to ensure InputStream closes after use
Improve exception catching by repo...

123d22c4189992e6c20cffa575ece46db4a3b3d9 authored almost 6 years ago

New translations strings.xml (French) (#2495)

ebf12c006017037bd6a5fac3bab9453ffc68483e authored almost 6 years ago

Add Uri null check for share image intent (#2444)

If app is opened from a multiple image share intent and an image has
invalid Uri (null), this ch...

51a52aa9d2b2931803459fb13cd1fa834ce130c6 authored almost 6 years ago

New translations strings.xml (Portuguese, Brazilian) (#2491)

199bb6145990db14cd47a228f040a38fd2dc7f8c authored almost 6 years ago

New Crowdin translations (#2487)

* New translations strings.xml (Kurmanji (Kurdish))

* New translations strings.xml (German)
...

3d6305d038f558b7ea7354421e97ae80ab63ff37 authored almost 6 years ago

Update strings.xml

e61ce49050485b4d01e907db4541d10c88b39ba2 authored almost 6 years ago

New Crowdin translations (#2481)

* New translations long_description.txt (French)

* New translations strings.xml (French)

*...

d973d3f5edaa3b4d78fb043504a5049bbbbefe4f authored almost 6 years ago

Update strings.xml

657e12eb527b2563787068346266e4c7a578bb0e authored almost 6 years ago

Update strings.xml

1a5b54d58a5905b7c01e3fcf644eb3fa720ee8c2 authored almost 6 years ago

Update strings.xml

c45daa3b6d21f033cbd62d785eb94538ccb90371 authored almost 6 years ago

Implementation of Robotoff insight annotation interface (#2482)

* Implementation of Robotoff insight annotation interface

* Bug fix: don't hide scores layout...

49498cb1c47aa54fb445578a9c6b8922d941a56b authored almost 6 years ago

Remove legacy imports

de92239614a0d73e989606d78f55dd0b1bbaf3c4 authored almost 6 years ago

Delete legacy error log

The log is erronous as a fragment is not necessarily created (startActivity is used for some of t...

29b89b42275fa6c93136566309d83839af5e16a6 authored almost 6 years ago

Merge branch 'master' into Import_ingredients.json

2322571450bf540a9189ced9c5d3cad5be1786c5 authored almost 6 years ago

strings.xml from master

b567ddeff9cbddad373b14fc321e7189917b5e87 authored almost 6 years ago

Merge remote-tracking branch 'upstream/master' into Import_ingredients.json

dbd6de84015ec625bf7b286bc1654b2a79a1e1fe authored almost 6 years ago

fix #2374, #2454 Nutrition units incorrectly managed (#2455)

* fix #2374, #2454

+ fix conversion issues

* fix #2374, #2454

+ fix conversion issues

57c26743ba29d62e450cca40e5832aec82f7f606 authored almost 6 years ago

New Crowdin translations (#2475)

* New translations strings.xml (Vietnamese)

* New translations strings.xml (Danish)

* New ...

e624ffc2ff1f909c3963cc2ba9c4808a46fa661f authored almost 6 years ago

New Crowdin translations (#2473)

* New translations strings.xml (Kurmanji (Kurdish))

* New translations strings.xml (Greek)

...

92bead8dafae584627a88f861f1aa0a40a3184fb authored almost 6 years ago

New Crowdin translations (#2469)

* New translations strings.xml (Acholi)

* New translations strings.xml (Berber)

* New tran...

40fa878709a5ff16db1d953cc54b770514f914f2 authored almost 6 years ago

Fix duplicated allergen display bug (#2462)

* Fix duplicated allergen display bug

* Show allergen alert inline instead of displaying a po...

095fef8dd37927325aab73fb5b4773d11af81fb1 authored almost 6 years ago

New translations strings.xml (Dutch) (#2467)

2d479878e95f8d1ca95c3f4598db9863632e7450 authored almost 6 years ago

New Crowdin translations (#2466)

* New translations long_description.txt (Polish)

* New translations strings.xml (Polish)

*...

62bcb6a453df879e2b04670d55560989fb5e9ba9 authored almost 6 years ago

Merge pull request #2463 from openfoodfacts/remove_add_to_list_button

Remove add_to_list button from Continuous scan view

033c6dee1685d66e66fe17e9fcbd0cef4e95bc8a authored almost 6 years ago

Merge remote-tracking branch 'upstream/master' into Import_ingredients.json

111aa286d6394b070a2a80e4f80de706406d0345 authored almost 6 years ago

Revert "Add licences"

This reverts commit e96ed098517ae63d476a798a9bcaf327d3fd0541.

d8c54cdc37354bbd6c390e439e90884c55328b0e authored almost 6 years ago

New Crowdin translations (#2465)

* New translations strings.xml (Dutch, Belgium)

* New translations strings.xml (Polish)

* ...

c1983e3c88d1e9da420cfb0594c670b186f33fd7 authored almost 6 years ago

Update .travis.yml

da3a16ce802e32f15e3d884a77ebc9e4758425ae authored almost 6 years ago

New Crowdin translations (#2461)

* New translations strings.xml (Polish)

* New tran...

666dd53611c819fb5e04700ecf4fe77b4c072e91 authored almost 6 years ago

Remove add_to_list button from Continuous scan view

bd2f8554ce798c5dcb6d69c7cb1d34ce1619a869 authored almost 6 years ago

Redesign of product summary tab (#2460)

* WIP

* WIP (2)

* Add action bar

* Delete product menu

* Remove now useless buttons ...

0014ae84ec2dda0e33d59b907fa9f6405ac4d6c9 authored almost 6 years ago

Used localized string for preference item

4898c28880b94d1b75bc5aac95d50175dfd53939 authored almost 6 years ago

New Crowdin translations (#2457)

* New translations strings.xml (Vietnamese)

* ...

db91c9dcb6546710c48e077d6d5f6e49122cfbcf authored almost 6 years ago

New Crowdin translations (#2456)

* New translations strings.xml (Bambara)

* New translations strings.xml (Azerbaijani)

* Ne...

f277a1e605b46f3aece18c0cd54d8d78ebc7ffe2 authored almost 6 years ago

fixes #2309 : Add Error Message for empty Password in Sign-in Screen (#2379)

* updated LoginActivity.java

* Uploaded new translations

* Update strings.xml

* Update ...

3d56ec3f08690162c7ce7efdf9b66a53b882dd3f authored almost 6 years ago

New Crowdin translations (#2411)

* New translations long_description.txt (Marathi)

* New translations long_description.txt (Ka...

757618912b2b67591f569284d3490118531a465b authored almost 6 years ago

fix #2403, #2374 Nutrient name should always be visible in edit mode (even if we have a value) (#2453)

* fix #2403, #2374
+ Use TextInputLayout to always display field name
+ Clean the fragment use...

0d63a4436f2cf1168ca2acf9540743889bb2508c authored almost 6 years ago

Update long_description.txt

2b9b28f7ef80a0c24597d71b5b48cc4c7dcbd4e0 authored almost 6 years ago

Update long_description.txt

0e203b08f131c0625735a43c0778b02e09948cf0 authored almost 6 years ago

Add licences

e96ed098517ae63d476a798a9bcaf327d3fd0541 authored almost 6 years ago

Fix incorrect refs & use dimen.xml values for padding

aafb4cc3654f0b6eb389a099685f2b6848edf242 authored almost 6 years ago

Ecosyste.ms: OpenCollective

github.com/openfoodfacts/openfoodfacts-androidapp