Commit Graph

76 Commits

Author SHA1 Message Date
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
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
72a85e1cae not needed param 2024-05-17 09:09:03 +02:00
Dieter Plaetinck
25aa08f3f3 allow picking date when logging ingredient 2024-05-08 22:48:26 +02:00
Dieter Plaetinck
cfd47bc20b fix a random bug 2024-05-08 22:48:26 +02:00
Dieter Plaetinck
578d56a0df fix tests, introduce golden tests
to make golden tests work, we no longer plot the "now time" for "other logs"
this was pretty silly anyway...
2024-05-08 22:48:26 +02:00
Dieter Plaetinck
088f31b1f9 cleanup 2024-04-27 16:11:08 +02:00
Dieter Plaetinck
389caf5dda make nutrition plan form work 2024-04-13 00:08:09 +02:00
Roland Geider
432ac8bbc6 More refactorings, extracting widgets and polishing 2024-02-24 12:19:36 +01:00
Roland Geider
84c9fe888e Some renamings 2024-02-23 20:37:10 +01:00
Roland Geider
9b0985fbf3 Add chart for percentage of logged nutritional values for meals 2024-02-23 19:19:13 +01:00
Roland Geider
9ef0c10896 Add common widget for macronutritional goals 2024-02-01 15:18:44 +01:00
Roland Geider
6376568ced Merge branch 'master' into feature/nutrition-goals
# Conflicts:
#	lib/widgets/nutrition/forms.dart
2023-11-26 16:39:22 +01:00
Miroslav Mazel
d445283cf7 Different fonts + tweaked icons 2023-11-11 12:33:19 +01:00
Miroslav Mazel
5f7bc96f8b Don't use BuildContext across async gaps 2023-11-05 23:34:37 +01:00
Miroslav Mazel
d86ee692bb Children at the bottom + consistent variable names + BuildContext async gaps 2023-11-05 23:24:50 +01:00
Roland Geider
68f0ad46cb Commit WIP for nutrition page rework 2023-10-17 14:32:02 +02:00
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
984df49c41 Add switch to search for ingredients in English as well 2023-03-20 17:14:12 +01:00
Roland Geider
bc2b947b81 Recreate generated files 2022-01-23 20:52:40 +01:00
Adrian Halko
7657230201 Added scanning process into IngredientTypeahead widget. 2021-12-01 15:24:33 +01:00
Adrian Halko
ac43b80e51 Implemented barcode scanner. Added keys to app_en.arb(for alert dialogs and button). 2021-11-22 19:31:21 +01:00
Roland Geider
a77a0cc5db Show last logged items for quick access 2021-11-08 10:37:57 +01:00
Roland Geider
504e4ffaba Refactor ingredient search widget 2021-11-03 19:41:05 +01:00
Tomáš Konkoľ
76ce31287f Add custom ingredient 2021-11-03 09:45:55 +01:00
Roland Geider
74ee9f16d8 Merge branch 'sandimilohanic_master' 2021-10-28 18:00:36 +02:00
Roland Geider
ff0e675860 Some refactoring for last used ingredients
It's easier to just use the already existing meal items rather than create
new logs that have the same infos.
2021-10-28 18:00:18 +02:00
Roland Geider
df387c923d Plan is not final
The object gets overwritten when a new plan gets created
2021-10-28 16:58:48 +02:00
Sandi Milohanić
884103a038 Merge branch 'master' into master 2021-10-28 12:59:36 +02:00
Sandi Milohanić
cfed221974 fix 2021-10-28 11:14:09 +02:00
Sandi Milohanić
a87351b470 Code fixing 2021-10-28 11:08:51 +02:00
Sandi Milohanić
b402f445a2 Add quick access to logged products #79 2021-10-27 18:01:43 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marvin M
923b44ba97 Marked as '@immutable'
This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: WorkoutForm._plan
2021-10-07 19:58:40 +02:00
Github-actions
9a9f0b2965 Automatic linting 2021-10-03 19:56:09 +00:00
Roland Geider
dae1e39ea7 Merge pull request #89 from ThilinaTCH/master
Allow user to give meals a description #70
2021-10-03 21:54:27 +02:00
Thilina Herath
5ad01e4cac test: resolve conflicts 2021-10-03 11:24:48 +08:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Thilina Herath
d6eb3deda7 Allow user to give meals a description #70
Add name field to meal form
2021-09-30 21:22:28 +08:00
ton-An
19445c36a2 (Measurements) Added Equatable + Refactored
(MeasurementProvider)
- Passing in the WgerBaseProvider instead of extending with it
- Re-written tests
- Added the fixture reader to make test file less crowded

(Measurement Models)
- Added Equatable
- Re-written tests
2021-08-22 18:07:47 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
b915c764ef Don't check AppLocalizations for null values
This is not needed in flutter 2.2 anymore
2021-05-19 11:50:43 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
f0fa8a5173 Nutritional plan time is nullable 2021-05-01 15:33:28 +02:00
Roland Geider
4c7452e634 Fix bug preventing addind and editing meal items 2021-04-28 11:47:30 +02:00