Commit Graph

242 Commits

Author SHA1 Message Date
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
8bd0c99816 Redirect the user to the created exercise after loading
This still needs some work in fetchAndSetExercise
2022-04-15 14:16:48 +02:00
Roland Geider
3b2d9bf902 Only create aliases when they exist 2022-04-13 21:43:36 +02:00
Roland Geider
a6338ab6d6 Some more polishing 2022-03-31 13:52:43 +02:00
Roland Geider
bc28fe8624 Start adding variations handling 2022-03-31 00:07:12 +02:00
Roland Geider
3d4f48a88d Hide the translation fields, not all users will need this 2022-03-29 23:58:00 +02:00
Roland Geider
80a5793a54 Call notifyListeners when setting list of muscles
This is needed to update the muscle overview widget
2022-03-12 22:33:14 +01:00
Roland Geider
9b9afcc4e7 Don't use magic numbers to save the art style of an image 2022-03-12 21:44:15 +01:00
Roland Geider
e111839b3f Save aliases to the DB 2022-03-05 13:55:43 +01:00
Roland Geider
545f96b1c4 Some cleanup 2022-02-20 19:19:40 +01:00
Roland Geider
b011ddcd25 POST images when creating new exercises 2022-02-20 15:54:32 +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
d8933def9b Add versioning to the exercise cache
This was backported from the exercise crowdsourcing branch and is needed since
we are adding new data structures, in this case the exercises.
2022-02-18 21:12:05 +01:00
Roland Geider
df4f8c1817 Use cached exercises
This was committed by mistake
2022-02-18 20:05:48 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Roland Geider
4093e0fe07 Set all other exercise information 2022-01-31 22:06:59 +01:00
Roland Geider
2338807a0e Add all necessary fields to provider 2022-01-31 21:41:10 +01:00
Roland Geider
c7789dab6f Fix some typos 2022-01-31 21:28:06 +01:00
Roland Geider
fcff383657 Show diagram of selected muscles
This is still a WIP, the widget should update after each select
2022-01-31 21:27:50 +01:00
Roland Geider
ebb933b284 Make last save button more prominent 2022-01-30 19:53:46 +01:00
Roland Geider
afccfb4809 Set muscles and equipment objects when selecting from dropdown 2022-01-30 19:33:17 +01:00
Roland Geider
5d7df00cb2 Fix typo 2022-01-30 14:56:22 +01:00
Roland Geider
430ddaab20 Pass keys to the individual forms 2022-01-30 14:54:18 +01:00
Roland Geider
c3a3d35139 Alternative names is a list of strings 2022-01-29 22:20:56 +01:00
Roland Geider
65b12e8d9a Set category object, not String 2022-01-29 22:02:47 +01:00
Roland Geider
c24bc9783e Add video player widget for exercise details 2022-01-29 12:43:50 +01:00
Roland Geider
b8f985b310 Don't plot energy in chart
The values use the same axis and the energy is of course much higher than
the amount in grams
2022-01-23 21:27:43 +01:00
Roland Geider
bc2b947b81 Recreate generated files 2022-01-23 20:52:40 +01:00
Roland Geider
dcfe3b8e4b Merge branch 'master' into barcode_scanner
# Conflicts:
#	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-01-23 20:33:45 +01:00
yaseenagwan
03e8ac4b1d feat: Form Related Changes in Add Exercise Screen 2022-01-22 18:23:31 +05:30
Roland Geider
98f925be9c Merge pull request #124 from agwanyaseen/feature/exercise-crowdsourcing
feat: completed image section in Add Excercise Screen
2022-01-18 16:56:17 +01:00
Roland Geider
599aa82f89 Start working on muscle widget for exercises 2022-01-17 21:09:19 +01:00
Roland Geider
ff6a2f871a Make variation view in exercise detail view work 2022-01-17 20:32:17 +01:00
Roland Geider
205d9ae908 Fix function call 2022-01-17 20:30:12 +01:00
yaseenagwan
09843ba31a feat: completed image section in Add Excercise Screen 2022-01-16 15:14:15 +05:30
Roland Geider
2119c26ad3 Merge branch 'master' into feature/exercise-crowdsourcing
# Conflicts:
#	.github/workflows/ci.yml
#	lib/models/exercises/comment.g.dart
#	lib/models/exercises/exercise.g.dart
#	lib/models/exercises/image.g.dart
#	lib/models/measurements/measurement_entry.g.dart
#	lib/models/nutrition/ingredient_weight_unit.g.dart
#	lib/models/nutrition/log.g.dart
#	lib/models/workouts/day.g.dart
#	lib/models/workouts/session.g.dart
#	lib/models/workouts/workout_plan.g.dart
#	lib/providers/exercises.dart
#	pubspec.lock
#	pubspec.yaml
#	test/utils.dart
#	test/workout/gym_mode_screen_test.dart
2022-01-15 12:58:02 +01:00
Adrian Halko
324afff37c Added close label into app_en.arb. Deleted ingredient from nutritional_meal_item_form_test.dart. Changed return inside searchIngredientWithCode function. 2021-12-01 15:28:01 +01:00
Roland Geider
d77f4ca870 Linting 2021-11-27 00:27:22 +01:00
Roland Geider
854d159388 Some changes to the exercise list view
Still experimenting and subject to change
2021-11-26 19:47:37 +01:00
Adrian Halko
246162fb6d Added forgotten nutrition provider class. Changed tests names. 2021-11-23 17:10:22 +01:00
Roland Geider
672799287f Use convenience methods to GET exercise data 2021-11-23 15:48:50 +01:00
Roland Geider
e5bd9e901f Add workaround for the AndroidMetadata checks
The metaDataAsMap method doesn't work during tests and throws a null check
error. A better solution should be implemented when possible.
2021-11-08 10:55:16 +01:00
Roland Geider
fbff8f5425 Send user agent header with app version when logging in and registering 2021-11-08 09:57:18 +01:00
Roland Geider
1e9c44e56b Use makeUri helper function in auth provider 2021-11-08 09:54:50 +01:00
Roland Geider
909349ce90 Remove unsed code in auth provider 2021-11-08 09:44:22 +01:00
Roland Geider
cf882c194f Move flag checking for minimum required version to manifest
This is still not the best solution, ideally we would save this to some kind
of configuration file that we can use for dev/prod etc. Also, this solution
doesn't work with iOS or web
2021-11-08 09:42:32 +01:00
Roland Geider
03f7e1e371 Remove linting errors 2021-11-08 09:42:32 +01:00
Roland Geider
498a43f292 Test min application version check in auth provider 2021-11-08 09:42:32 +01:00