Commit Graph

88 Commits

Author SHA1 Message Date
Roland Geider
faf1018f2a Fixes for flutter typeahead 5.1.0
Also, add some models for the API response from the search
2024-01-29 12:07:26 +01:00
Roland Geider
d51b6d7d87 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/main.dart
#	lib/providers/exercises.dart
#	lib/widgets/workouts/day.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-09 15:37:48 +01:00
Milksheyke
7fe9b645fd Remove unnecessary comment 2024-01-06 00:59:54 -05:00
Milksheyke
d0bc72fdef Add "Contribute an exercise" to "No matching exercise" suggestion
Created noItemsFoundBuilder callback for typeAheadFormField in exercise search form.
2024-01-06 00:41:57 -05:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +01:00
Roland Geider
65ba2275ae Run "dart format --line-length=100 ." to make the diff smaller 2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac fix(drift): built a model for exercise and fixes in fromSql type converter 2023-12-23 14:28:38 +05:30
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Abhishek Saini
82a49f6cac Merge branch 'master' into feat/data-persistence 2023-11-18 23:23:30 +05:30
Roland Geider
c514842b59 Lint the code with a line length of 100
This makes it easier to understand the diffs
2023-11-16 21:36:21 +01:00
Abhishek Saini
582bc611a4 feat(drift-database): Shifted from shared prefs to drift for Exercises 2023-11-16 22:34:40 +05:30
Roland Geider
95f863a0b6 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +01:00
Miroslav Mazel
5f7bc96f8b Don't use BuildContext across async gaps 2023-11-05 23:34:37 +01:00
Roland Geider
8de51abb9a Remove more hard coded colors and use the theme data 2023-04-22 14:30:31 +02:00
Roland Geider
80ec0e80fb Start moving to material 3
Also dark mode at last
2023-04-22 13:38:13 +02:00
Roland Geider
1d896c6c4a Allow searching for exercise names in English as well
See wger-project/wger/issues/1238
2023-03-16 11:15:39 +01: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
4cdd51d8b9 Add test for repetition and weight unit form widgets 2022-01-23 20:04:18 +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
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
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
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
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
099a2dad75 Merge branch 'master' into bug-53/Double-displayed-training-plans 2021-09-06 21:38:21 +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
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
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
Arun Muralidharan
7eb26da243 Reorder Sets
Now updates order upon deletion as well. Order will be set to length of sets upon adding a new one.
2021-06-28 21:56:25 +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
d0ec542801 Add methods to allow editing a workout day 2021-05-24 11:58:54 +02:00
Roland Geider
e45115d26e Make RiR form element a slider
This allows the user to select the correct value faster
2021-05-19 21:35:07 +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
0b13e8260e Give the add set form a cleanup 2021-05-18 15:00:40 +02:00
Roland Geider
00f00e3e4d Show correct unit dropdowns 2021-05-18 12:11:48 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
6ab3e26db4 Rename workout description to name 2021-05-06 13:18:32 +02:00
Roland Geider
0673cbf3ce Correctly handle navigation when adding or editing plans 2021-04-28 11:24:23 +02:00
Roland Geider
414f2eb234 Show exercise details from workout page 2021-04-28 10:26:47 +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