Roland Geider
|
1fd1aed848
|
Add tests for the getExercise method
|
2022-05-11 17:41:11 +02:00 |
|
Roland Geider
|
f56619939e
|
Simplify loading of exercise data
While this has more manual steps than I would prefer, it is definitely better
than loading the individual entries and mapping them to an forth
|
2022-05-11 00:03:05 +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
|
e111839b3f
|
Save aliases to the DB
|
2022-03-05 13:55:43 +01:00 |
|
Roland Geider
|
19a504dcfb
|
Actually create exercise bases and translations
|
2022-02-20 14:40:42 +01:00 |
|
Roland Geider
|
5cebbb7c7f
|
Fix merge conflicts
|
2022-02-19 22:16:32 +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 |
|
Roland Geider
|
c24bc9783e
|
Add video player widget for exercise details
|
2022-01-29 12:43:50 +01:00 |
|
Roland Geider
|
5d28847c69
|
Add video model and recreate generated files
|
2022-01-29 11:48:02 +01:00 |
|
Roland Geider
|
bc2b947b81
|
Recreate generated files
|
2022-01-23 20:52:40 +01:00 |
|
Roland Geider
|
2d5f5162ad
|
Recreate generated files
|
2022-01-15 13:05:35 +01:00 |
|
Roland Geider
|
2119c26ad3
|
Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
# .github/workflows/ci.yml
# lib/models/exercises/comment.g.dart
# lib/models/exercises/exercise.g.dart
# lib/models/exercises/image.g.dart
# lib/models/measurements/measurement_entry.g.dart
# lib/models/nutrition/ingredient_weight_unit.g.dart
# lib/models/nutrition/log.g.dart
# lib/models/workouts/day.g.dart
# lib/models/workouts/session.g.dart
# lib/models/workouts/workout_plan.g.dart
# lib/providers/exercises.dart
# pubspec.lock
# pubspec.yaml
# test/utils.dart
# test/workout/gym_mode_screen_test.dart
|
2022-01-15 12:58:02 +01:00 |
|
Adrian Halko
|
fa4dfe6ee5
|
Regenerated all classes.
|
2021-12-03 16:44:52 +01:00 |
|
Adrian Halko
|
831d74d90d
|
Added code property to Ingredient model. Generate ingredient.g.dart.
|
2021-11-22 19:22:59 +01:00 |
|
Github-actions
|
ab885b1145
|
Automatic linting
|
2021-11-10 14:19:52 +00:00 |
|
Roland Geider
|
d8b7d45291
|
Upgrade dependencies and recreate generated files
|
2021-11-10 15:16:25 +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 |
|
Roland Geider
|
89fa03de83
|
Fix typo in filename
|
2021-10-28 18:03:26 +02:00 |
|
Roland Geider
|
ff0e675860
|
Some refactoring for last used ingredients
It's easier to just use the already existing meal items rather than create
new logs that have the same infos.
|
2021-10-28 18:00:18 +02:00 |
|
Roland Geider
|
a4e381e4c8
|
Make order of sets a required attribute
Closes #109
|
2021-10-28 11:43:32 +02:00 |
|
Roland Geider
|
c593086692
|
Mark meal ID in logs as optional
|
2021-10-24 22:14:00 +02: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 |
|
Sandi Milohanić
|
3ca1960e6a
|
add reference from log to meal
|
2021-10-22 08:32:02 +02:00 |
|
Roland Geider
|
04f4981812
|
Merge conflicts
|
2021-10-16 12:41:33 +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
|
1e8080cc02
|
always_declare_return_types
|
2021-10-07 20:43:55 +02:00 |
|
Marvin M
|
e5a6d930cb
|
Minor changes
|
2021-10-07 19:58:56 +02:00 |
|
Github-actions
|
18622b0c62
|
Automatic linting
|
2021-10-07 06:00:51 +00:00 |
|
unknown
|
81944cbe19
|
Merge branch 'fix/preset-time-session-form-31' of https://github.com/TomerPacific/flutter into fix/preset-time-session-form-31
|
2021-10-06 22:16:56 +03:00 |
|
unknown
|
769043598b
|
fix/preset-time-session-form creating constructor in session to initialize timeStart/end
|
2021-10-06 22:16:44 +03:00 |
|
Tomer Ben-Rachel
|
12da49ed65
|
Merge branch 'master' into fix/preset-time-session-form-31
|
2021-10-06 21:22:07 +03:00 |
|
unknown
|
320e61d2c2
|
fix/preset-time-session-form adding default values to timeStart/end
|
2021-10-06 20:57:21 +03: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 |
|
Marvin M
|
eae34f0b36
|
Fixes pt 2
|
2021-10-01 17:32:31 +02:00 |
|
Marvin M
|
45a2a5f857
|
Fixes pt 1
|
2021-10-01 17:18:17 +02:00 |
|
Thilina Herath
|
d6eb3deda7
|
Allow user to give meals a description #70
Add name field to meal form
|
2021-09-30 21:22:28 +08:00 |
|
Roland Geider
|
9773e4d9fa
|
Load variation IDs from the server
|
2021-09-16 16:09:19 +02:00 |
|
Roland Geider
|
9003bac8d8
|
Commit missing files
|
2021-09-16 15:28:01 +02:00 |
|
Roland Geider
|
f90ddc9366
|
Improve exercise initial loading and reading from cache
|
2021-09-15 20:41:59 +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
|
d01c9196cd
|
Add language models for exercise translations
|
2021-09-13 11:56:17 +02:00 |
|
Roland Geider
|
99bf19fd6f
|
Start refactoring exercise provider and models
|
2021-09-13 09:05:43 +02:00 |
|
Yair Chen
|
fb742371f1
|
Implement ui for exercises list
|
2021-09-11 23:33:43 +03:00 |
|
Github-actions
|
19d079569a
|
Automatic linting
|
2021-09-09 19:18:53 +00:00 |
|
ton-An
|
0b0da1405b
|
Changed MeasurementEntry's value string to number
Reflects the changes made to the rest api. MeasurementEntry's value is
a number instead of a string when in json format
|
2021-08-26 15:40:26 +02:00 |
|