Commit Graph

219 Commits

Author SHA1 Message Date
Roland Geider
4cdd51d8b9 Add test for repetition and weight unit form widgets 2022-01-23 20:04:18 +01:00
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
Roland Geider
03f7e1e371 Remove linting errors 2021-11-08 09:42:32 +01:00
Roland Geider
025c9393cd Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.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.mocks.dart
2021-11-03 20:28:06 +01:00
Marko Milosevic
9997252e1e Removing final keyword for the RiR slider properties 2021-10-30 18:24:10 +02:00
Marko Milosevic
eb585b281e Fix for RiR slider 2021-10-29 12:58:20 +02:00
Marko Milosevic
8e4e6785f9 Fix for chart legend BUG 2021-10-28 19:16:56 +02:00
Roland Geider
a4e381e4c8 Make order of sets a required attribute
Closes #109
2021-10-28 11:43:32 +02: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
Roland Geider
ca4e902e07 Merge branch 'master' into better-linting-rules-1 2021-10-12 15:11:43 +02:00
Marko Milosevic
b31a480b45 Added helper for delete dilaog (currently only for log delete) 2021-10-10 16:26:51 +02:00
Marvin M
32a306f75a prefer_typing_uninitialized_variables 2021-10-08 15:26:06 +02:00
Marvin M
2bc2d472d0 unnecessary_await_in_return 2021-10-08 15:11:45 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marko Milosevic
48063634cc Fixed 100 characters limit in code 2021-10-07 19:58:57 +02:00
Marvin M
923b44ba97 Marked as '@immutable'
This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: WorkoutForm._plan
2021-10-07 19:58:40 +02:00
Marko Milosevic
88f1f200b1 Added the option to delete workout log entries 2021-10-07 19:37:16 +02:00
Marvin M
c2e881c139 Minor changes 2021-10-07 18:50:33 +02:00
Github-actions
18622b0c62 Automatic linting 2021-10-07 06:00:51 +00:00
Roland Geider
a1791b3af3 Merge pull request #93 from TomerPacific/fix/preset-time-session-form-31
Correct Preset Time In Session Form
2021-10-07 07:59:16 +02:00
unknown
81944cbe19 Merge branch 'fix/preset-time-session-form-31' of https://github.com/TomerPacific/flutter into fix/preset-time-session-form-31 2021-10-06 22:16:56 +03:00
unknown
769043598b fix/preset-time-session-form creating constructor in session to initialize timeStart/end 2021-10-06 22:16:44 +03:00
Github-actions
9b6e7e9ccf Automatic linting 2021-10-06 19:05:37 +00:00
Tomer Ben-Rachel
12da49ed65 Merge branch 'master' into fix/preset-time-session-form-31 2021-10-06 21:22:07 +03:00
unknown
e523c287ad fix/preset-time-session-form making sure to use timeStart/end as values for initialTime of TimePicker and setting them as well 2021-10-06 20:58:10 +03:00
Thilina Herath
27cbbed38f Update gym_mode.dart 2021-10-06 18:37:49 +08:00
Thilina Herath
96ac3b2ec6 Bad internet duplicate exercise entries #54 2021-10-06 18:23:01 +08:00
Thilina Herath
d01c60b6ab Missing double workout entries #58 2021-10-05 21:24:16 +08:00
Marvin M
eae34f0b36 Fixes pt 2 2021-10-01 17:32:31 +02:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02: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
a35a514586 refactor typeahead form 2021-09-14 12:31:14 +03:00
Roland Geider
e62b03e8a8 Further work on reworking the exercise provider 2021-09-13 20:52:08 +02:00
Roland Geider
99bf19fd6f Start refactoring exercise provider and models 2021-09-13 09:05:43 +02:00
Roland Geider
8543652581 Merge branch 'master' into feature/measurements
# Conflicts:
#	lib/screens/dashboard.dart
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart
2021-09-07 17:03:15 +02:00
Roland Geider
099a2dad75 Merge branch 'master' into bug-53/Double-displayed-training-plans 2021-09-06 21:38:21 +02:00
Roland Geider
6cbe164ec8 Merge remote-tracking branch 'origin/feature/measurements' into feature/measurements
# Conflicts:
#	lib/models/measurements/measurement_entry.g.dart
2021-08-25 21:34:22 +02:00
ton-An
19445c36a2 (Measurements) Added Equatable + Refactored
(MeasurementProvider)
- Passing in the WgerBaseProvider instead of extending with it
- Re-written tests
- Added the fixture reader to make test file less crowded

(Measurement Models)
- Added Equatable
- Re-written tests
2021-08-22 18:07:47 +02:00
Prakash Shekhar
3193bfd3ca Fixes #68 2021-08-15 11:28:02 -04:00
Khushbu Bora
16b2b7c10d Update gym_mode.dart 2021-08-11 15:42:19 +05:30
Khushbu Bora
dc701358d1 Update gym_mode.dart 2021-08-11 13:59:59 +05:30
Khushbu Bora
d323f9eda4 Update gym_mode.dart
Added focusNode property to close the keyboard when user press on save button
2021-08-10 13:54:53 +05:30
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
Roland Geider
d1a4088708 Merge branch 'M123-dev/issue-48'
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2021-07-13 17:17:42 +02:00
Roland Geider
568a165180 Make more obvious that exercises are added together into a superset
Closes #56
2021-07-13 17:13:19 +02:00
Roland Geider
c0fb0ed362 Fix return value for Dialog 2021-07-08 18:13:00 +02:00
Marvin M
cc7ce86702 Update forms.dart 2021-07-08 15:55:02 +02:00
Marvin M
3671b62d79 Update forms.dart 2021-07-08 11:50:28 +02:00
Marvin M
96527ad25e Changed workout name + workout day name restriction
https://github.com/wger-project/flutter/issues/48
And it autoformatted
2021-07-08 11:41:43 +02:00
Roland Geider
8999b9bc27 Add drag handles to reorderable sets
This makes it more obvious that the order can be changed
2021-07-08 08:17:55 +02:00