github.com/openfoodfacts/openfoodfacts-androidapp commits

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

5a3650ac31c237909098e88fb2c6ec1419bbfd07 authored almost 6 years ago

Increase buildToolsVersion to '28.0.3'

Silence AndroidStudio warning

355efd42618df801ed34f2bee15bab69e30a5825 authored almost 6 years ago

Update Gradle to version 4.10.1

35edadcee31902750e19dff5fc62d403800d94e1 authored almost 6 years ago

Fix padding of textAdditiveProduct TextView

08f929cec2b5cff25ce723382e1ee5722ab12ce5 authored almost 6 years ago

Add tools:text annotation in summary fragment layout

e80ce9ae8d163a7ef9a5fcec0afdc5ffa78f1ccc authored almost 6 years ago

Update LoadTaxonomiesService.java

78179a47e2f26d9d2c9c42973a1898ac4a560b9d authored almost 6 years ago

fix #2438 (#2441)

+ update unit tests

6801a2d45bddb18ba23a8c95c4f0e6f84c743610 authored almost 6 years ago

fix #2252 (#2437)

+ remove duplicated part in the fragment ADdProductNutritionFactsFragment
+ Fix compilation err...

9dfe36fbd1306ac2a6dd6a1dd7c8c0a7a0c7133f authored almost 6 years ago

