Commit Graph

419 Commits

Author SHA1 Message Date
Roland Geider
a1b0fce54f Merge pull request #129 from wger-project/feature/exercise-videos
exercise videos
2022-02-19 21:04:58 +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
f0195ab235 Update gallery after adding or deleting a picture
Fixes #128
2022-02-03 11:48:49 +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
Roland Geider
2ed6d4d11d Backport new exercise detail page from exercise-crowdsourcing branch 2022-01-29 11:20:09 +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
6d18829619 Merge branch 'master' into adyhnat_master
# Conflicts:
#	.gitignore
#	pubspec.lock
2022-01-23 20:59:37 +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
d7b216d57a fix: Render Overflow issue in Dashboard screen 2022-01-09 13:30:03 +05:30
Ady
0282498545 Fixed bug with null exception on functions for average and today's logged values 2021-12-15 01:33:28 +01:00
Ady
8cd51fcdce Added few comments to NutritionalPlanHatchBarChartWidget 2021-12-14 19:20:26 +01:00
Ady
f4422cef88 Merge branch 'master' of https://github.com/wger-project/flutter
 Conflicts:
	pubspec.lock
	pubspec.yaml
2021-12-14 13:55:42 +01:00
Ady
bd7269ae5f Edited code to fill 100characters wrap
Changed private _nutritionalValues in NutritionalPlanHatchBarChartWidget to use nutritionalValues directly from _nutritionalPlan
2021-12-14 13:45:39 +01:00
Ady
009acdc91d 7 days avg values added to bar chart 2021-12-14 13:35:53 +01:00
Ady
90707971fb Logged values added to bar chart 2021-12-14 12:47:05 +01:00
Ady
fd3e635c3d Planned values added to chart - working on logged and avg 2021-12-14 11:58:26 +01:00
Ady
83c4b33234 implemented bar chart with domain labels of nutrition values 2021-12-14 10:40:54 +01:00
Adrian Halko
7657230201 Added scanning process into IngredientTypeahead widget. 2021-12-01 15:24:33 +01:00
Roland Geider
60589bfa1d Remove app_drawer.dart file, this was not used any more 2021-11-23 15:48:13 +01:00
Adrian Halko
ac43b80e51 Implemented barcode scanner. Added keys to app_en.arb(for alert dialogs and button). 2021-11-22 19:31:21 +01:00
Roland Geider
a77a0cc5db Show last logged items for quick access 2021-11-08 10:37:57 +01:00
Roland Geider
03f7e1e371 Remove linting errors 2021-11-08 09:42:32 +01:00
Roland Geider
9d6d3fcc25 Add quick link to log to diary on dashboard 2021-11-03 20:04:19 +01:00
Roland Geider
e4e6387df9 Merge branch 'add-custom-ingredient' 2021-11-03 19:41:22 +01:00
Roland Geider
504e4ffaba Refactor ingredient search widget 2021-11-03 19:41:05 +01:00
Tomáš Konkoľ
76ce31287f Add custom ingredient 2021-11-03 09:45:55 +01:00
Marko Milosevic
9997252e1e Removing final keyword for the RiR slider properties 2021-10-30 18:24:10 +02:00
Marko Milosevic
eb585b281e Fix for RiR slider 2021-10-29 12:58:20 +02:00
Marko Milosevic
8e4e6785f9 Fix for chart legend BUG 2021-10-28 19:16:56 +02:00
Roland Geider
89fa03de83 Fix typo in filename 2021-10-28 18:03:26 +02:00
Roland Geider
74ee9f16d8 Merge branch 'sandimilohanic_master' 2021-10-28 18:00:36 +02:00
Roland Geider
ff0e675860 Some refactoring for last used ingredients
It's easier to just use the already existing meal items rather than create
new logs that have the same infos.
2021-10-28 18:00:18 +02:00
Roland Geider
df387c923d Plan is not final
The object gets overwritten when a new plan gets created
2021-10-28 16:58:48 +02:00
Sandi Milohanić
884103a038 Merge branch 'master' into master 2021-10-28 12:59:36 +02:00
Roland Geider
a4e381e4c8 Make order of sets a required attribute
Closes #109
2021-10-28 11:43:32 +02:00
Sandi Milohanić
cfed221974 fix 2021-10-28 11:14:09 +02:00
Sandi Milohanić
a87351b470 Code fixing 2021-10-28 11:08:51 +02:00
Sandi Milohanić
b402f445a2 Add quick access to logged products #79 2021-10-27 18:01:43 +02:00
Roland Geider
ca4e902e07 Merge branch 'master' into better-linting-rules-1 2021-10-12 15:11:43 +02:00
Roland Geider
729c7e8908 Merge pull request #97 from TaarnStar/master
Allow to delete workout log entries
2021-10-12 15:07:32 +02:00
Marvin M
505edda762 Merge branch 'master' into better-linting-rules-1 2021-10-11 08:57:03 +02:00
Roland Geider
adb5b6317e If no wger API key is present launch a browser so they can register manually 2021-10-10 19:15:43 +02:00
Marko Milosevic
b31a480b45 Added helper for delete dilaog (currently only for log delete) 2021-10-10 16:26:51 +02:00
Marvin M
6fac7455c5 Merge branch 'master' into better-linting-rules-1 2021-10-09 00:05:45 +02:00
Marvin M
32a306f75a prefer_typing_uninitialized_variables 2021-10-08 15:26:06 +02:00
Marvin M
2bc2d472d0 unnecessary_await_in_return 2021-10-08 15:11:45 +02:00