Commit Graph

79 Commits

Author SHA1 Message Date
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
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
acbee49100 Simplify generating translation objects 2023-12-30 17:55:52 +01:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +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
Abhishek Saini
c21b278e36 test cases fixes 2023-11-19 16:56:49 +05:30
Abhishek Saini
82a49f6cac Merge branch 'master' into feat/data-persistence 2023-11-18 23:23:30 +05:30
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
95f863a0b6 Merge branch 'master' into feature/material-3
# Conflicts:
#	lib/widgets/nutrition/meal.dart
#	lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +01:00
Roland Geider
6a1f231e48 Make chips a bit smaller and give them a bit of color 2023-11-09 20:19:19 +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
Roland Geider
80ec0e80fb Start moving to material 3
Also dark mode at last
2023-04-22 13:38:13 +02:00
Roland Geider
bf7e2e8956 Move platform check to helper
Also, use TargetPlatform since it it better suited for tests (and seems to
be now the recommended way of checking this for UI elements)
2023-04-15 12:17:08 +02:00
Miroslav Mazel
283605eb4b Platform check for videos library 2023-03-21 21:22:07 +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
Roland Geider
e6ea4e6053 Remove unused code 2022-10-01 13:50:58 +02:00
Roland Geider
db479cf4a2 Show exercise aliases 2022-09-10 23:48:05 +02:00
Roland Geider
515defe7f3 Fix merge conflicts 2022-09-07 20:12:21 +02:00
Roland Geider
a7cd041295 Add keys to exercise contribution form 2022-08-28 14:42:01 +02:00
Roland Geider
70cdd37f84 Show translated muscle names 2022-07-28 11:57:45 +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
48ec2edbb3 Cleanup app bars
The dashboard has the main app bar that allows to change the settings, while
each screen has its own with custom actions
2022-04-15 13:03:35 +02:00
Roland Geider
2b60e84b25 Remove icon from menu entry, not needed 2022-04-13 16:39:00 +02:00
Roland Geider
bf710bc5d5 Translate categories and equipment in other parts of the application 2022-04-13 12:08:46 +02:00
Roland Geider
6622fad56b Add dynamic translations of strings that arrive from the server
Closes #120
2022-04-12 17:45:28 +02:00
Roland Geider
826810f17a Start working on automatic screenshot generation 2022-04-11 20:00:32 +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
af5aa0f7fe Show color of main and secondary muscles 2022-03-12 23:35:30 +01:00
Roland Geider
633e7b76d4 Fix path for trained muscles 2022-03-12 23:19:45 +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
32bf5b3723 Correctly initialise the video controller 2022-02-03 20:02:10 +01:00
Roland Geider
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Roland Geider
1bd33a71f5 Add const keyword 2022-02-01 19:36:42 +01:00
Roland Geider
4093e0fe07 Set all other exercise information 2022-01-31 22:06:59 +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
65b12e8d9a Set category object, not String 2022-01-29 22:02:47 +01:00
Roland Geider
dd94f31e92 Add a controls overlay on the exercise video widget
This is much cleaner and also more intuitive
2022-01-29 14:38:57 +01:00
Roland Geider
c24bc9783e Add video player widget for exercise details 2022-01-29 12:43:50 +01:00
Roland Geider
896315a1d7 Some improvements to presentation of muscle names 2022-01-29 11:24:51 +01:00