Product view UI improvements (#2439)

* Improve cardView in product fragments
- decrease cardElevation to 1dp
- Delete field from Su...

6b1f8ae5b114644ac2d47c6935f06dc58e4ff93a authored almost 6 years ago

strings.xml

134a17914676c1bfa6a288b3b679ad6f42f58941 authored almost 6 years ago

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

de17b6ab4ef2babdc8000c6ceaf096dfb0971754 authored almost 6 years ago

use only flag View.SYSTEM_UI_FLAG_FULLSCREEN (#2430)

9e24dbe2fda4749e4edbb6a2f3a87891d7ed6ca1 authored almost 6 years ago

scroll to top of product summary when sliding bottom sheet up (#2432)

956bd800ef4ab2134797316e23f7ddec9b3a698c authored almost 6 years ago

Fix android.view.ViewRoot

6bc94e252459d8750e5b8adef6bca45374ba2d7d authored almost 6 years ago

Merge pull request #2256 from balaji-ramavathu/other-fields

Fixes #2254 : Display other fields of the product in the appropriate …

29930294ff265f4615847e06cba931cc83ee9c1d authored almost 6 years ago

Fixes #2341:Hiding 4 fields in Edit mode (#2415)

* Fixes #4321:Hiding 4 fields in Edit mode

* Modify AddProduct fragment

b9075ff189387b4ba039a2c3b70314e5a71129b8 authored almost 6 years ago

Fixes #2406 : Add a toast message when user successfully changes units and resolution of images in preferences. (#2416)

* Update preferences.xml

* added toasts

3578e7ccf490b929f0b7307b37c80cbd88858ec7 authored almost 6 years ago

Fix #2391 (#2419)

21ec3078c36a301f62130eb04060d01705eac431 authored almost 6 years ago

Update strings.xml

f8a99b58ce3bf536ae08aa15ec7d05ab697a70d5 authored almost 6 years ago

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

49968142f7ff6916b6fc5cf2ef2eab661bcccc55 authored almost 6 years ago

New Crowdin translations (#2404)

* New translations strings.xml (Telugu)

* New tran...

e1f2179ef73995389060eba015d82e727d277d9e authored almost 6 years ago

New Crowdin translations (#2402)

* New translations strings.xml (Bambara)

* New translations strings.xml (Basque)

* New tra...

1ee2e9d3f6a7f9ac6dac0f60be3b64bc65e8dc03 authored almost 6 years ago

Fixes #2383 : Add a toast message when user clicks on "delete local search history" (#2384)

* Adds toast message to delete history search.

* Update strings.xml

* Update strings.xml
...

da36f6f090fa9b28e7c10965713173ffb2e735c2 authored almost 6 years ago

Harmonize to black. The icon needs to be changed. (#2401)

f5bdfc2d1c93f4e052c3ee80b0daf8d54b20e79b authored almost 6 years ago

Make the bottom bar more legible by turning it blue (#2390)

* Make the bottom bar more legible by turning it blue

Make the bottom bar more legible by tur...

0c544935ca2703d361dcdea7cbd5c2041c3ece0f authored almost 6 years ago

New Crowdin translations (#2399)

* New translations strings.xml (French)

* New translations strings.xml (Hebrew)

fe3180041dc4285a1ec1274d5e3c49b7fa4b6eb5 authored almost 6 years ago

Update fragment_ingredients_product.xml (#2393)

321b87980691fd2baebfb30d87aa10b469c20f04 authored almost 6 years ago

Update fragment_summary_product.xml

6ab0daf229b5c7ec47befd43a0fe794564ebab8e authored almost 6 years ago

Update fragment_summary_product.xml

8d48f8c4d490da011c2af9346c74b02a39c3d34c authored almost 6 years ago

Update fragment_summary_product.xml

9e28d51269c5c5b432582849cbc686ac36a1cf6d authored almost 6 years ago

Update fragment_nutrition_product.xml

fd5818c893088fb331b8f4f8d8eca47a14a526b2 authored almost 6 years ago

Update fragment_environment_product.xml

16a04a1cbeaa999bd7dfc26ad7b59a025927d730 authored almost 6 years ago

Update fragment_environment_product.xml

024665be59b0c2b777cecfd758685ae7b923d8b4 authored almost 6 years ago

Update fragment_ingredients_product.xml

f2ead5f1a8dca1ff1789c95e762f4809eb8d8b4b authored almost 6 years ago

Add a hint that the category is required to compute the Nutri-Score

183f6d5763bb9a9aa0ec08fba603cbfd17a2d33f authored almost 6 years ago

New Crowdin translations (#2394)

* New translations strings.xml (Dutch, Belgium)

* New translations strings.xml (Dutch, Belgiu...

7d9d0bc0297e03e960f58231449ef88a8eeeb4f6 authored almost 6 years ago

Update fragment_nutrition_product.xml

56cbbb088f644ee3cdb556b9f0f12f6b57e3d81c authored almost 6 years ago

New Crowdin translations (#2389)

* New translations strings.xml (Hebrew)

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

41ddeb27e9155fa9fa0474575acbdccd3f88fd21 authored almost 6 years ago

Disable the notification on (un)successful taxonomy load (#2370)

* disable-notif

disable-notif

* Update LoadTaxonomiesService.java

965547f221ed1464ccf6f1fc15badcd1b226b49e authored almost 6 years ago

Comments in strings.xml

ca61bfc84a18779ae1a4ae08fbff807af7a2d7c8 authored almost 6 years ago

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

7abe7f501ac7efe35397aa7824e7b5cb2d2fc3bb authored almost 6 years ago

New Crowdin translations (#2382)

* New translations strings.xml (Indonesian)

* New translations strings.xml (German)

91aaa6f46977fac1415121e792dda0eb7a6bb972 authored almost 6 years ago

fixes #2323 and #2322 :Added icons to some buttons (#2363)

* Added icons to some buttons

Update ic_add_a_photo_black_18dp.xml

Added icons to some but...

fa54c4b2a6f69ae2590387f2b02a63e73d07b5f3 authored almost 6 years ago

updated fragment_alert_allergens.xml (#2378)

53a35293f36328f2c57bd09e6f02b4e3ef92fe4c authored almost 6 years ago

New Crowdin translations (#2381)

* New translations strings.xml (Danish)

* New translations strings.xml (Italian)

* New tra...

bd48b8f2d567f88acb258fa759ba5128b65976a0 authored almost 6 years ago

New Crowdin translations (#2380)

* New translations strings.xml (Romansh)

* New translations strings.xml (Sanskrit)

* New t...

2fbd38cc9b39f08571a9ecf459422f822189fe51 authored almost 6 years ago

Merge branch 'master' into other-fields

460544e8684345193941ce23250b8b052325f0e5 authored almost 6 years ago

Added list name on product summary page (#2271)

1d9f08b48f492dbcbee6fdb1f398aab33a463e62 authored almost 6 years ago

fix crash on compirason (#2373)

1be81e11e26cc983bd848dc6d08f9a29571bcc89 authored almost 6 years ago

hotfix blank product summary (#2372)

e82b58afff6fa26e054422b3da6143a115f033fe authored almost 6 years ago

Update strings.xml

8d58793acf803f6d9558040fe10875f69f124012 authored almost 6 years ago

Update strings.xml

512c88c232ceece95cad18e93658c3a453549243 authored almost 6 years ago

hotfix blank product summary (#2371)

5c41d90e9428ba68108cd47c904df666165ea402 authored almost 6 years ago

Update strings.xml

ace7e371a2b71b6b9a85d68adac17c914096bc59 authored almost 6 years ago

Update ContinuousScanActivity.java

7a5937388d0bb2bc7ff0ee5b21999266f7e7120a authored almost 6 years ago

Update ProductComparisonAdapter.java

3b46297098769c01bcd3c1afbab748a64491febc authored almost 6 years ago

Fixes #2337 : Increase the height of edit text in calculate calories layout. (#2340)

* Updated Dialog_calculate_calories.xml

Updated Dialog_calculate_calories.xml

Updated dial...

5e151d8506667b485f0dc51702ca1dc7f47b996c authored almost 6 years ago

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

62fa32f3d8b962de0218e830e6e1674101aba52b authored almost 6 years ago

Add Imports for Flavors #2345

cf04bdb59c92b05a8ee5ec982d5064ecc6241260 authored almost 6 years ago

updated activity_product.xml (#2366)

ef661a8b8b01bcd75f87f4b9e15e86d3d49da279 authored almost 6 years ago

Updated RX Java2 dependencies (#2339)

Update preferences.xml

Updated RX Java2 dependencies

c1d1a51de0aee5a7c24e508a797aae45dad599cb authored almost 6 years ago

New Crowdin translations (#2362)

* New translations strings.xml (Kurdish)

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

468a56286c09c309af68505daae5ae7eb9f661ac authored almost 6 years ago

Remove quotes from string

6f0bd461874572353daf5f9a3172ee4e53df33ae authored almost 6 years ago

Add string to strings.xml

31ab2f0ca236b61f72bc392821f8e699d99f4069 authored almost 6 years ago

Add string to strings.xml

f8a7707fcb1593e32aecdd3550d59030979b15fa authored almost 6 years ago

Add strings to strings.xml

fe5db89b9f712b818ffc8371bbcf1e3f8c99347c authored almost 6 years ago

Use lambda function & avoid useless cast

a9700f69917ea9e94acb9d4a931ec99c5adbedec authored almost 6 years ago

Strings.xml EditDiet_... -> edit_diet_...

286bbb5b3854dc234a6ed8172a8f71f9fee1483e authored almost 6 years ago

New Import_ingredients.json from master

d1f83d799e5113d27d8cb0c11a1ef53129db541b authored almost 6 years ago

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

a414b53c2f6c0f36cf68619b2cc3375a9b27db12 authored almost 6 years ago

Remove unused imports

b303726a814c0aacabd77a69cf299588be49c924 authored almost 6 years ago

Merge pull request #2353 from openfoodfacts/issue_2326

Fix issue #2326

a55a3e5540b98fc4b50704857f536c5681850938 authored almost 6 years ago

getFieldHelper is set as local variable

a29eaed0c8f03bffadb2f831f4e7da8c8c4b21d1 authored almost 6 years ago

Merge remote-tracking branch 'upstream/master'

9fb8e4d398c1f9b6293eeda829cc99e90450d71d authored almost 6 years ago

New Crowdin translations (#2354)

* New translations strings.xml (Akan, Twi)

* New translations strings.xml (Akan)

* New tra...

ced2cbcb3c984c83c14e9d81500e94201b31b36a authored almost 6 years ago

Check that activity is not null or finishing

e8503046753b9e6041ce18f41eb9d4f2e65ae795 authored almost 6 years ago

Fix issue #2326

bb540ac8fa7b679e7c0097472e1c60fcef9e02de authored almost 6 years ago

Fix issue #2343

f37c937dafb3043275236f9525a413f5db28acf6 authored almost 6 years ago

Fix issue #2349

8c939d5f9d4f3c34b2594eb490a6ceed39e71a14 authored almost 6 years ago

Enable fastAdditionMode by default (#2351)

f061081d39c1d5dd0680e120ac15ef6c1150a1cc authored almost 6 years ago

New Crowdin translations (#2344)

* New translations strings.xml (Basque)

* New translations strings.xml (Belarusian)

* New ...

a7d7b980ba0e4bda372a54ea67810215290a0465 authored almost 6 years ago

Update strings.xml

5505f8273f1244fab6ff422e62e0e984f3ee73ef authored almost 6 years ago

New Crowdin translations (#2336)

* New translations strings.xml (Polish)

* New tran...

03078dfc0172212d9f1c8e8611d0cd2affe3bb45 authored almost 6 years ago

Update strings.xml

57db83be5a8692487021d6df4db69c5091814a41 authored almost 6 years ago

New Crowdin translations (#2332)

* New translations strings.xml (Basque)

* New translations strings.xml (Belarusian)

* New ...

bc9ce19cc84400bf3d9b94bdb24294e173843334 authored almost 6 years ago

Update strings.xml (#2331)

eac0c750f9cef881de38869e774550f37a9148b4 authored almost 6 years ago

made string array untranslatable

f4173c5d10009a821fec794e5066bcf85b5ed5be authored almost 6 years ago

New Crowdin translations (#2329)

* New translations strings.xml (Italian)

* New translations strings.xml (Danish)

* New tra...

0994b37c667c2dd9209b322323619d06a8b7d5ac authored almost 6 years ago

Fixes #2291: Deduplicate the code used in the slideup view and the regular product view (#2313)

007cc7570047f526c86019cb53b90a6803816d98 authored almost 6 years ago

New Crowdin translations (#2328)

* New translations strings.xml (Hungarian)

* New translations strings.xml (Kurdish)

* New ...

f25ab2d8af49ebb5d2681c5efb7d5e2d82bb4fcc authored almost 6 years ago

New translations strings.xml (Hungarian) (#2320)

96a218712b8ea6315b14b7c2a0b9d3bdcb73725d authored almost 6 years ago

New Crowdin translations (#2319)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Afar)

* New tra...

4736935299f12d3f1d5134edc327db17483de860 authored almost 6 years ago

fixes issue #2105: loaded taxonomies in the background (#2122)

* fixes issue #2105: loaded taxonomies in the background

fixes issue #2105: loaded taxonomies...

1e71a70d952698c7c73f04e2979aadab687a2056 authored almost 6 years ago

Merge branch 'other-fields' of https://github.com/balaji-ramavathu/openfoodfacts-androidapp into other-fields

673b10c5c524638c684cf02fee448a1bab2df1c7 authored almost 6 years ago

Fixed spacing, duplicate code

35d4ee6cd4f679fd90d3c2e962760d169a9f6d1b authored almost 6 years ago

Fixes #2305: Text was appearing on the left rather than at the center. (#2308)

932186a8abbff470eaf9ea60d11f8e747c5240ff authored almost 6 years ago

Fixes #2311: Crash on 3270160636839 (#2312)

5d9ea60c481c5fc29d7474dae46a912b8fda41a0 authored almost 6 years ago

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

89cdff10723b6a8f64040ccb8f9b52a16a907ef1 authored almost 6 years ago

fixes #2274 : when user types a password less than 6 characters,text view error is overlapping with see password button. (#2295)

* Update preferences.xml

* Update LoginActivity.java

* Update preferences.xml

* Update ...

31a293af8b0452d39dde40df2df61f63daf4012a authored almost 6 years ago

fixes #2273 : When no items are added to offline edit, Text is misplaced (#2276)

* Update preferences.xml

* Update fragment_offline_edit.xml

* ...

287c17b12b73c47ad68be5749fbbe6221572a2b5 authored almost 6 years ago

Ecosyste.ms: OpenCollective

github.com/openfoodfacts/openfoodfacts-androidapp