64 Commits

Author SHA1 Message Date
Dieter Plaetinck
85c245d67d dcm fix --only-rules=unnecessary-trailing-comma lib test test_data 2024-09-18 16:01:10 +03:00
Dieter Plaetinck
66ced6ccc4 dcm fix --only-rules=prefer-trailing-comma lib test test_data integration_test 2024-09-18 16:00:43 +03:00
Dieter Plaetinck
d06ecabadf use ingredientinfo api, for image + new source and remote id fields
also update fixtures accordingly
2024-07-12 13:50:04 +03:00
Roland Geider
5d237e1ddf Consistently use "fiber" 2024-05-23 17:54:50 +02:00
Roland Geider
239e1a1caa Consistently use "fibers" instead of "fibres" 2024-05-20 22:06:47 +02:00
Roland Geider
36928d540c Update screenshots 2024-05-12 16:09:27 +02:00
Roland Geider
9ff0eae355 Add missing user provider to make screenshot generation work again 2024-05-12 14:53:38 +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
Roland Geider
9b0985fbf3 Add chart for percentage of logged nutritional values for meals 2024-02-23 19:19:13 +01:00
Roland Geider
9c7b65bc49 Allow users to quickly increment the body weight 2024-02-17 18:48:48 +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
Roland Geider
dd12e040e9 Fun "dart fix" 2024-01-22 09:55:29 +01:00
Roland Geider
802da6aa1c Don't use ExerciseBase anymore... 2024-01-11 11:28: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
cf1beddb75 Add translated exercises for the screenshots 2024-01-10 22:42:49 +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
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
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
Roland Geider
bf7e2e8956 Move platform check to helper
Also, use TargetPlatform since it it better suited for tests (and seems to
be now the recommended way of checking this for UI elements)
2023-04-15 12:17:08 +02:00
Roland Geider
a977d4ec48 Refactor add_exercise_screen.dart
Use the is_trustworthy flag from the server, which also takes the account's age
into account. The widgets in the screen are split so it's easier to test and read
2023-02-07 20:30:09 +01:00
Roland Geider
a90a304124 Fix tests 2023-02-05 21:28:53 +01:00
Roland Geider
f68afd91fd Rename exercise object to translation
This is what they are now anyway and makes it more clear
2023-02-05 21:24:28 +01:00
Roland Geider
18b6903513 Create more and more realistic screenshots for the app store
Now these test use the regular test data, which has been updated and is used in
the rest of the tests as well.
2022-11-24 11:24:09 +01:00
Roland Geider
2aa9bc20e1 Load English name of muscles as well 2022-06-21 12:40:33 +02:00
Roland Geider
1fd1aed848 Add tests for the getExercise method 2022-05-11 17:41:11 +02:00
Roland Geider
9d554b391d Some further fixes for migration to exercise bases 2022-05-10 17:07:06 +02:00
Roland Geider
f834950cec Workout logs and settings now have a reference to an exercise base
This puts this code in sync with the backend and is logically better, since
the translations can be displayed when needed and are not hard coded
2022-05-10 16:53:44 +02:00
Roland Geider
826810f17a Start working on automatic screenshot generation 2022-04-11 20:00:32 +02:00
Roland Geider
19a504dcfb Actually create exercise bases and translations 2022-02-20 14:40:42 +01:00
Roland Geider
badc3257d0 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	assets/images/muscles/back.svg
#	assets/images/muscles/main/muscle-1.svg
#	assets/images/muscles/main/muscle-10.svg
#	assets/images/muscles/main/muscle-11.svg
#	assets/images/muscles/main/muscle-12.svg
#	assets/images/muscles/main/muscle-13.svg
#	assets/images/muscles/main/muscle-14.svg
#	assets/images/muscles/main/muscle-15.svg
#	assets/images/muscles/main/muscle-16.svg
#	assets/images/muscles/main/muscle-2.svg
#	assets/images/muscles/main/muscle-3.svg
#	assets/images/muscles/main/muscle-4.svg
#	assets/images/muscles/main/muscle-5.svg
#	assets/images/muscles/main/muscle-6.svg
#	assets/images/muscles/main/muscle-7.svg
#	assets/images/muscles/main/muscle-8.svg
#	assets/images/muscles/main/muscle-9.svg
#	assets/images/muscles/secondary/muscle-1.svg
#	assets/images/muscles/secondary/muscle-10.svg
#	assets/images/muscles/secondary/muscle-11.svg
#	assets/images/muscles/secondary/muscle-12.svg
#	assets/images/muscles/secondary/muscle-13.svg
#	assets/images/muscles/secondary/muscle-14.svg
#	assets/images/muscles/secondary/muscle-15.svg
#	assets/images/muscles/secondary/muscle-16.svg
#	assets/images/muscles/secondary/muscle-2.svg
#	assets/images/muscles/secondary/muscle-3.svg
#	assets/images/muscles/secondary/muscle-4.svg
#	assets/images/muscles/secondary/muscle-5.svg
#	assets/images/muscles/secondary/muscle-6.svg
#	assets/images/muscles/secondary/muscle-7.svg
#	assets/images/muscles/secondary/muscle-8.svg
#	assets/images/muscles/secondary/muscle-9.svg
#	lib/helpers/consts.dart
#	lib/l10n/app_en.arb
#	lib/models/exercises/exercise.dart
#	lib/models/exercises/exercise.g.dart
#	lib/providers/exercises.dart
#	lib/widgets/exercises/exercises.dart
#	pubspec.lock
#	pubspec.yaml
#	test/exercises/exercises_detail_widget_test.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-02-19 22:07:47 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Adrian Halko
3b8aaf99d5 Added forgotten nutritional_plans.dart which contains changed ingredients with codes. 2021-12-01 10:36:48 +01:00
Roland Geider
025c9393cd Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart
2021-11-03 20:28:06 +01:00
Github-actions
a2ae840c62 Automatic linting 2021-10-23 13:46:41 +00:00
Roland Geider
6a19a0697e Merge pull request #105 from sandimilohanic/master
add reference from log to meal
2021-10-23 15:44:52 +02:00
Sandi Milohanić
364b37c106 Correction reference mealId in log 2021-10-23 07:37:14 +02:00
Roland Geider
2d8d864f27 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.dart
#	lib/providers/exercises.dart
#	lib/providers/nutrition.dart
#	lib/widgets/exercises/exercises.dart
#	lib/widgets/workouts/forms.dart
#	lib/widgets/workouts/gym_mode.dart
#	pubspec.lock
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/gym_mode_screen_test.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.dart
#	test/workout_set_form_test.mocks.dart
2021-10-16 12:40:01 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02: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
7da45e93f7 test: update meal tests to include name property 2021-10-03 11:19:08 +08:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Yair Chen
b11fcda216 create unit tests fro findByFilters and generate mocks 2021-09-15 16:46:04 +03:00
Roland Geider
e62b03e8a8 Further work on reworking the exercise provider 2021-09-13 20:52:08 +02:00
Roland Geider
0462e41b20 Expand test for nutrition diary detail view 2021-08-17 11:45:52 +02:00
Roland Geider
c191b3e27e Wrap detail diary widget in a card
This is needed because the icon button needs a parent that is a Material widget
2021-08-17 11:24:34 +02:00