Commit Graph

326 Commits

Author SHA1 Message Date
Roland Geider
60f7c3ed1b Add length validator to the notes
This is also checked server side anyway so we better inform the user before
submitting the form
2021-08-30 20:28:47 +02:00
Roland Geider
00caf09d0d Show measurement category name in the top navigation bar
This makes it easier to keep the orientation in the app
2021-08-30 20:27:57 +02:00
Roland Geider
a4dbbcf28d Use same color scheme for weight entry dismissible 2021-08-30 19:56:44 +02:00
Roland Geider
8ed9bdb6e0 Add shortcut to weight overview from dashboard
This makes the behaviour more consistent and is more useful
2021-08-30 19:55:09 +02:00
Roland Geider
0fed28cd35 Hide the cursor in date selection, date is selected via the dialog 2021-08-30 19:49:15 +02:00
Roland Geider
296122900b Add help text to measurement category form 2021-08-30 19:47:09 +02:00
Roland Geider
80dec162db Improve colors of swipable measurement entries 2021-08-30 19:42:18 +02:00
Roland Geider
7b8fba9856 Allow users to delete measurement categories 2021-08-30 19:20:23 +02:00
Roland Geider
b2195d4f55 Allow deleting and editing entries 2021-08-29 22:34:30 +02:00
Roland Geider
c21a895c22 If the user cancels the datepicker, no date is selected 2021-08-29 19:22:01 +02:00
Roland Geider
93b159b3b9 Show chart with measurement entries values in detail view 2021-08-28 22:07:54 +02:00
Roland Geider
dc22f236ef Allow adding measurement categories and entries 2021-08-28 21:52:06 +02:00
Roland Geider
4e9ca1db6b Fixes to use measurement provider with base provider as argument 2021-08-25 21:48:16 +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
Roland Geider
db976d0486 Add measurement category and entry overviews
This is still a work in progress, besides the UX it's not possible yet to
edit or add entries
2021-08-25 21:33:30 +02:00
Roland Geider
5b5feca8b8 Refactor weight chart to be used with the measurement entries 2021-08-25 17:19:47 +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
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
0249c3752e Use correct label when there are no nutritional plans 2021-07-24 01:03:14 +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
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