Commit Graph

272 Commits

Author SHA1 Message Date
Bassam A
6012075658 test: add unit test for all json.dart file functions 2024-01-30 18:41:00 +03:00
Roland Geider
faf1018f2a Fixes for flutter typeahead 5.1.0
Also, add some models for the API response from the search
2024-01-29 12:07:26 +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
b0cae79650 Merge branch 'ux_fixes_problem' 2024-01-23 16:40:36 +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
Costas Korai
135ddb4a78 Update to use clock.now where needed
- The initial time set in the MealForm is defined in
the meal model object provided to the MealForm so both
the test and the meal object had to use clock.now in
order for the fixed value to apply to both.
2024-01-24 00:47:43 +11:00
Roland Geider
28826bd874 Merge branch 'master' into ux_fixes_problem
# Conflicts:
#	flatpak/scripts/flatpak_shared.dart
#	flatpak/scripts/manifest_generator.dart
2024-01-23 14:38:46 +01:00
Roland Geider
2dc08a133e Merge pull request #459 from 12people/ux_fixes
Removing Dismissible for better discoverability
2024-01-23 14:31:16 +01:00
Roland Geider
3008dcc6ce Merge branch 'master' into ux_fixes 2024-01-23 14:24:13 +01:00
Roland Geider
41555c4bce Recreate generated files 2024-01-22 17:01:23 +01:00
Roland Geider
51a0e8798d Correctly show any errors from the server on the registration page
Also, add some tests
2024-01-22 16:55:59 +01:00
Roland Geider
dd12e040e9 Fun "dart fix" 2024-01-22 09:55:29 +01:00
Roland Geider
190f47f76b Merge branch 'master' into ux_fixes 2024-01-12 14:54:25 +01:00
Roland Geider
fbc4f163c9 Commit missing mocks file 2024-01-11 22:16:21 +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
d51b6d7d87 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/main.dart
#	lib/providers/exercises.dart
#	lib/widgets/workouts/day.dart
#	pubspec.lock
#	pubspec.yaml
2024-01-09 15:37:48 +01:00
Roland Geider
24e031d595 Finally fix the tests
We now dependency inject the database for the whole exercise provider,
this makes our lives a bit easier
2024-01-09 15:00:36 +01:00
Roland Geider
acbee49100 Simplify generating translation objects 2023-12-30 17:55:52 +01:00
Roland Geider
f951b6117a Try to generate ExerciseApiData objects only within the exercises model 2023-12-28 22:32:28 +01:00
Roland Geider
c4577ca5d7 Further tweaking exercise cache handling
handleUpdateExerciseFromApi should now be faster and save up on some requests.
Ideally we would pre-populate the database with all exercises on first run, or
even just ship it pre-filled
2023-12-28 17:48:15 +01:00
Roland Geider
35a9dc046f Add test for force initializing the cache dates 2023-12-27 13:41:50 +01:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +01:00
Roland Geider
c5cbb4f851 Rework exercise database
This is now separated into individual tables and methods so that they can be
tested separately
2023-12-26 17:03:20 +01:00
Roland Geider
65ba2275ae Run "dart format --line-length=100 ." to make the diff smaller 2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac fix(drift): built a model for exercise and fixes in fromSql type converter 2023-12-23 14:28:38 +05:30
Miroslav Mazel
95ea711e97 Weight entries - buggy test 2023-11-25 00:57:27 +01:00
Miroslav Mazel
814acd14c7 Meals + workouts: Removing Dismissible 2023-11-24 13:01:30 +01:00
Miroslav Mazel
1983d3890a GymMode: Use Table of Contents icon, not Menu 2023-11-23 13:53:06 +01:00
Roland Geider
29a6839a61 Run dart fix on the code base 2023-11-19 18:49:35 +01:00
Roland Geider
c514842b59 Lint the code with a line length of 100
This makes it easier to understand the diffs
2023-11-16 21:36:21 +01:00
Abhishek Saini
582bc611a4 feat(drift-database): Shifted from shared prefs to drift for Exercises 2023-11-16 22:34:40 +05:30
Github-actions
ca27faf9e2 Automatic linting 2023-11-09 19:26:45 +00: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
09f60fe432 Fix tests and recreate generated files 2023-11-09 19:07:38 +01:00
Miroslav Mazel
15923aea10 Camel-case variables 2023-11-05 23:22:42 +01:00
Miroslav Mazel
50b634d78a Single quotes instead of double 2023-11-05 23:12:39 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
53a00cca63 Move another charts to fl charts
These *really* need to get some kind of native time series support....
2023-10-08 21:27:55 +02:00
Roland Geider
779926bc98 Move nutritional plan diary chart to fl charts 2023-10-01 20:38:24 +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
Roland Geider
84ccc67c37 Merge branch 'master' into fix/replace-chart-lib
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2023-10-01 12:14:17 +02:00
Github-actions
8c809ad8cb Automatic linting 2023-08-08 09:14:27 +00:00
Roland Geider
aecbcfe663 Update models to work with new keys
creation_date was renamed to created and
update_date to last_updated
2023-08-08 11:12:55 +02:00
Github-actions
3003409c57 Automatic linting 2023-06-08 14:15:55 +00:00
Roland Geider
481ff898fa The field creation date in ingredients is now a datetime 2023-06-08 16:14:25 +02:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
8460d2fc0f Merge pull request #367 from 12people/master
Linux/macOS support
2023-04-15 12:20:52 +02:00
Roland Geider
2d7e35c0db Fix JSON response 2023-04-09 12:03:24 +02:00
Roland Geider
d79645a6f5 The ingredient ID is an integer, not a string 2023-04-09 11:40:40 +02:00