Commit Graph

715 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
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
c9838ad8f5 Fix the tests 2021-08-28 22:16:29 +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
Roland Geider
b23c417da5 Remove explicit language generation
This is not needed anymore
2021-08-25 16:41:36 +02:00
Roland Geider
35435c9345 Rename Ukrainian language folder
This is needed for Google's playstore
2021-08-25 16:40:26 +02:00
Roland Geider
2af3273718 No need to run gen-l10n anymore 2021-08-25 16:37:56 +02:00
ton-An
7f5a8c1e2f Removed unnecessary tests 2021-08-25 16:28:08 +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
Tymofii Lytvynenko
547b2330d7 Translated using Weblate (Ukrainian)
Currently translated at 100.0% (4 of 4 strings)

Translation: wger Workout Manager/Play Store
Translate-URL: https://hosted.weblate.org/projects/wger/play-store/uk/
2021-08-24 12:33:30 +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
0462e41b20 Expand test for nutrition diary detail view 2021-08-17 11:45:52 +02:00
Roland Geider
c191b3e27e Wrap detail diary widget in a card
This is needed because the icon button needs a parent that is a Material widget
2021-08-17 11:24:34 +02:00
Roland Geider
d8adbb8e7c Nutritional view now needs the body weight provider as well 2021-08-17 11:07:01 +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