Dieter Plaetinck
fb7be3c8a3
overhaul macros viewing
...
* fix macros alignments across different UI elements, by relying on
a new standardized NutritionTile
* honor true needed widths based on string lengths of the column names
* show total macros for meal
2024-06-10 15:32:57 +03:00
Dieter Plaetinck
fa2c0ca449
mealtiles read only for logging
2024-06-06 18:24:30 +03:00
Dieter Plaetinck
a209015d41
l10n
2024-06-06 18:17:40 +03:00
Dieter Plaetinck
4249abf266
cleanup
2024-06-05 19:55:18 +03:00
Dieter Plaetinck
0766f83f82
move 'add meal' out of 'more' into its own dedicated button
2024-06-05 19:55:18 +03:00
Dieter Plaetinck
378a0fe55f
remove images
2024-06-05 19:55:18 +03:00
Dieter Plaetinck
ac466f0b75
do 'add meal' via 'more' menu, and make it look nicer
2024-06-05 16:48:24 +02:00
Dieter Plaetinck
b88360aef3
FAB's for logging meal and logging ingredient
2024-06-05 16:48:24 +02: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
67cd2276ea
use slider for portion size, layout tweaks
2024-05-29 13:04:50 +02:00
Roland Geider
e043b29a7f
Remove duplicated text
2024-05-29 11:22:54 +02:00
Dieter Plaetinck
68799b0112
log meal: separate confirmation page with portion choice
2024-05-27 23:53:22 +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
6cfd2e34e2
bug fixes
2024-04-14 22:08:54 +02:00
Dieter Plaetinck
cb17e48f8e
tiny nutrition fixes
2024-04-10 19:03:22 +02:00
Roland Geider
4b6a0a8875
Merge branch 'master' into feature/nutrition-goals
2024-02-18 11:48:58 +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
2dc08a133e
Merge pull request #459 from 12people/ux_fixes
...
Removing Dismissible for better discoverability
2024-01-23 14:31:16 +01:00
Roland Geider
51a0e8798d
Correctly show any errors from the server on the registration page
...
Also, add some tests
2024-01-22 16:55:59 +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
Roland Geider
b9b51dbad3
Rename constant to make it more clear what they are
2024-01-11 11:17:36 +01:00
null
4d90b8fc13
Fix bugs ( #476 )
...
* #454 issue, prefill only on debug mode
* #454 issue, prefill only on debug mode
* added myself <3
* -
* -
* fix #478 LateInitializationError
* add consts, make the funcs private
* latest update, change the name of prod, adding test server in debug mode
* -
---------
Co-authored-by: allohibihanaa <digitalhanaa@gmail.com >
Co-authored-by: Roland Geider <roland@geider.net >
2024-01-11 10:42:24 +01: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
c5cbb4f851
Rework exercise database
...
This is now separated into individual tables and methods so that they can be
tested separately
2023-12-26 17:03:20 +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
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
32c7ca0803
Centered titles on macOS / iOS
2023-11-23 13:15:03 +01:00
Roland Geider
29a6839a61
Run dart fix on the code base
2023-11-19 18:49:35 +01:00
Miroslav Mazel
35127489a0
Consistent styling for FlexibleSpaceBar
2023-11-11 18:00:30 +01:00
Miroslav Mazel
89caf4616d
Adding much-needed padding
2023-11-11 17:59:55 +01:00
Miroslav Mazel
93f5314952
BottomNavigationBar -> NavigationBar
2023-11-11 12:37:54 +01:00
Miroslav Mazel
d445283cf7
Different fonts + tweaked icons
2023-11-11 12:33:19 +01:00
Roland Geider
95f863a0b6
Merge branch 'master' into feature/material-3
...
# Conflicts:
# lib/widgets/nutrition/meal.dart
# lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +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
6a1f231e48
Make chips a bit smaller and give them a bit of color
2023-11-09 20:19:19 +01:00
Miroslav Mazel
5f7bc96f8b
Don't use BuildContext across async gaps
2023-11-05 23:34:37 +01:00
Miroslav Mazel
420b06a661
Organize imports / remove unnecessary ones
2023-11-05 23:22:34 +01:00
Roland Geider
68f0ad46cb
Commit WIP for nutrition page rework
2023-10-17 14:32:02 +02:00
Roland Geider
43d61ecfbf
Merge branch 'master' into feature/material-3
...
# Conflicts:
# pubspec.yaml
2023-08-10 07:17:27 +02:00
Github-actions
8c809ad8cb
Automatic linting
2023-08-08 09:14:27 +00:00
Roland Geider
aecbcfe663
Update models to work with new keys
...
creation_date was renamed to created and
update_date to last_updated
2023-08-08 11:12:55 +02:00
Github-actions
ef1bc990e5
Automatic linting
2023-06-05 15:27:50 +00:00
Jigar
aba4b824fc
now it is fixed for null check
2023-05-17 15:25:51 +05:30
Jigar
d33bb1875f
fixed validating username problem
2023-05-12 05:05:50 +05:30
Roland Geider
1ea3c2e2eb
More polishing
2023-04-24 16:28:38 +02:00
