Commit Graph

255 Commits

Author SHA1 Message Date
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
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
Roland Geider
525fc8efd3 Fix typo 2023-04-09 11:29:55 +02:00
Roland Geider
f7ac8b716b Merge branch 'master' into 12people-master
# Conflicts:
#	lib/widgets/nutrition/widgets.dart
#	pubspec.lock
2023-04-09 10:57:43 +02:00
Roland Geider
65dd284f8f Fix test 2023-04-08 23:44:47 +02:00
Miroslav Mazel
7aeed3bde5 Prep Linux/macOS support: package_info_plus package + env variables instead of AndroidMetadata 2023-03-21 21:06:37 +01:00
Roland Geider
984df49c41 Add switch to search for ingredients in English as well 2023-03-20 17:14:12 +01:00
Roland Geider
fa8dd7e46f Fix merge errors 2023-03-20 14:19:29 +01:00
Roland Geider
b60e19cb16 Merge branch 'master' into feature/ingredient-images
# Conflicts:
#	lib/main.dart
#	lib/providers/nutrition.dart
#	pubspec.yaml
#	test/nutrition/nutritional_plan_screen_test.dart
#	test/nutrition/nutritional_plans_screen_test.dart
2023-03-20 13:58:31 +01:00
Roland Geider
1d896c6c4a Allow searching for exercise names in English as well
See wger-project/wger/issues/1238
2023-03-16 11:15:39 +01:00
Roland Geider
8e6eadf1b9 Annotate the needed mocks for each test
This makes it clear where they are loaded from
2023-02-11 13:50:42 +01:00
Roland Geider
fcfa1ceabf Annotate the needed mocks for each test
This makes it clear where they are loaded from
2023-02-11 13:45:42 +01:00
Roland Geider
b9d6641c87 Pass BaseProvider as an argument to workout provider 2023-02-11 13:45:42 +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
a977d4ec48 Refactor add_exercise_screen.dart
Use the is_trustworthy flag from the server, which also takes the account's age
into account. The widgets in the screen are split so it's easier to test and read
2023-02-07 20:30:09 +01:00
Github-actions
90501ad35c Automatic linting 2023-02-06 19:35:13 +00:00
Roland Geider
4f4f6f553a Add paginated fetches
This allows the app to fetch all available items from an enpoint, without
having to hope that the ?limit=999 is enough

Closes #133
2023-02-06 20:33:39 +01:00
Roland Geider
28091ad0e4 Fix tests 2023-02-05 22:44:30 +01:00