wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 23:42:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
767 Commits 30 Branches 39 Tags
dd50e23dcd765a74ee769137e1be48544be2e09f
Commit Graph

189 Commits

Author SHA1 Message Date
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
Github-actions
bc21e44a30 Automatic linting 2021-07-01 15:10:27 +00: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
Arun Muralidharan
22993a0151 Reorder List 
Change in order now reflects in DB as well.
 2021-06-28 14:59:43 +02:00
Arun Muralidharan
db04964f20 Reorder Sets 
Progress PR for Issue #41. Currently you can edit the order (long press to reorder) in the workout plan screen. The order change is only local; it persists only for the current session. However, I have not figured out how to reflect the changed order in the DB using the API. Does Day even store the order of its Sets in the DB? Or is it dynamically populated into the model in the app?
 2021-06-27 23:36:53 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
857d0453cc Automatic linting 2021-06-22 20:29:22 +00:00
Arun Muralidharan
50043269b9 Test 
Added tests for TimeOfDay comparsion extensions.
 2021-06-22 22:02:40 +02:00
Arun Muralidharan
a053c813bc Start Time Validator 
Implemented start time validator to ensure start time is not ahead of end time in gym mode.
 2021-06-22 20:19:16 +02:00
Github-actions
a352cb5e67 Automatic linting 2021-06-20 13:14:26 +00:00
Roland Geider
3544cdb7c7 Merge pull request #45 from arun-muralidharan/weight-fix-38 
Plate Weight - Fix for #38
 2021-06-20 15:13:06 +02:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Arun Muralidharan
e4c16c52c4 Weight Fix 
Fixed +/- button in gym mode to add twice the minimum plate weight, since we add one to each side.
 2021-06-20 14:57:44 +02:00
Roland Geider
e2fa49ab5e Remove sized box,the space is not necessary 2021-06-16 08:32:37 +02:00
Roland Geider
180e419e7e Group the plates for easier reading 2021-06-15 23:11:34 +02:00
Roland Geider
1a2845b448 Space the plates more evenly 2021-06-15 22:31:04 +02:00
Roland Geider
52653cc93e Inform the user that the current user can't be reached 2021-06-15 17:34:04 +02: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
d2d70bdba5 Localize text 2021-06-13 23:40:52 +02:00
Roland Geider
19cf8e3854 Prettify a bit the results of the plate calculator 
Still needs some polishing
 2021-06-13 21:10:51 +02:00
Roland Geider
48ee80fffe Only show plate calculator for barbell exercises 
This might be a bit too constrained, since other exercises (e.g.) in the rack
or the leg press would also benefit from this. Perhaps adding a user switch?
 2021-06-13 21:09:37 +02:00
Roland Geider
b88c3290c1 Start implementing a plate calculator 2021-06-13 20:22:15 +02:00
Roland Geider
0af6fc2579 Merge branch 'master' of https://github.com/Jannik-dev/flutter into feature/plate-calculator 2021-06-13 19:12:38 +02:00
Roland Geider
9d6f21cc7b Re-add content for gym mode 2021-06-12 18:01:07 +02:00
Roland Geider
959fdf26d0 Initialise session with defaul value (neutral) 
Fixes #36
 2021-06-12 17:28:16 +02:00
Roland Geider
7e416383b5 Use string as a key for dates in the calendar 
Fixes #33
 2021-06-12 17:19:00 +02:00
Roland Geider
ab10b987b1 Only show action icons when there is data to work with 2021-05-24 14:27:24 +02:00
Roland Geider
d5d6c7a1ba Make actions more discoverable for plans 
Plans now show regular icons when expanding the panel. While it is not obvious
at all that the header of a workout day or nutritional plan is swipeable, it
provides a quick way to perform commonly used actions, so it will stay for the
users that have found it
 2021-05-24 14:13:36 +02:00
Roland Geider
d0ec542801 Add methods to allow editing a workout day 2021-05-24 11:58:54 +02:00
Roland Geider
45a404586e Move workout detail switcher to toggle buttons 
This makes it more obvious that the page is part of the current workout
 2021-05-21 12:39:29 +02:00
Roland Geider
0b29ac1405 Simplify workout widgets by moving the SliverList to the screen 2021-05-21 11:54:41 +02:00