Commit Graph

199 Commits

Author SHA1 Message Date
Github-actions
ceae6985fc Automatic linting 2022-11-29 16:27:47 +00:00
Roland Geider
a004192ed3 Correctly pass the base ID to render log charts
See https://github.com/wger-project/wger/issues/1180
2022-11-29 17:25:45 +01:00
Github-actions
280b5c0c43 Automatic linting 2022-11-24 10:25:48 +00: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
Github-actions
3c9b083eee Automatic linting 2022-10-11 07:39:56 +00:00
Roland Geider
fc524531fb Recreate generated files 2022-10-10 15:53:04 +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
Github-actions
134cd73e62 Automatic linting 2022-10-04 15:12:12 +00:00
Roland Geider
7bd4089782 Merge pull request #242 from skdotv/bug-fix/232
added code: string? in ingredient.dart
2022-10-04 17:10:01 +02:00
Github-actions
8ee9aaab52 Automatic linting 2022-10-04 15:02:56 +00:00
Vinod
5c767f311e added code: string? in ingredient.dart 2022-10-02 11:40:53 +05:30
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Roland Geider
e045a75703 Load video information from exercise base endpoint 2022-09-16 17:11:36 +02:00
Roland Geider
a7996f99db Commit generated files 2022-09-07 20:12:36 +02:00
Roland Geider
70cdd37f84 Show translated muscle names 2022-07-28 11:57:45 +02:00
Roland Geider
32afa20e7b Recreate generated files 2022-07-01 09:52:13 +02:00
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
2aa9bc20e1 Load English name of muscles as well 2022-06-21 12:40:33 +02:00
Github-actions
0c3ee3badf Automatic linting 2022-05-20 17:10:27 +00:00
Roland Geider
6ee9aaee06 Rework user profile endpoint handling
Now it's not necessary anymore to pass the ID, we can do all actions on the
"list" URL

Fixes #141
2022-05-12 19:13:56 +02:00
Roland Geider
04b8f14925 Commit missing .part file 2022-05-12 18:03:43 +02:00
Roland Geider
7b0f02e88f Add user profile page
Closes #71
2022-05-12 15:28:26 +02:00
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