Commit Graph

125 Commits

Author SHA1 Message Date
Dieter Plaetinck
ccb0d5c09d l10n 2024-06-06 18:07:40 +03:00
Dieter Plaetinck
244d628068 dashboard log meal should go to log meal page 2024-06-05 20:39:07 +03:00
Dieter Plaetinck
5d63c324c3 also replace icon in the dashboard widget expanded view 2024-06-05 20:07:06 +03:00
Dieter Plaetinck
3922549be8 log meals page + new 'log {meal,ingredient} to diary' dashboard buttons 2024-06-05 16:48:24 +02:00
Dieter Plaetinck
caa2866bdf Merge branch 'master' into goal-fiber 2024-05-25 09:53:47 +02:00
Dieter Plaetinck
5ae30e6788 cleaner way to show line of macros 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
12c1d0044c support fibers goal 2024-05-18 21:32:29 +02:00
Dieter Plaetinck
2347657dcd fixes 2024-05-04 23:20:16 +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
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
580b053591 use improved barchart widget on nutrition dashboard widget 2024-04-27 16:11:08 +02: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
0153fcc691 Also pass the last known weight in the dashboard 2024-02-17 18:52:36 +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
d4e4f3384a Use the user's preferred unit for body weight 2024-01-23 16:33:32 +01:00
Roland Geider
190f47f76b Merge branch 'master' into ux_fixes 2024-01-12 14:54:25 +01:00
Roland Geider
396c98dbd9 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/widgets/add_exercise/steps/step2variations.dart
#	pubspec.lock
2024-01-11 11:20:31 +01:00
Github-actions
0bc5e8e9e6 Automatic linting 2024-01-10 14:45:21 +00:00
Roland Geider
d51b6d7d87 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/main.dart
#	lib/providers/exercises.dart
#	lib/widgets/workouts/day.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-09 15:37:48 +01:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +01:00
Roland Geider
65ba2275ae Run "dart format --line-length=100 ." to make the diff smaller 2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac fix(drift): built a model for exercise and fixes in fromSql type converter 2023-12-23 14:28:38 +05:30
Miroslav Mazel
87c8a599f0 Homescreen: new details icon + tweaked padding 2023-11-24 13:02:25 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Miroslav Mazel
d445283cf7 Different fonts + tweaked icons 2023-11-11 12:33:19 +01:00
Roland Geider
5845e70a6b Simplify some of the widgets since these values are set in the theme now 2023-11-10 19:08:42 +01:00
Roland Geider
9e85745c2f Make the calendar theme dynamic based on the current theme (light/dark mode) 2023-11-09 19:50:05 +01:00
Roland Geider
81ed85c2f2 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
2023-11-09 19:16:17 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
779926bc98 Move nutritional plan diary chart to fl charts 2023-10-01 20:38:24 +02:00
Roland Geider
ef5a7081a0 Make MeasurementChartWidgetFl work
This still doesn't look completely nice, but it's a good start
2023-10-01 14:27:02 +02:00
artchiee
cf35cea913 Unfinished work on Charts replacement 2023-08-22 12:12:41 +01:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
90edf0f100 Start replacing the charts with fl_chart 2023-04-25 20:54:47 +02:00
Roland Geider
07671b7273 Some polishing 2023-04-23 13:10:17 +02:00
Roland Geider
8de51abb9a Remove more hard coded colors and use the theme data 2023-04-22 14:30:31 +02:00
Roland Geider
80ec0e80fb Start moving to material 3
Also dark mode at last
2023-04-22 13:38:13 +02:00
Roland Geider
d7a27bd35c Merge branch 'master' into feature/dashboard-with-measurements 2022-10-11 21:51:32 +02:00
Roland Geider
a8e4fdb4e0 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	lib/models/workouts/log.dart
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-10-10 15:50:50 +02:00
Bujdy
ad83cfb20d changed weight layout, added option to add measurement category, added navigation to measurement 2022-10-06 11:27:18 +02:00
Bujdy
1b724f3b10 removed onPressed 2022-10-06 00:04:42 +02:00
Bujdy
a659fcc24a fixed typo, added translation, fixed empty list state, added elevation parameter to card 2022-10-05 23:52:50 +02:00
Bujdy
5cc6413f0d addded measurements to dashboard, categories card refactor 2022-10-05 17:09:59 +02:00
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Roland Geider
0711e199da Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	lib/models/exercises/exercise.g.dart
#	pubspec.lock
#	pubspec.yaml
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-07-01 09:47:52 +02:00
Roland Geider
ca2fd8e9ef Add a consumer to the body weight card
Closes #144
2022-05-20 19:08:13 +02:00
Roland Geider
9d554b391d Some further fixes for migration to exercise bases 2022-05-10 17:07:06 +02:00