wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,430 Commits 30 Branches 39 Tags
6f6e37137ed81777f48c567dea97c878fa69ba28
Commit Graph

2430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Geider
6f6e37137e Bump build number 1.7.4 2024-05-29 14:29:05 +02:00
Roland Geider
d5898b5c92 Merge pull request #596 from wger-project/portion-size-slider-fiber-renames 
Portion size slider fiber renames
 2024-05-29 14:07:11 +02:00
Dieter Plaetinck
d5fa2b9c18 fiber rename fixes 2024-05-29 13:04:50 +02:00
Dieter Plaetinck
67cd2276ea use slider for portion size, layout tweaks 2024-05-29 13:04:50 +02:00
Roland Geider
c3dec29bde Bump build number yet again 1.7.3 2024-05-29 11:57:01 +02:00
Roland Geider
9bc3a90257 Add missing title 2024-05-29 11:56:43 +02:00
Roland Geider
27eea2c255 Add screenshot for body weight 2024-05-29 11:52:26 +02:00
Roland Geider
b475f62eaa Add donation link to flatpak manifest 2024-05-29 11:49:35 +02:00
Roland Geider
1471d1aee6 Separate features and dependencies when generating release notes 2024-05-29 11:44:06 +02:00
Roland Geider
af7eee4199 Commit missing screenshots 2024-05-29 11:40:10 +02:00
Roland Geider
d37213f63a Bump build number 2024-05-29 11:39:45 +02:00
Roland Geider
cebb53c31a Merge branch 'log-fractional-meals' 2024-05-29 11:22:58 +02:00
Roland Geider
e043b29a7f Remove duplicated text 2024-05-29 11:22:54 +02:00
Roland Geider
53c674b8de Merge pull request #594 from wger-project/recent-ingredient-suggestions-tweaks 
Recent ingredient suggestions deduping and filtering
 2024-05-29 11:22:28 +02:00
Roland Geider
7f4dafd5ae Merge pull request #593 from wger-project/log-fractional-meals 
log meal: separate confirmation page with portion choice
 2024-05-29 11:20:47 +02:00
Roland Geider
3e138d24dd Merge pull request #592 from wger-project/ingredient-form-ux 
IngredientForm UX fixes
 2024-05-29 10:48:33 +02:00
Roland Geider
a3734a4cd8 Merge pull request #584 from wger-project/goal-fiber 
Fiber goals
 2024-05-29 10:27:30 +02:00
Roland Geider
cbd3d431c3 Localize header text 2024-05-29 10:23:32 +02:00
Dieter Plaetinck
686fb44933 filter suggestions by search string 2024-05-28 12:19:53 +02:00
Dieter Plaetinck
a4bdf70582 consistent, improved deduplication behavior across mealitems and logs 
deduplicate by ingredient AND amount: so if you use the same
ingredient, but in a different amount, the different amount
will show up
this increases the list of suggestions for editing meals,
and decreases the list logging an ingredient (significantly,
if you often log the same ingredient in the same amount)
 2024-05-28 11:58:38 +02:00
Dieter Plaetinck
68799b0112 log meal: separate confirmation page with portion choice 2024-05-27 23:53:22 +02:00
Dieter Plaetinck
436ee2a723 hide id 2024-05-27 10:09:20 +02:00
Dieter Plaetinck
4fcacbcdce fix test 2024-05-27 10:05:13 +02:00
Dieter Plaetinck
ad64eb2c14 cleanup 2024-05-27 09:37:04 +02:00
Dieter Plaetinck
864c6fc82b properly set/unset value via helper functions. fix #591 2024-05-26 22:10:35 +02:00
Dieter Plaetinck
b21c19ae65 various ingredient form UX issues 
* upon scan completion, give more useful preview of the found ingredient
* use ID field to track whether the form is "loaded" with a valid
  ingredient or not
* don't trigger search if an ingredient is loaded, unless user changes
  the pattern
* always show meal item preview, whether loaded from recent items, or
  from scan result
 2024-05-26 22:10:34 +02:00
Dieter Plaetinck
caa2866bdf Merge branch 'master' into goal-fiber 2024-05-25 09:53:47 +02:00
Roland Geider
f00dc88678 Merge pull request #589 from wger-project/feature/weblate 
Translations update from Hosted Weblate
 2024-05-24 15:12:52 +02:00
Tsz Hong CHAN
e388e4ee53 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 75.0% (3 of 4 strings)

Translation: wger Workout Manager/Play Store
Translate-URL: https://hosted.weblate.org/projects/wger/play-store/zh_Hant/
 2024-05-24 15:11:55 +02:00
Tsz Hong CHAN
1133c5c418 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (259 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hant/
 2024-05-24 15:11:55 +02:00
Tsz Hong CHAN
bc56e38ac4 Translated using Weblate (Japanese) 
Currently translated at 66.7% (173 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ja/
 2024-05-24 15:11:55 +02:00
Tsz Hong CHAN
98953de985 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 64.4% (167 of 259 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hans/
 2024-05-24 15:11:55 +02:00
Roland Geider
b08e4fc011 Merge pull request #580 from licaon-kter/patch-1 
Rename logo.png to icon.png
 2024-05-24 15:11:51 +02:00
Roland Geider
c243215fcc Merge pull request #585 from wger-project/show-macros-on-ingredients-tiles 
Add energy and kcal values to ingredient logging/adding forms
 2024-05-24 15:06:04 +02:00
Dieter Plaetinck
eeec221499 add note 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
d4d298ad9e fix tests 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
74002350ba unify IngredientLogForm and MealItemForm 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
58122d40b5 get ready to support showing images in the ingredient preview 
note: the image doesn't seem to
be set yet, but at least the UI is now ready for it
 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
1c84d91834 convert form to stateful, show ingredient preview 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
63d37175c4 show reminder of macro's on ingredient tiles 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
ad4543f2e6 small refactor 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
5ae30e6788 cleaner way to show line of macros 2024-05-23 19:59:57 +02:00
Roland Geider
5d237e1ddf Consistently use "fiber" 2024-05-23 17:54:50 +02:00
Roland Geider
cdc9cbd658 Merge pull request #570 from wger-project/dependabot/pub/package_info_plus-8.0.0 
Bump package_info_plus from 7.0.0 to 8.0.0
 2024-05-23 17:47:37 +02:00
Dieter Plaetinck
a13b389fec Merge pull request #583 from wger-project/tiny-tweaks 
Tiny tweaks
 2024-05-21 21:09:08 +02:00
Roland Geider
8df87086d2 Merge pull request #588 from wger-project/typeahead-scan-fixes 
Typeahead & barcode scan fixes
 2024-05-21 19:31:22 +02:00
Dieter Plaetinck
c8dbb8971e fix various lint issues 2024-05-21 16:25:21 +02:00
Dieter Plaetinck
d896fab4ad cleanup 2024-05-21 16:25:21 +02:00
Dieter Plaetinck
cb696cc585 fix non-final field on immutable class 2024-05-21 16:25:21 +02:00
Dieter Plaetinck
abd531be1f bugfix: show error message when scan fails 
due to the extra Navigator.pop(), we would immediately close the error
dialog after opening it, rendering it practically invisible.

to handle back button in non-error cases, we now simply accept the null value
 2024-05-21 16:25:21 +02:00