Commit Graph

51 Commits

Author SHA1 Message Date
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
Yair Chen
0798e3e5ae add_exercise_screen base 2021-09-17 16:24:51 +03:00
Roland Geider
9056806681 Replace CheckboxListTile with SwitchListTile
This is better UI for searches
2021-09-16 10:38:56 +02:00
Yair Chen
b11fcda216 create unit tests fro findByFilters and generate mocks 2021-09-15 16:46:04 +03:00
Yair Chen
dd50e23dcd Merge branch 'feature/exercise-crowdsourcing' of https://github.com/wger-project/flutter into feature/exercise-crowdsourcing 2021-09-14 12:36:51 +03:00
Yair Chen
6b1f65ae26 move filters to provider 2021-09-14 12:30:57 +03:00
Roland Geider
e62b03e8a8 Further work on reworking the exercise provider 2021-09-13 20:52:08 +02:00
Yair Chen
8b7a55f3d3 create advanced filtering 2021-09-12 20:06:23 +03:00
Yair Chen
fb742371f1 Implement ui for exercises list 2021-09-11 23:33:43 +03:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
b739d71074 Make exercise detail content scrollable 2021-05-24 13:40:18 +02:00
Roland Geider
b915c764ef Don't check AppLocalizations for null values
This is not needed in flutter 2.2 anymore
2021-05-19 11:50:43 +02:00
Roland Geider
90c1f3c3b6 Add simple test for exercise detail widget 2021-04-28 10:45:31 +02:00