Commit Graph

546 Commits

Author SHA1 Message Date
Roland Geider
80dec162db Improve colors of swipable measurement entries 2021-08-30 19:42:18 +02:00
Roland Geider
0a922ec7a1 Don't show the general options in app bar in measurements
These are sub pages and don't need it
2021-08-30 19:27:39 +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
cc899cdf1c Update weight list when adding or removing entries 2021-08-29 22:17:20 +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
ton-An
0b0da1405b Changed MeasurementEntry's value string to number
Reflects the changes made to the rest api. MeasurementEntry's value is
a number instead of a string when in json format
2021-08-26 15:40:26 +02:00
ton-An
89e0060ff5 (MeasurementProvider) Fixed error handling
MeasurementProvider
(Edited)
- Fixed error handling
- implemented findEntryById and findCategoryById

MeasurementCategory
(Added)
- findEntryById()
2021-08-26 14:41:26 +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
Roland Geider
a2673fe764 Merge branch 'master' into feature/measurements
# Conflicts:
#	pubspec.lock
2021-08-25 16:52:15 +02:00
ton-An
755cdd5fae Pretty much finished the MeasurementProvider
-- MesurementProvider --
(Added)
- editCategory
- editEntry

-- MeasurementEntry --
(Added)
- copyWith

-- MeasurementCategory --
(Added)
- copyWith
2021-08-25 16:24:29 +02:00
ton-An
23a8226e72 Worked on the MeasurementProvider
(Added)
- addCategory()
- deleteCategory()
- addEntry()
- deleteEntry()
2021-08-25 14:43:53 +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
87a1805179 Translated using Weblate (Spanish)
Currently translated at 91.2% (125 of 137 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/es/
2021-08-21 14:35:32 +02:00
Roland Geider
6fe200ce4b Translated using Weblate (German)
Currently translated at 100.0% (137 of 137 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/de/
2021-08-21 14:35:32 +02:00
Jacob
42cd01ec89 Translated using Weblate (Polish)
Currently translated at 10.9% (15 of 137 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/pl/
2021-08-20 09:34:23 +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
e18e1a0aea Don't show the global app bar for the diary entries 2021-08-17 11:57:24 +02:00
Roland Geider
d6db7a1a75 Move chart and table to card 2021-08-17 11:54:51 +02:00
Roland Geider
e8c5b09c5a Actually delete the logs from the server... 2021-08-16 19:07:49 +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
c00a755f0d Reset the plan's logs when loading new ones 2021-08-16 18:05:12 +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
de84c24e72 Don't use the canonical form endpoint
This was removed on the server
2021-08-11 13:28:37 +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
3713c8529a Merge branch 'wger-project:master' into closeKeyboard_Gym 2021-08-10 14:10:47 +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
J. Lavoie
8ef5e8ba77 Translated using Weblate (French)
Currently translated at 97.6% (127 of 130 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/
2021-08-09 07:35:00 +02:00
Antoine Vibien
5f496bca80 Translated using Weblate (French)
Currently translated at 96.9% (126 of 130 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/
2021-08-03 10:32:45 +02:00
Roland Geider
0639c29b3c Don't use the canonical form endpoint
This was removed on the server
2021-07-24 21:55:55 +02:00
Roland Geider
be409333d6 Add measurement provider 2021-07-24 21:27:21 +02:00
Roland Geider
a43480fa8b Commit missing files 2021-07-24 13:14:03 +02:00
Roland Geider
5e64feea30 Fix tests
The measurement entries are not directly loaded from JSON
2021-07-24 13:13:32 +02:00
ton-An
a88298cc7b Changed the measurement entries key 2021-07-24 12:26:01 +02:00