Commit Graph

318 Commits

Author SHA1 Message Date
Roland Geider
432ac8bbc6 More refactorings, extracting widgets and polishing 2024-02-24 12:19:36 +01:00
Roland Geider
9b0985fbf3 Add chart for percentage of logged nutritional values for meals 2024-02-23 19:19:13 +01:00
Roland Geider
9c7b65bc49 Allow users to quickly increment the body weight 2024-02-17 18:48:48 +01: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
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
95eed706fb Remove unused locator 2024-01-11 21:22:51 +01:00
Roland Geider
396c98dbd9 Merge branch 'master' into feat/data-persistence
# Conflicts:
#	lib/widgets/add_exercise/steps/step2variations.dart
#	pubspec.lock
2024-01-11 11:20:31 +01:00
null
4d90b8fc13 Fix bugs (#476)
* #454 issue, prefill only on debug mode

* #454 issue, prefill only on debug mode

* added myself <3

* -

* -

* fix #478 LateInitializationError

* add consts, make the funcs private

* latest update, change the name of prod, adding test server in debug mode

* -

---------

Co-authored-by: allohibihanaa <digitalhanaa@gmail.com>
Co-authored-by: Roland Geider <roland@geider.net>
2024-01-11 10:42:24 +01:00
Github-actions
0bc5e8e9e6 Automatic linting 2024-01-10 14:45:21 +00: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
89229a20cc Remove variation list
This wasn't really needed, we can just filter exercises by their variationID
2023-12-30 18:15:00 +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
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
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
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
3b44d29692 Remove debug code 2023-10-21 21:41:37 +02:00
Roland Geider
70b63b1b26 Add first version of the repetition chart and finally remove old chart library 2023-10-09 20:22:12 +02:00
Roland Geider
03f6b555af Fix order of log entries 2023-10-08 21:52:07 +02: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
Roland Geider
84bdb56b65 Rename some constants so they are the same as in the react app 2023-06-05 17:26:03 +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
e377db76fa Explicitly return null 2023-04-15 11:32:44 +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
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
6197e4dd2a Use paginated api when fetching log entries 2023-03-20 17:17:53 +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
b9d6641c87 Pass BaseProvider as an argument to workout provider 2023-02-11 13:45:42 +01:00
Roland Geider
64dc6867b7 Only sort the routine list once 2023-02-11 13:45:42 +01:00
Roland Geider
992de28450 Polish the last exercise submission step
Show a spinner while the requests are being processed (still no error handling
here though) and show a pop up on success that allows the user to go to the
exercise's detail page

Closes #341
2023-02-10 17:15:29 +01:00
Roland Geider
378a281e5c Return the base id, not the translation id! 2023-02-10 14:27:03 +01:00
Roland Geider
ab9572d46a Cleanup 2023-02-10 13:19:55 +01: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
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