Commit Graph

110 Commits

Author SHA1 Message Date
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marvin M
923b44ba97 Marked as '@immutable'
This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: WorkoutForm._plan
2021-10-07 19:58:40 +02:00
Github-actions
9a9f0b2965 Automatic linting 2021-10-03 19:56:09 +00:00
Roland Geider
dae1e39ea7 Merge pull request #89 from ThilinaTCH/master
Allow user to give meals a description #70
2021-10-03 21:54:27 +02:00
Thilina Herath
5ad01e4cac test: resolve conflicts 2021-10-03 11:24:48 +08:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
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
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
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
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
Roland Geider
94f2ee1a65 Merge branch 'master' into feature/diary-page 2021-08-11 19:48:29 +02:00
Roland Geider
78c53987e8 Fix casting error in nutrition chart 2021-07-08 18:12:45 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
e57220938b Start working on nutritional diary detail page 2021-06-16 18:42:06 +02:00
Roland Geider
ab10b987b1 Only show action icons when there is data to work with 2021-05-24 14:27:24 +02:00
Roland Geider
d5d6c7a1ba Make actions more discoverable for plans
Plans now show regular icons when expanding the panel. While it is not obvious
at all that the header of a workout day or nutritional plan is swipeable, it
provides a quick way to perform commonly used actions, so it will stay for the
users that have found it
2021-05-24 14:13:36 +02:00
Roland Geider
b915c764ef Don't check AppLocalizations for null values
This is not needed in flutter 2.2 anymore
2021-05-19 11:50:43 +02:00
Roland Geider
0b13e8260e Give the add set form a cleanup 2021-05-18 15:00:40 +02:00
Roland Geider
6c4a09bf97 Refactor dashboard.dart
This design should be cleaner and more compact
2021-05-17 18:07:29 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
f0fa8a5173 Nutritional plan time is nullable 2021-05-01 15:33:28 +02:00
Roland Geider
cceefdf397 Use material translations for common words 2021-04-30 18:51:38 +02:00
Roland Geider
2c0e1ef05b Change icons used for expanding panels in workout and nutritional plans 2021-04-30 12:19:11 +02:00
Roland Geider
f82cd65acf Improve detail view of meals
The header and values are now better centered, making this a bit more visually
pleasing
2021-04-28 12:24:02 +02:00
Roland Geider
4c7452e634 Fix bug preventing addind and editing meal items 2021-04-28 11:47:30 +02:00
Roland Geider
0673cbf3ce Correctly handle navigation when adding or editing plans 2021-04-28 11:24:23 +02:00
Roland Geider
5c7b580070 Plot the planned calories on the nutritional diary chart 2021-04-25 17:38:26 +02:00
Roland Geider
fc4e9c45df Add drag indicator to dismissibles 2021-04-25 15:28:06 +02:00
Roland Geider
6cf54b231e Add tests for MealForm 2021-04-23 13:48:02 +02:00
Roland Geider
2424199e09 Add tests for PlanForm 2021-04-23 12:47:12 +02:00
Roland Geider
6370df7b97 Move the action buttons in the dashboard to the side 2021-04-21 12:55:20 +02:00
Roland Geider
254cc4bdfe Simplify nutrition diary by using a listview 2021-04-13 17:12:30 +02:00
Roland Geider
c663a65b1e add missing import 2021-04-13 10:47:12 +02:00
Roland Geider
ad7507c8b7 Update license header as well 2021-04-13 10:28:15 +02:00
Roland Geider
e3dc898a6e Return created workout and nutrition plan 2021-04-10 13:22:16 +02:00
Roland Geider
e60236042b Remove more hard coded strings 2021-04-10 13:22:15 +02:00
Roland Geider
1d1d62d950 Search ingredients and exercises in the current locale 2021-04-08 12:46:36 +02:00
Roland Geider
e9446e8cae Redirect to the correct screen after editing a nutritional plan 2021-04-08 12:39:06 +02:00
Roland Geider
19d8862fb6 Localize the nutrition diary dates 2021-04-08 12:21:17 +02:00
Roland Geider
0a2222de21 Add a new line after the macroutrient name
This makes the pie chart more readable, before the grams were often cropped
2021-04-08 12:19:37 +02:00