Dieter Plaetinck
b9f7a2c736
fix UI bug
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
c0e7a0c66e
replace MealItemExpandedRow widget with NutritionDiaryheader
...
* it is designed to be used along with NutritionDiaryEntry
* and use on nutrition diary page
2024-05-15 11:57:21 +02:00
Dieter Plaetinck
fbc347cfa4
DRY legend labels part 2
2024-05-15 11:06:24 +02:00
Dieter Plaetinck
1cfc363af9
make padding same as other widgets
2024-05-15 10:35:52 +02:00
Dieter Plaetinck
8ace0ef63c
DRY legend labels
2024-05-15 10:32:23 +02:00
Dieter Plaetinck
a3d060cd8e
move chart legend into actual chart
2024-05-15 10:20:53 +02:00
Dieter Plaetinck
d875d81a5e
style the table better
2024-05-10 17:53:59 +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
e9d7a39ab9
nutrition plan details: use 3 levels of detail
...
* no need to see the ingredients of every meal in such detail by default
* also, handle it nicer when a meal has no ingredients defined yet
2024-05-07 11:50:31 +02:00
Dieter Plaetinck
9a67a073d3
fix: use goal derived from goals or meals
2024-05-05 10:39:23 +02:00
Dieter Plaetinck
2a9ac23a10
move MacronutrientsTable into its own file
2024-05-05 10:31:36 +02:00
Dieter Plaetinck
2347657dcd
fixes
2024-05-04 23:20:16 +02:00
Dieter Plaetinck
36697a660d
proper nullable "nutritional goals" with inference
...
differentiate between a goal being set (but as 0) vs a goal not being
set. fixes various correctness issues
2024-05-04 14:20:00 +02:00
Dieter Plaetinck
00b5cc2f57
tweak design
2024-05-03 13:06:24 +02:00
Dieter Plaetinck
820dee2c0d
move nutritional diary table into separate file, clean up a bit
2024-05-03 10:57:39 +02:00
Dieter Plaetinck
8c5eded894
new "progress towards goals" widget for nutrional plans
...
both for dashboard widget and nutritional details page
2024-04-30 18:57:40 +02:00
Dieter Plaetinck
d2c8e4a4c3
remove FlNutritionalDiaryChartWidget, it is no longer used
2024-04-30 18:54:20 +02:00
Dieter Plaetinck
54e2aa4be8
suggestion: replace chart and horizontal table with vertical table
2024-04-30 18:54:20 +02:00
Dieter Plaetinck
b7df869695
display caloric balance on nutrition dashboard widget
2024-04-27 17:45:25 +02:00
Dieter Plaetinck
3b70cb37e5
nutrition dashboard widget: use 3 layers of detail
...
... because showing all meals by default is a bit too much info
2024-04-27 16:29:45 +02:00
Dieter Plaetinck
db83b138e9
remove aspectratio and padding from chart widget.
...
it doesn't seem to change how it looks on nutrition detail
and makes it look proper on nutrition dashboard widget
if we really do need such layout controls, maybe they should be done
at the call site, rather than the widget implementation?
2024-04-27 16:11:08 +02:00
Dieter Plaetinck
580b053591
use improved barchart widget on nutrition dashboard widget
2024-04-27 16:11:08 +02:00
Dieter Plaetinck
088f31b1f9
cleanup
2024-04-27 16:11:08 +02:00
Roland Geider
1e16179d78
Merge pull request #555 from wger-project/feature/nutrition-goals
...
Move planned vs logged calories closer to feature on web application
2024-04-21 18:46:02 +02:00
Dieter Plaetinck
6e37c09fc7
paint difference wrt plan as surplus or deficit
...
* there may not be a plan for a given macro. accommodate this nicely
* a whole dedicated bar for 'planned' felt too much UI bloat
2024-04-15 13:11:26 +02:00
Dieter Plaetinck
cc39b692b2
cleanup/simplify existing code
2024-04-15 12:21:31 +02:00
Dieter Plaetinck
eaf968c3cd
hide 'add meal' button when in only logging mode
2024-04-15 10:52:37 +02:00
Dieter Plaetinck
389caf5dda
make nutrition plan form work
2024-04-13 00:08:09 +02:00
Dieter Plaetinck
cb17e48f8e
tiny nutrition fixes
2024-04-10 19:03:22 +02:00
Roland Geider
a69612f4a4
Add some needed paddings
2024-02-24 12:28:03 +01:00
Roland Geider
432ac8bbc6
More refactorings, extracting widgets and polishing
2024-02-24 12:19:36 +01:00
Roland Geider
7100fcf992
Extract table to own widget
2024-02-23 20:41:07 +01:00
Roland Geider
84c9fe888e
Some renamings
2024-02-23 20:37:10 +01:00
Roland Geider
222442cccb
Use same colors and ordering as in the web application
2024-02-23 20:18:25 +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
4b6a0a8875
Merge branch 'master' into feature/nutrition-goals
2024-02-18 11:48:58 +01:00
Roland Geider
0153fcc691
Also pass the last known weight in the dashboard
2024-02-17 18:52:36 +01:00
Roland Geider
9c7b65bc49
Allow users to quickly increment the body weight
2024-02-17 18:48:48 +01:00
Roland Geider
9ef0c10896
Add common widget for macronutritional goals
2024-02-01 15:18:44 +01:00
Roland Geider
3c749855d5
Merge branch 'master' into feature/nutrition-goals
...
# Conflicts:
# lib/models/exercises/exercise.g.dart
# lib/models/user/profile.g.dart
# test/gallery/gallery_form_test.mocks.dart
# test/gallery/gallery_screen_test.mocks.dart
# test/measurements/measurement_provider_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.mocks.dart
# test/nutrition/nutritional_plans_screen_test.mocks.dart
# test/user/provider_test.mocks.dart
# test/weight/weight_provider_test.mocks.dart
# test/workout/gym_mode_screen_test.mocks.dart
# test/workout/workout_plan_screen_test.mocks.dart
# test/workout/workout_plans_screen_test.mocks.dart
# test/workout/workout_provider_test.mocks.dart
# test/workout/workout_set_form_test.mocks.dart
2024-02-01 14:16:53 +01:00
Roland Geider
faf1018f2a
Fixes for flutter typeahead 5.1.0
...
Also, add some models for the API response from the search
2024-01-29 12:07:26 +01:00
Roland Geider
4af4462498
Remove unused import
2024-01-23 21:14:06 +01:00
Roland Geider
eba08b1d66
Make behaviour of cards more consistent
...
Now the workout card has the "go to detail page" on the left as well
2024-01-23 17:00:57 +01:00
Roland Geider
d31b09d8e2
Make behaviour of cards more consistent
...
Now the nutrition card has the "go to detail page" on the left and
the action icon on the right as well
2024-01-23 16:56:10 +01:00
Roland Geider
003038e67d
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# test/weight/weight_screen_test.dart
2024-01-23 16:42:25 +01:00
Roland Geider
d4e4f3384a
Use the user's preferred unit for body weight
2024-01-23 16:33:32 +01:00
Roland Geider
5003c00b32
Small tweaks
2024-01-23 15:23:06 +01:00
Roland Geider
3f46277c75
Fix test
...
Since we're mocking the provider no entries are actually being deleted anywhere
2024-01-23 14:58:53 +01:00
