Commit Graph

218 Commits

Author SHA1 Message Date
Roland Geider
779926bc98 Move nutritional plan diary chart to fl charts 2023-10-01 20:38:24 +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
0c7b80137e Link to ingredient product 2023-04-09 12:00:13 +02:00
Roland Geider
d79645a6f5 The ingredient ID is an integer, not a string 2023-04-09 11:40:40 +02: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
fe59ddc9ac Add helper to get the nutritional plan's label
Returns the name or the term "nutritional plan"
2023-02-09 18:25:40 +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
Github-actions
1370a7a666 Automatic linting 2023-02-05 21:39:05 +00:00
Roland Geider
dd814063f3 Remlace deprecated ignore parameter 2023-02-05 21:28:41 +01:00
Roland Geider
f68afd91fd Rename exercise object to translation
This is what they are now anyway and makes it more clear
2023-02-05 21:24:28 +01:00
Github-actions
ceae6985fc Automatic linting 2022-11-29 16:27:47 +00:00
Roland Geider
a004192ed3 Correctly pass the base ID to render log charts
See https://github.com/wger-project/wger/issues/1180
2022-11-29 17:25:45 +01:00
Github-actions
280b5c0c43 Automatic linting 2022-11-24 10:25:48 +00:00
Roland Geider
18b6903513 Create more and more realistic screenshots for the app store
Now these test use the regular test data, which has been updated and is used in
the rest of the tests as well.
2022-11-24 11:24:09 +01:00
Github-actions
3c9b083eee Automatic linting 2022-10-11 07:39:56 +00:00
Roland Geider
fc524531fb Recreate generated files 2022-10-10 15:53:04 +02:00
Roland Geider
a8e4fdb4e0 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	lib/models/workouts/log.dart
#	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
2022-10-10 15:50:50 +02:00
Github-actions
134cd73e62 Automatic linting 2022-10-04 15:12:12 +00:00
Roland Geider
7bd4089782 Merge pull request #242 from skdotv/bug-fix/232
added code: string? in ingredient.dart
2022-10-04 17:10:01 +02:00
Github-actions
8ee9aaab52 Automatic linting 2022-10-04 15:02:56 +00:00
Vinod
5c767f311e added code: string? in ingredient.dart 2022-10-02 11:40:53 +05:30
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Roland Geider
e045a75703 Load video information from exercise base endpoint 2022-09-16 17:11:36 +02:00
Roland Geider
a7996f99db Commit generated files 2022-09-07 20:12:36 +02:00
Roland Geider
9a0d3b201c Commit missing generated file 2022-08-09 20:43:03 +02:00
Roland Geider
cb4bce7653 Show ingredient images 2022-08-09 18:51:37 +02:00
Roland Geider
70cdd37f84 Show translated muscle names 2022-07-28 11:57:45 +02:00
Roland Geider
32afa20e7b Recreate generated files 2022-07-01 09:52:13 +02:00
Roland Geider
0711e199da Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	lib/models/exercises/exercise.g.dart
#	pubspec.lock
#	pubspec.yaml
#	test/gallery/gallery_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-07-01 09:47:52 +02:00
Roland Geider
2aa9bc20e1 Load English name of muscles as well 2022-06-21 12:40:33 +02:00
Github-actions
0c3ee3badf Automatic linting 2022-05-20 17:10:27 +00:00
Roland Geider
6ee9aaee06 Rework user profile endpoint handling
Now it's not necessary anymore to pass the ID, we can do all actions on the
"list" URL

Fixes #141
2022-05-12 19:13:56 +02:00
Roland Geider
04b8f14925 Commit missing .part file 2022-05-12 18:03:43 +02:00
Roland Geider
7b0f02e88f Add user profile page
Closes #71
2022-05-12 15:28:26 +02:00
Roland Geider
1fd1aed848 Add tests for the getExercise method 2022-05-11 17:41:11 +02:00
Roland Geider
f56619939e Simplify loading of exercise data
While this has more manual steps than I would prefer, it is definitely better
than loading the individual entries and mapping them to an forth
2022-05-11 00:03:05 +02:00
Roland Geider
f834950cec Workout logs and settings now have a reference to an exercise base
This puts this code in sync with the backend and is logically better, since
the translations can be displayed when needed and are not hard coded
2022-05-10 16:53:44 +02:00
Roland Geider
826810f17a Start working on automatic screenshot generation 2022-04-11 20:00:32 +02:00
Roland Geider
e111839b3f Save aliases to the DB 2022-03-05 13:55:43 +01:00
Roland Geider
19a504dcfb Actually create exercise bases and translations 2022-02-20 14:40:42 +01:00
Roland Geider
5cebbb7c7f Fix merge conflicts 2022-02-19 22:16:32 +01:00
Roland Geider
badc3257d0 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	assets/images/muscles/back.svg
#	assets/images/muscles/main/muscle-1.svg
#	assets/images/muscles/main/muscle-10.svg
#	assets/images/muscles/main/muscle-11.svg
#	assets/images/muscles/main/muscle-12.svg
#	assets/images/muscles/main/muscle-13.svg
#	assets/images/muscles/main/muscle-14.svg
#	assets/images/muscles/main/muscle-15.svg
#	assets/images/muscles/main/muscle-16.svg
#	assets/images/muscles/main/muscle-2.svg
#	assets/images/muscles/main/muscle-3.svg
#	assets/images/muscles/main/muscle-4.svg
#	assets/images/muscles/main/muscle-5.svg
#	assets/images/muscles/main/muscle-6.svg
#	assets/images/muscles/main/muscle-7.svg
#	assets/images/muscles/main/muscle-8.svg
#	assets/images/muscles/main/muscle-9.svg
#	assets/images/muscles/secondary/muscle-1.svg
#	assets/images/muscles/secondary/muscle-10.svg
#	assets/images/muscles/secondary/muscle-11.svg
#	assets/images/muscles/secondary/muscle-12.svg
#	assets/images/muscles/secondary/muscle-13.svg
#	assets/images/muscles/secondary/muscle-14.svg
#	assets/images/muscles/secondary/muscle-15.svg
#	assets/images/muscles/secondary/muscle-16.svg
#	assets/images/muscles/secondary/muscle-2.svg
#	assets/images/muscles/secondary/muscle-3.svg
#	assets/images/muscles/secondary/muscle-4.svg
#	assets/images/muscles/secondary/muscle-5.svg
#	assets/images/muscles/secondary/muscle-6.svg
#	assets/images/muscles/secondary/muscle-7.svg
#	assets/images/muscles/secondary/muscle-8.svg
#	assets/images/muscles/secondary/muscle-9.svg
#	lib/helpers/consts.dart
#	lib/l10n/app_en.arb
#	lib/models/exercises/exercise.dart
#	lib/models/exercises/exercise.g.dart
#	lib/providers/exercises.dart
#	lib/widgets/exercises/exercises.dart
#	pubspec.lock
#	pubspec.yaml
#	test/exercises/exercises_detail_widget_test.dart
#	test/nutrition/nutritional_plan_form_test.mocks.dart
#	test/workout/workout_set_form_test.mocks.dart
2022-02-19 22:07:47 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00