Commit Graph

66 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
cf351c3690 dcm fix --only-rules=prefer-declaring-const-constructor lib 2024-06-07 14:59:00 +03:00
Dieter Plaetinck
8db1a7c960 dcm fix --only-rules=unnecessary-trailing-comma lib 2024-06-07 14:59:00 +03:00
Dieter Plaetinck
7f74bff32c dcm fix --only-rules=prefer-trailing-comma lib 2024-06-07 14:59:00 +03:00
Roland Geider
8224d52fa5 Remove copy pasted code 2024-01-11 22:17:34 +01:00
Roland Geider
ecbed70810 Use a better icon 2024-01-11 22:16:54 +01:00
Roland Geider
e67d992385 Add (for now) simple settings page to reset the exercise cache
This should be expanded later to allow to re-fetch all available exercises, etc.
2024-01-11 22:13:11 +01:00
Roland Geider
a87c0e7063 Add link to buymeacoffee for donations 2024-01-11 11:16:49 +01:00
Roland Geider
f4185efa37 Add AboutEntry widget 2024-01-11 11:02:33 +01:00
Roland Geider
9802a52be7 Update year in about us dialog 2023-11-20 21:25:25 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Roland Geider
afba3a8cc9 Add link to mastodon in the about us widgets 2023-11-19 13:46:02 +01:00
Roland Geider
95f863a0b6 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +01:00
Roland Geider
7659d06ea6 Merge branch 'master' into 12people_maintenance
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/core/charts.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/workouts/charts.dart
#	pubspec.lock
#	pubspec.yaml
#	test_driver/screenshot_driver.dart
2023-11-09 20:24:01 +01:00
Roland Geider
81ed85c2f2 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/nutritional_plan_detail.dart
2023-11-09 19:16:17 +01:00
Roland Geider
b2e7f65d29 Remove debug code and unused files 2023-11-08 20:05:25 +01:00
Miroslav Mazel
f31bcc770d Consts and finals where possible 2023-11-05 23:27:22 +01:00
Miroslav Mazel
c655c3e86e Stricter mixin rules: with -> implements 2023-11-05 23:16:53 +01:00
Miroslav Mazel
c81c467d7a Dependency bump + replacing deprecated lib 2023-11-05 23:11:46 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
268d1d945f Render units in the measurements charts
Note that the reserved size is probably too small if the unit or the values
are longer
2023-10-09 19:22:19 +02:00
Roland Geider
af9b733060 Cleanup 2023-10-09 19:16:03 +02:00
Roland Geider
d1af7acb32 Correctly format the date according to the current locale 2023-10-09 19:08:56 +02:00
Roland Geider
ef5a7081a0 Make MeasurementChartWidgetFl work
This still doesn't look completely nice, but it's a good start
2023-10-01 14:27:02 +02:00
artchiee
cf35cea913 Unfinished work on Charts replacement 2023-08-22 12:12:41 +01:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
1ea3c2e2eb More polishing 2023-04-24 16:28:38 +02:00
Freddy Cunningham
043fa29d6f Text prompt strings marked as translatable 2023-04-18 12:51:23 +01:00
Freddy Cunningham
5e17cdee1a Create text prompt for empty screens [issue 306] 2023-04-17 10:49:04 +01: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
57e7464d2d Some polishing 2023-02-06 22:31:35 +01:00
amannegi
e258b8f6c5 Added Localized Texts #265 2022-10-26 14:09:19 +05:30
amannegi
0fe738fac5 Change AboutDialog to separate page #265 2022-10-26 11:08:09 +05:30
Roland Geider
cb4bce7653 Show ingredient images 2022-08-09 18:51:37 +02:00
Roland Geider
8e233fbed1 Make the form a stateless widget
Also, add the correct validator for emails
2022-05-12 19:42:26 +02:00
Roland Geider
7b0f02e88f Add user profile page
Closes #71
2022-05-12 15:28:26 +02:00
Roland Geider
48ec2edbb3 Cleanup app bars
The dashboard has the main app bar that allows to change the settings, while
each screen has its own with custom actions
2022-04-15 13:03:35 +02:00
Roland Geider
68c3ad3ce7 Add detail view for exercises 2021-11-27 00:13:39 +01:00
Marvin M
505edda762 Merge branch 'master' into better-linting-rules-1 2021-10-11 08:57:03 +02:00
Roland Geider
adb5b6317e If no wger API key is present launch a browser so they can register manually 2021-10-10 19:15:43 +02: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
Github-actions
1a84fec097 Automatic linting 2021-10-02 10:58:18 +00:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
45986a78ad Show units in weight and measurement charts 2021-09-07 15:59:35 +02:00
Roland Geider
93b159b3b9 Show chart with measurement entries values in detail view 2021-08-28 22:07:54 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00