wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-19 07:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
761 Commits 30 Branches 39 Tags
d6eb3deda7bf80aaebe4c85a8ef3efd392155404
Commit Graph

343 Commits

Author SHA1 Message Date
Thilina Herath
d6eb3deda7 Allow user to give meals a description #70 
Add name field to meal form
 2021-09-30 21:22:28 +08: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
53346dc24e Some improvements to the link to the measurement sub page 
I'm still not convinced, though
 2021-09-07 16:48:03 +02:00
Roland Geider
45986a78ad Show units in weight and measurement charts 2021-09-07 15:59:35 +02:00
Roland Geider
a1f5c026c1 Allow adding measurement entries from overview 2021-09-07 15:36:12 +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
3874a49fe0 Add measurement entries in the dashboard calendar 2021-09-06 18:33:54 +02:00
Roland Geider
c704f561db Show entries graph in the category overview 2021-09-06 18:08:07 +02:00
Roland Geider
606a73a114 Load all measurement data upfront 2021-09-06 17:40:26 +02:00
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
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
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
Roland Geider
b2195d4f55 Allow deleting and editing entries 2021-08-29 22:34:30 +02:00
Patrick Witter
245b432aae refac Date TextField code,removed cursor, added calender icon at end, 2021-08-29 14:30:10 -05:00
Roland Geider
c21a895c22 If the user cancels the datepicker, no date is selected 2021-08-29 19:22:01 +02:00
Patrick Witter
0c2e57ef66 Attempt1 2021-08-29 10:15:29 -05: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