Commit Graph

315 Commits

Author SHA1 Message Date
Roland Geider
c8d1d1ad84 Replace getImage with pickImage, was deprecated 2021-09-01 15:46:31 +02:00
Roland Geider
0394922dfc Prevent keyboard from appearing when selecting a date in the gallery 2021-09-01 15:45:56 +02:00
Roland Geider
4f885c88ab Merge pull request #74 from patrickwitter/BugFixAteempt1
Fixes Issue #72
2021-08-30 22:19:24 +02:00
Patrick Witter
3dc32259de Changed max-line to 100 2021-08-30 15:05:14 -05:00
Roland Geider
138c31c248 If the user cancels the datepicker, no date is selected
# Conflicts:
#	lib/widgets/weight/forms.dart
2021-08-29 22:38:07 +02:00
Patrick Witter
245b432aae refac Date TextField code,removed cursor, added calender icon at end, 2021-08-29 14:30:10 -05:00
Patrick Witter
0c2e57ef66 Attempt1 2021-08-29 10:15:29 -05:00
Roland Geider
9e5066593a Merge pull request #69 from prakash-shekhar/master
Fixes #68
2021-08-17 14:33:42 +02:00
Roland Geider
71f3c24005 Add helpter to output nutritional values
This also makes the regular nutritional plan detail view less noisy
2021-08-17 12:06:05 +02:00
Roland Geider
d6db7a1a75 Move chart and table to card 2021-08-17 11:54:51 +02:00
Roland Geider
f2cda9faae Remove (wrong) header, content is clear 2021-08-16 19:02:11 +02:00
Roland Geider
d0a4381d50 Somewhat improve alignment of clickable buttons for detail page 2021-08-16 19:01:55 +02:00
Roland Geider
d35e46514e Allow deleting nutritional diary entries 2021-08-16 18:50:30 +02:00
Roland Geider
b7e1fed3b2 Remove placeholder text 2021-08-16 18:30:04 +02:00
Roland Geider
1222a70e61 Add content to the diary detail page 2021-08-16 18:29:38 +02:00
Roland Geider
7a06789901 Merge branch 'master' into feature/diary-page
# Conflicts:
#	lib/widgets/nutrition/nutritional_plan_detail.dart
2021-08-16 16:45:08 +02:00
Roland Geider
a1660747f8 Simplify widgets 2021-08-16 16:43:39 +02:00
Roland Geider
d01986238f Show percent of energy and g per body-kg for macros 2021-08-16 16:24:12 +02:00
Prakash Shekhar
3193bfd3ca Fixes #68 2021-08-15 11:28:02 -04:00
Roland Geider
94f2ee1a65 Merge branch 'master' into feature/diary-page 2021-08-11 19:48:29 +02:00
Roland Geider
51422b3053 Use correct label when there are no nutritional plans 2021-08-11 13:28:37 +02: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
Roland Geider
78c53987e8 Fix casting error in nutrition chart 2021-07-08 18:12:45 +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
e57220938b Start working on nutritional diary detail page 2021-06-16 18:42:06 +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