Commit Graph

190 Commits

Author SHA1 Message Date
amannegi
1afb3ef47d Merge branch 'master' of https://github.com/AmanNegi/flutter into auth_redesign 2022-10-20 23:35:23 +05:30
amannegi
584fe9f405 Improved Login Interface #264 2022-10-20 23:32:31 +05:30
Aaliya Ali
5aa658d030 Merge branch 'master' into master 2022-10-19 13:19:01 +05:30
Aaliya Ali
2bc862c997 Fix Gallery Screen Test 2022-10-19 13:14:09 +05:30
Roland Geider
5a4e8a3587 Fix min application version tests 2022-10-15 11:15:23 +02: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
Vinod
5c767f311e added code: string? in ingredient.dart 2022-10-02 11:40:53 +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
70cdd37f84 Show translated muscle names 2022-07-28 11:57:45 +02:00
Roland Geider
a83d54bef2 Merge branch 'master' into feature/exercise-crowdsourcing 2022-07-18 15:59:24 +02:00
Roland Geider
d5ae4b4ef3 Add tests for sub URL handling 2022-07-18 15:09:05 +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
07a4b56d76 Commit missing mock file 2022-05-12 15:29:38 +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
34e0854c68 Set the baseID when loading exercises 2022-05-11 16:58:55 +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
aa4d3c59d8 Fix tests 2022-02-18 20:29:34 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Roland Geider
5d28847c69 Add video model and recreate generated files 2022-01-29 11:48:02 +01:00
Roland Geider
4bb91f1c14 Update to flutter 2.8 2022-01-23 21:57:53 +01:00
Roland Geider
eea3e0d16b Recreate mocks and update pubspec.lock 2022-01-23 21:35:49 +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
Roland Geider
4cdd51d8b9 Add test for repetition and weight unit form widgets 2022-01-23 20:04:18 +01:00
Roland Geider
e1dd862425 Fix tests 2022-01-20 19:35:27 +01:00
Roland Geider
8947129653 Recreate mocks and generated files 2022-01-20 11:18:44 +01:00
Roland Geider
eaa49951a0 Fix exercises_detail_widget_test.dart 2022-01-18 18:05:08 +01:00
Roland Geider
613a2a41db Fix import 2022-01-18 17:18:05 +01:00
Github-actions
379d9ca067 Automatic linting 2022-01-16 18:36:05 +00:00
Roland Geider
0d5df9d786 Recreate generated files 2022-01-15 13:27:01 +01:00
Roland Geider
d0b2c992af Fix import path 2022-01-15 13:09:15 +01:00
Roland Geider
2d5f5162ad Recreate generated files 2022-01-15 13:05:35 +01:00
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
fa4dfe6ee5 Regenerated all classes. 2021-12-03 16:44:52 +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