Commit Graph

73 Commits

Author SHA1 Message Date
Roland Geider
d071d143df Update flutter to 3.29
The translations are not stored in a synthetic package anymore, but the
files are just copied to a specific folder so it can be more easily imported

Also, flutter_barcode_scanner was replaced by simple_barcode_scanner since
the first hasn't been updated in 3 years and was already causing problems
for some time
2025-03-18 17:28:19 +01:00
Roland Geider
f6bae10b9b Merge branch 'master' into feature/flexible-routines
# Conflicts:
#	android/app/build.gradle
#	lib/l10n/app_ta.arb
#	lib/widgets/measurements/charts.dart
#	macos/Podfile.lock
#	pubspec.lock
#	pubspec.yaml
2025-01-05 01:47:54 +01:00
Roland Geider
0d43333aa4 Update widgets when the provider changes 2024-12-12 20:52:05 +01:00
Roland Geider
a35336f57c Allow editing the fit in week toggle as well as start and end dates 2024-11-12 13:31:56 +01:00
Roland Geider
773b8df4e6 Localize chart titles 2024-10-07 11:56:39 +02:00
Dieter Plaetinck
bf9e614f8b make it work for measurements + couple fixes 2024-09-18 13:33:57 +03:00
Dieter Plaetinck
161444b32f weight visualisation improvements
* show weight entries during this nutrition plan and last 30 days
* show moving average of last 7 days
* show aggregate changes below chart
* fix unit displays in a few cases
* improv color scheme and other layout tweaks
* various small code cleanups
2024-09-11 16:03:43 +03:00
dan
ffeaad6f0c Use current DateTime when copying WeightEntry instead of previous.
Increment weight by 0.1 and round to one decimal place to prevent floating point accuracy (rounding) issues.
2024-09-05 01:16:31 +01:00
Dieter Plaetinck
6e1d3f9568 dart format --line-length=100 .
(except auto generated files)
2024-06-20 15:44:35 +03:00
Dieter Plaetinck
cf351c3690 dcm fix --only-rules=prefer-declaring-const-constructor 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
9c7b65bc49 Allow users to quickly increment the body weight 2024-02-17 18:48:48 +01:00
Roland Geider
003038e67d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	test/weight/weight_screen_test.dart
2024-01-23 16:42:25 +01:00
Roland Geider
d4e4f3384a Use the user's preferred unit for body weight 2024-01-23 16:33:32 +01:00
Roland Geider
3f46277c75 Fix test
Since we're mocking the provider no entries are actually being deleted anywhere
2024-01-23 14:58:53 +01:00
Miroslav Mazel
95ea711e97 Weight entries - buggy test 2023-11-25 00:57:27 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Miroslav Mazel
d445283cf7 Different fonts + tweaked icons 2023-11-11 12:33:19 +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
5845e70a6b Simplify some of the widgets since these values are set in the theme now 2023-11-10 19:08:42 +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
Miroslav Mazel
5f7bc96f8b Don't use BuildContext across async gaps 2023-11-05 23:34:37 +01:00
Miroslav Mazel
420b06a661 Organize imports / remove unnecessary ones 2023-11-05 23:22:34 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
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
Roland Geider
aa62c27cdb Add refresh indicators to the entry lists
This allows the user to manually trigger an update if desired

See wger-project/wger/issues/1253
2023-02-09 18:08:31 +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
8543652581 Merge branch 'master' into feature/measurements
# Conflicts:
#	lib/screens/dashboard.dart
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart
2021-09-07 17:03:15 +02:00
Roland Geider
53346dc24e Some improvements to the link to the measurement sub page
I'm still not convinced, though
2021-09-07 16:48:03 +02:00
Roland Geider
4f885c88ab Merge pull request #74 from patrickwitter/BugFixAteempt1
Fixes Issue #72
2021-08-30 22:19:24 +02:00
Patrick Witter
3dc32259de Changed max-line to 100 2021-08-30 15:05:14 -05:00
Roland Geider
a4dbbcf28d Use same color scheme for weight entry dismissible 2021-08-30 19:56:44 +02:00
Roland Geider
138c31c248 If the user cancels the datepicker, no date is selected
# Conflicts:
#	lib/widgets/weight/forms.dart
2021-08-29 22:38:07 +02:00
Patrick Witter
245b432aae refac Date TextField code,removed cursor, added calender icon at end, 2021-08-29 14:30:10 -05:00
Roland Geider
c21a895c22 If the user cancels the datepicker, no date is selected 2021-08-29 19:22:01 +02:00
Patrick Witter
0c2e57ef66 Attempt1 2021-08-29 10:15:29 -05:00
Roland Geider
93b159b3b9 Show chart with measurement entries values in detail view 2021-08-28 22:07:54 +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
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
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
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
437dd45dea Remove onTap
The entry wasn't interactive anyway and the inkwell effect could confuse
the users
2021-05-17 16:04:39 +02:00
Roland Geider
ee2e6ac671 Give providers a consistent name 2021-05-11 12:10:53 +02:00
Roland Geider
ad7507c8b7 Update license header as well 2021-04-13 10:28:15 +02:00
Roland Geider
e60236042b Remove more hard coded strings 2021-04-10 13:22:15 +02:00