470 Commits

Author	SHA1	Message	Date
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
Roland Geider	b8f985b310	Don't plot energy in chart ... The values use the same axis and the energy is of course much higher than the amount in grams	2022-01-23 21:27:43 +01:00
Roland Geider	6d18829619	Merge branch 'master' into adyhnat_master ... # Conflicts: # .gitignore # pubspec.lock	2022-01-23 20:59:37 +01:00
Roland Geider	bc2b947b81	Recreate generated files	2022-01-23 20:52:40 +01:00
Roland Geider	dcfe3b8e4b	Merge branch 'master' into barcode_scanner ... # Conflicts: # 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-01-23 20:33:45 +01:00
Roland Geider	4cdd51d8b9	Add test for repetition and weight unit form widgets	2022-01-23 20:04:18 +01:00
yaseenagwan	03e8ac4b1d	feat: Form Related Changes in Add Exercise Screen	2022-01-22 18:23:31 +05:30
Roland Geider	4c448d22c5	Don't output anything if there is no info for that exercise	2022-01-20 19:35:27 +01:00
Roland Geider	1b2179de0f	Move exercise widgets to helper functions	2022-01-20 19:35:27 +01:00
Roland Geider	865dbeed91	Some further polishing of exercise detail page	2022-01-18 18:22:48 +01:00
Roland Geider	187f16f761	Some cleanup of exercise detail widget	2022-01-18 17:44:13 +01:00
Roland Geider	2b16b178c7	Finish MuscleWidget	2022-01-18 17:37:36 +01:00
Roland Geider	98f925be9c	Merge pull request #124 from agwanyaseen/feature/exercise-crowdsourcing ... feat: completed image section in Add Excercise Screen	2022-01-18 16:56:17 +01:00
Roland Geider	599aa82f89	Start working on muscle widget for exercises	2022-01-17 21:09:19 +01:00
Roland Geider	ff6a2f871a	Make variation view in exercise detail view work	2022-01-17 20:32:17 +01:00
yaseenagwan	09843ba31a	feat: completed image section in Add Excercise Screen	2022-01-16 15:14:15 +05:30
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
yaseenagwan	d7b216d57a	fix: Render Overflow issue in Dashboard screen	2022-01-09 13:30:03 +05:30
Ady	0282498545	Fixed bug with null exception on functions for average and today's logged values	2021-12-15 01:33:28 +01:00
Ady	8cd51fcdce	Added few comments to NutritionalPlanHatchBarChartWidget	2021-12-14 19:20:26 +01:00