Commit Graph

19 Commits

Author SHA1 Message Date
Dieter Plaetinck
6e1d3f9568 dart format --line-length=100 .
(except auto generated files)
2024-06-20 15:44:35 +03:00
Roland Geider
d5b172fd57 Merge branch 'master' into HEAD
# Conflicts:
#	lib/screens/log_meal_screen.dart
#	lib/widgets/core/core.dart
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/nutrition/nutritional_diary_detail.dart
#	lib/widgets/nutrition/widgets.dart
2024-06-18 17:46:52 +02:00
Dieter Plaetinck
fb7be3c8a3 overhaul macros viewing
* fix macros alignments across different UI elements, by relying on
  a new standardized NutritionTile
* honor true needed widths based on string lengths of the column names
* show total macros for meal
2024-06-10 15:32:57 +03:00
Dieter Plaetinck
8db1a7c960 dcm fix --only-rules=unnecessary-trailing-comma lib 2024-06-07 14:59:00 +03:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Roland Geider
1ea3c2e2eb More polishing 2023-04-24 16:28:38 +02:00
Roland Geider
9630e2b16b Recreate generated files 2023-02-08 12:51:36 +01:00
Roland Geider
7bb9ac28fd Merge branch 'master' into feature/ingredient-images
# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.g.dart
#	lib/widgets/core/core.dart
#	pubspec.lock
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/other/base_provider_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2023-02-08 12:48:00 +01:00
Roland Geider
cb4bce7653 Show ingredient images 2022-08-09 18:51:37 +02:00
Roland Geider
68c3ad3ce7 Add detail view for exercises 2021-11-27 00:13:39 +01:00
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
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
a0d316eef4 Move general settings to option icon
The drawer was removed since it was not providing any real navigation and was
non-standard anyway. Also, some cleanup and slight refactoring.
2021-05-17 21:18:33 +02:00
Roland Geider
431f749674 Start adding user gallery 2021-05-06 14:02:04 +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
ad7507c8b7 Update license header as well 2021-04-13 10:28:15 +02:00
Roland Geider
ecd2773a87 Upgrade packages and move application to null safety 2021-03-25 22:20:16 +01:00
Roland Geider
1cf1cff93a Mute the text for the nutritional values
The user should not see a spreadsheet when he opens the plan
2020-12-24 23:51:21 +01:00