Commit Graph

12 Commits

Author SHA1 Message Date
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
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
e62b03e8a8 Further work on reworking the exercise provider 2021-09-13 20:52:08 +02:00
Roland Geider
6646640b9c Show set notes on the workout and the gym mode
https://github.com/wger-project/wger/issues/702
2021-07-17 13:25:04 +02: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
70e0620fe1 Don't make the +/- buttons part of the input field
This only makes the field focused which makes the keyboard appear, which is
exactly what we want to avoid when using the shortcuts
2021-06-15 16:30:12 +02:00
Roland Geider
8286abd3e2 Rename workout description to name 2021-05-11 14:06:55 +02:00
Roland Geider
f67cb1797b Calculates reps for a set locally
This saves us unneeded round trips to the server

See #14
2021-04-24 13:58:14 +02:00
Roland Geider
5051c28c40 Test that old logs are shown in the gym mode 2021-04-19 16:31:57 +02:00
Roland Geider
7e2ba3468d Show past logs in gym mode
See #13
2021-04-15 13:28:12 +02:00
Roland Geider
d2a7733703 Add simple widget test for gym mode screen 2021-04-14 20:28:49 +02:00