wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,113 Commits 30 Branches 39 Tags
545f96b1c4ea92f3a77b7c0ce4f034f588652d53
Commit Graph

1113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Geider
545f96b1c4 Some cleanup 2022-02-20 19:19:40 +01:00
Roland Geider
7e07b2d594 Allow jumping back to the past steps by tapping on them 2022-02-20 19:19:22 +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
409d7a023e Merge pull request #130 from wger-project/imgbot 
[ImgBot] Optimize images
 2022-02-19 21:49:37 +01:00
Roland Geider
fd553b04f9 Update pubspec.lock 2022-02-19 21:47:40 +01:00
Roland Geider
2e9356ecda Bump some versions, build app with flutter 2.10 2022-02-19 21:47:07 +01:00
ImgBotApp
3cd345d39d [ImgBot] Optimize images 
*Total -- 506.22kb -> 448.00kb (11.5%)

/assets/images/muscles/main/muscle-15.svg -- 2.54kb -> 0.91kb (64.21%)
/assets/images/muscles/secondary/muscle-15.svg -- 2.54kb -> 0.91kb (64.21%)
/assets/images/muscles/secondary/muscle-5.svg -- 2.76kb -> 1.10kb (60.13%)
/assets/images/muscles/main/muscle-5.svg -- 2.76kb -> 1.10kb (60.13%)
/assets/images/muscles/main/muscle-9.svg -- 2.76kb -> 1.10kb (60.01%)
/assets/images/muscles/secondary/muscle-1.svg -- 2.81kb -> 1.14kb (59.38%)
/assets/images/muscles/main/muscle-1.svg -- 2.81kb -> 1.14kb (59.38%)
/assets/images/muscles/secondary/muscle-9.svg -- 2.76kb -> 1.12kb (59.33%)
/assets/images/muscles/main/muscle-2.svg -- 2.82kb -> 1.15kb (59.2%)
/assets/images/muscles/secondary/muscle-2.svg -- 2.82kb -> 1.15kb (59.2%)
/assets/images/muscles/secondary/muscle-14.svg -- 2.84kb -> 1.17kb (58.89%)
/assets/images/muscles/main/muscle-14.svg -- 2.84kb -> 1.17kb (58.89%)
/assets/images/muscles/secondary/muscle-12.svg -- 2.82kb -> 1.16kb (58.88%)
/assets/images/muscles/main/muscle-12.svg -- 2.82kb -> 1.16kb (58.88%)
/assets/images/muscles/secondary/muscle-10.svg -- 2.95kb -> 1.26kb (57.32%)
/assets/images/muscles/main/muscle-10.svg -- 2.95kb -> 1.26kb (57.32%)
/assets/images/muscles/secondary/muscle-13.svg -- 3.41kb -> 1.46kb (57.09%)
/assets/images/muscles/main/muscle-13.svg -- 3.41kb -> 1.46kb (57.09%)
/assets/images/muscles/secondary/muscle-11.svg -- 2.93kb -> 1.26kb (56.88%)
/assets/images/muscles/main/muscle-11.svg -- 2.93kb -> 1.26kb (56.88%)
/assets/images/muscles/secondary/muscle-4.svg -- 3.05kb -> 1.38kb (54.75%)
/assets/images/muscles/main/muscle-4.svg -- 3.05kb -> 1.38kb (54.75%)
/assets/images/muscles/main/muscle-3.svg -- 3.18kb -> 1.52kb (52.41%)
/assets/images/muscles/secondary/muscle-3.svg -- 3.18kb -> 1.52kb (52.41%)
/assets/images/muscles/main/muscle-7.svg -- 3.37kb -> 1.70kb (49.49%)
/assets/images/muscles/secondary/muscle-7.svg -- 3.37kb -> 1.70kb (49.49%)
/assets/images/muscles/main/muscle-16.svg -- 3.46kb -> 1.76kb (49.05%)
/assets/images/muscles/secondary/muscle-6.svg -- 3.46kb -> 1.76kb (49.05%)
/assets/images/muscles/main/muscle-6.svg -- 3.46kb -> 1.76kb (49.05%)
/assets/images/muscles/secondary/muscle-16.svg -- 3.46kb -> 1.76kb (49.04%)
/assets/images/muscles/secondary/muscle-8.svg -- 3.44kb -> 1.77kb (48.61%)
/assets/images/muscles/main/muscle-8.svg -- 3.44kb -> 1.77kb (48.61%)
/assets/images/barcode_scanner_icon.png -- 1.36kb -> 1.12kb (17.92%)
/fastlane/metadata/android/en-US/images/logo.png -- 12.71kb -> 10.99kb (13.53%)
/assets/images/muscles/back.svg -- 394.95kb -> 392.66kb (0.58%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
 2022-02-19 20:23:51 +00:00
Roland Geider
a1b0fce54f Merge pull request #129 from wger-project/feature/exercise-videos 
exercise videos
 2022-02-19 21:04:58 +01:00
KenXRan
bc40a8bfca Added translation using Weblate (Chinese (Traditional)) 2022-02-19 07:01:27 +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
aa4d3c59d8 Fix tests 2022-02-18 20:29:34 +01:00
Roland Geider
df4f8c1817 Use cached exercises 
This was committed by mistake
 2022-02-18 20:05:48 +01:00
sr-c
b011471dbe Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.4% (155 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/zh_Hans/
 2022-02-18 08:56:04 +01:00
Milo Ivir
f379221106 Translated using Weblate (Croatian) 
Currently translated at 100.0% (4 of 4 strings)

Translation: wger Workout Manager/Play Store
Translate-URL: https://hosted.weblate.org/projects/wger/play-store/hr/
 2022-02-15 01:57:46 +01:00
Milo Ivir
4e6f0b412c Translated using Weblate (Croatian) 
Currently translated at 100.0% (159 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/hr/
 2022-02-15 01:57:46 +01:00
Nikita Epifanov
9f20241efd Translated using Weblate (Russian) 
Currently translated at 98.1% (156 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ru/
 2022-02-06 15:56:30 +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
d78fa35de8 Filter by exercise bases in overview 2022-02-02 19:12:01 +01:00
Roland Geider
8e800b5097 Update gallery after adding or deleting a picture 
Fixes #128
 2022-02-02 17:07:20 +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
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
4e1913a58c Don't make the selection list scrollable, show all selected items 2022-01-30 19:43:32 +01:00
Roland Geider
0d1d86e75f Correctly set the selected muscles and equipment 
This is very ugly and can probably be solved by correctly configuring the
multi select widget, but some other errors kept keeping this from working
 2022-01-30 19:43:11 +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
2b47654d6a Mark more strings as translatable 2022-01-30 14:32:53 +01:00
Roland Geider
a3ae5a990e Translated using Weblate (French) 
Currently translated at 96.2% (153 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/fr/
 2022-01-29 23:02:29 +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
c3e27751e2 Merge pull request #125 from agwanyaseen/feature/exercise-crowdsourcing 
feat: Form Related Changes in Add Exercise Screen
 2022-01-29 21:07:33 +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
5d28847c69 Add video model and recreate generated files 2022-01-29 11:48:02 +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
guillem
efceda391e Translated using Weblate (Spanish) 
Currently translated at 100.0% (159 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/es/
 2022-01-29 10:54:35 +01:00
Roland Geider
f767734e88 Translated using Weblate (German) 
Currently translated at 100.0% (159 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/de/
 2022-01-29 10:54:35 +01:00
João Goulart
f3398d1fb3 Translated using Weblate (Portuguese) 
Currently translated at 100.0% (159 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/pt/
 2022-01-27 00:52:32 +01:00
guillem
3716fca220 Translated using Weblate (Catalan) 
Currently translated at 100.0% (159 of 159 strings)

Translation: wger Workout Manager/Mobile App
Translate-URL: https://hosted.weblate.org/projects/wger/mobile/ca/
 2022-01-27 00:52:30 +01:00
João Goulart
d6e1108c8a Added translation using Weblate (Portuguese) 2022-01-25 12:32:30 +01:00
Roland Geider
4bb91f1c14 Update to flutter 2.8 2022-01-23 21:57:53 +01:00