Commit Graph

264 Commits

Author SHA1 Message Date
Dieter Plaetinck
eeec221499 add note 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
ad4543f2e6 small refactor 2024-05-23 19:59:57 +02:00
Dieter Plaetinck
6f576b557c bugfix: 7day averages need to be divided by 7! 2024-05-15 10:52:54 +02:00
Roland Geider
ef78bc55e6 Remove BaseNutritionalValues, this wasn't used anymore 2024-05-12 14:09:05 +02:00
Dieter Plaetinck
9ad969527d fix 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
2347657dcd fixes 2024-05-04 23:20:16 +02:00
Dieter Plaetinck
faa417d183 fix test 2024-05-04 18:13:16 +02:00
Dieter Plaetinck
bffaa9a9c9 Revert freezed attempt. it needs a constructor without args... :/
This reverts commit 55aac23033dda47895ffb63154fcbc6fe5524d40.
2024-05-04 15:56:11 +02:00
Dieter Plaetinck
84f43bb5c2 trying to fix tests by using freezed 2024-05-04 15:56:11 +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
cc39b692b2 cleanup/simplify existing code 2024-04-15 12:21:31 +02:00
Dieter Plaetinck
93cd21f33f fixes 2024-04-14 22:46:43 +02:00
Dieter Plaetinck
6dbfe88ac1 cleanups 2024-04-14 22:38:56 +02:00
Dieter Plaetinck
0a695ecc35 bugfix 2024-04-14 22:14:36 +02:00
Dieter Plaetinck
6cfd2e34e2 bug fixes 2024-04-14 22:08:54 +02:00
Dieter Plaetinck
a3232f7428 simplify some code 2024-04-14 21:48:04 +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
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
6f9a07159e Format generated files 2024-02-01 14:17:59 +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
d4e4f3384a Use the user's preferred unit for body weight 2024-01-23 16:33:32 +01:00
Costas Korai
135ddb4a78 Update to use clock.now where needed
- The initial time set in the MealForm is defined in
the meal model object provided to the MealForm so both
the test and the meal object had to use clock.now in
order for the fixed value to apply to both.
2024-01-24 00:47:43 +11:00
Roland Geider
e67d992385 Add (for now) simple settings page to reset the exercise cache
This should be expanded later to allow to re-fetch all available exercises, etc.
2024-01-11 22:13:11 +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
acbee49100 Simplify generating translation objects 2023-12-30 17:55:52 +01:00
Roland Geider
f951b6117a Try to generate ExerciseApiData objects only within the exercises model 2023-12-28 22:32:28 +01:00
Roland Geider
c4577ca5d7 Further tweaking exercise cache handling
handleUpdateExerciseFromApi should now be faster and save up on some requests.
Ideally we would pre-populate the database with all exercises on first run, or
even just ship it pre-filled
2023-12-28 17:48:15 +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
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Roland Geider
c514842b59 Lint the code with a line length of 100
This makes it easier to understand the diffs
2023-11-16 21:36:21 +01:00
Abhishek Saini
582bc611a4 feat(drift-database): Shifted from shared prefs to drift for Exercises 2023-11-16 22:34:40 +05:30
Github-actions
ca27faf9e2 Automatic linting 2023-11-09 19:26:45 +00:00
Roland Geider
7659d06ea6 Merge branch 'master' into 12people_maintenance
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/core/charts.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/workouts/charts.dart
#	pubspec.lock
#	pubspec.yaml
#	test_driver/screenshot_driver.dart
2023-11-09 20:24:01 +01:00
Roland Geider
09f60fe432 Fix tests and recreate generated files 2023-11-09 19:07:38 +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
779926bc98 Move nutritional plan diary chart to fl charts 2023-10-01 20:38:24 +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
3003409c57 Automatic linting 2023-06-08 14:15:55 +00:00