Commit Graph

64 Commits

Author SHA1 Message Date
Miroslav Mazel
f31bcc770d Consts and finals where possible 2023-11-05 23:27:22 +01:00
Miroslav Mazel
420b06a661 Organize imports / remove unnecessary ones 2023-11-05 23:22:34 +01: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
Miroslav Mazel
283605eb4b Platform check for videos library 2023-03-21 21:22:07 +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
e6ea4e6053 Remove unused code 2022-10-01 13:50:58 +02:00
Roland Geider
db479cf4a2 Show exercise aliases 2022-09-10 23:48:05 +02:00
Roland Geider
515defe7f3 Fix merge conflicts 2022-09-07 20:12:21 +02:00
Roland Geider
a7cd041295 Add keys to exercise contribution form 2022-08-28 14:42:01 +02:00
Roland Geider
70cdd37f84 Show translated muscle names 2022-07-28 11:57:45 +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
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
bc28fe8624 Start adding variations handling 2022-03-31 00:07:12 +02:00
Roland Geider
af5aa0f7fe Show color of main and secondary muscles 2022-03-12 23:35:30 +01:00
Roland Geider
633e7b76d4 Fix path for trained muscles 2022-03-12 23:19:45 +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
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
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +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
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
65b12e8d9a Set category object, not String 2022-01-29 22:02:47 +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
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
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
Roland Geider
87940b86d4 Increase size of exercise image in overview 2021-11-27 00:17:19 +01:00
Roland Geider
68c3ad3ce7 Add detail view for exercises 2021-11-27 00:13:39 +01:00
Roland Geider
854d159388 Some changes to the exercise list view
Still experimenting and subject to change
2021-11-26 19:47:37 +01: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
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Yair Chen
c5bc74709c Merge branch 'feature/exercise-crowdsourcing' of https://github.com/wger-project/flutter into feature/exercise-crowdsourcing 2021-09-17 16:25:04 +03:00