Commit Graph

489 Commits

Author SHA1 Message Date
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
4098b83a74 Fix typo 2022-05-20 19:36:19 +02:00
Roland Geider
ca2fd8e9ef Add a consumer to the body weight card
Closes #144
2022-05-20 19:08:13 +02:00
Roland Geider
8e233fbed1 Make the form a stateless widget
Also, add the correct validator for emails
2022-05-12 19:42:26 +02:00
Roland Geider
f8aa3e7384 Cleanup 2022-05-12 19:19:02 +02:00
Roland Geider
f6a2dcbf33 Show a snackbar when saving the profile 2022-05-12 19:17:38 +02: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
7b0f02e88f Add user profile page
Closes #71
2022-05-12 15:28:26 +02:00
Roland Geider
34e0854c68 Set the baseID when loading exercises 2022-05-11 16:58:55 +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
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
48ec2edbb3 Cleanup app bars
The dashboard has the main app bar that allows to change the settings, while
each screen has its own with custom actions
2022-04-15 13:03:35 +02:00
Roland Geider
2b60e84b25 Remove icon from menu entry, not needed 2022-04-13 16:39:00 +02:00
Roland Geider
bf710bc5d5 Translate categories and equipment in other parts of the application 2022-04-13 12:08:46 +02:00
Roland Geider
6622fad56b Add dynamic translations of strings that arrive from the server
Closes #120
2022-04-12 17:45:28 +02:00
Roland Geider
826810f17a Start working on automatic screenshot generation 2022-04-11 20:00:32 +02:00
Roland Geider
a6338ab6d6 Some more polishing 2022-03-31 13:52:43 +02:00
Roland Geider
75c18d283d Split up the widgets used, this was getting too cluttered 2022-03-31 00:20:13 +02:00
Roland Geider
bc28fe8624 Start adding variations handling 2022-03-31 00:07:12 +02:00
Roland Geider
c5a9f554c8 Allow uploading images taken directly with the camera 2022-03-29 23:08:35 +02:00
Roland Geider
c819e51fc8 Swap method names 2022-03-29 22:00:50 +02:00
Roland Geider
af5aa0f7fe Show color of main and secondary muscles 2022-03-12 23:35:30 +01:00
Roland Geider
4241750708 Always set the values of the selected muscles and categories
Otherwise it's not possible to remove all selections after having clicked on one
2022-03-12 23:25:23 +01:00
Roland Geider
633e7b76d4 Fix path for trained muscles 2022-03-12 23:19:45 +01:00
Roland Geider
48ea85794a Finally fix some errors with the multi select widget
Now it's possible to add and remove elements
2022-03-12 22:13:36 +01:00
Roland Geider
545f96b1c4 Some cleanup 2022-02-20 19:19:40 +01:00
Roland Geider
b011ddcd25 POST images when creating new exercises 2022-02-20 15:54:32 +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
a1b0fce54f Merge pull request #129 from wger-project/feature/exercise-videos
exercise videos
2022-02-19 21:04:58 +01:00
Roland Geider
aa4d3c59d8 Fix tests 2022-02-18 20:29:34 +01:00
Roland Geider
32bf5b3723 Correctly initialise the video controller 2022-02-03 20:02:10 +01:00
Roland Geider
f0195ab235 Update gallery after adding or deleting a picture
Fixes #128
2022-02-03 11:48:49 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Roland Geider
8e800b5097 Update gallery after adding or deleting a picture
Fixes #128
2022-02-02 17:07:20 +01:00
Roland Geider
1bd33a71f5 Add const keyword 2022-02-01 19:36:42 +01:00
Roland Geider
4093e0fe07 Set all other exercise information 2022-01-31 22:06:59 +01:00
Roland Geider
c7789dab6f Fix some typos 2022-01-31 21:28:06 +01:00
Roland Geider
fcff383657 Show diagram of selected muscles
This is still a WIP, the widget should update after each select
2022-01-31 21:27:50 +01:00
Roland Geider
4e1913a58c Don't make the selection list scrollable, show all selected items 2022-01-30 19:43:32 +01:00
Roland Geider
afccfb4809 Set muscles and equipment objects when selecting from dropdown 2022-01-30 19:33:17 +01:00
Roland Geider
5d7df00cb2 Fix typo 2022-01-30 14:56:22 +01:00
Roland Geider
65b12e8d9a Set category object, not String 2022-01-29 22:02:47 +01:00
Roland Geider
c3e27751e2 Merge pull request #125 from agwanyaseen/feature/exercise-crowdsourcing
feat: Form Related Changes in Add Exercise Screen
2022-01-29 21:07:33 +01:00
Roland Geider
dd94f31e92 Add a controls overlay on the exercise video widget
This is much cleaner and also more intuitive
2022-01-29 14:38:57 +01:00
Roland Geider
c24bc9783e Add video player widget for exercise details 2022-01-29 12:43:50 +01:00
Roland Geider
896315a1d7 Some improvements to presentation of muscle names 2022-01-29 11:24:51 +01:00
Roland Geider
2ed6d4d11d Backport new exercise detail page from exercise-crowdsourcing branch 2022-01-29 11:20:09 +01:00