wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-19 07:50:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,602 Commits 30 Branches 39 Tags
a67cd67067a272c8b3effb49909a1c752da98e7d
Commit Graph

80 Commits

Author SHA1 Message Date
Roland Geider
57e7464d2d Some polishing 2023-02-06 22:31:35 +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
b295cb9904 Translation keys from the server sorted alphabetically 2023-02-05 21:23:09 +01:00
Roland Geider
4846bb5b00 Update i18n.dart 2023-02-05 21:23:09 +01:00
Harshit
4f460e85ee updated fixes 2023-02-01 01:17:49 +05:30
Roland Geider
a004192ed3 Correctly pass the base ID to render log charts 
See https://github.com/wger-project/wger/issues/1180
 2022-11-29 17:25:45 +01:00
Roland Geider
bf88275440 Merge branch 'master' into refactor_login_page 2022-10-14 21:11:00 +02:00
amannegi
4b3e067a52 Modified Error Dialog and Added App Compatibility check on login/signup #101 2022-10-10 21:56:42 +05:30
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
Aditya
3e8e1c8f16 Removed Deprecated Code 2022-10-02 08:41:57 +05:30
Roland Geider
d9a66d87b0 Update generated translations 2022-07-28 09:20:41 +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
75c18d283d Split up the widgets used, this was getting too cluttered 2022-03-31 00:20:13 +02:00
Roland Geider
af5aa0f7fe Show color of main and secondary muscles 2022-03-12 23:35:30 +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
19a504dcfb Actually create exercise bases and translations 2022-02-20 14:40:42 +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
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
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
Roland Geider
2d8d864f27 Merge branch 'master' into feature/exercise-crowdsourcing 
# Conflicts:
#	lib/main.dart
#	lib/models/exercises/exercise.dart
#	lib/providers/exercises.dart
#	lib/providers/nutrition.dart
#	lib/widgets/exercises/exercises.dart
#	lib/widgets/workouts/forms.dart
#	lib/widgets/workouts/gym_mode.dart
#	pubspec.lock
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/gym_mode_screen_test.dart
#	test/measurements/measurement_categories_screen_test.mocks.dart
#	test/measurements/measurement_provider_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.dart
#	test/workout_set_form_test.mocks.dart
 2021-10-16 12:40:01 +02:00
AxelBlaz3
8228b42bb2 Merge branch 'master' of https://github.com/AxelBlaz3/flutter 2021-10-14 09:08:54 +05:30
AxelBlaz3
1b92b073ca Display errors in login page 
Now the app shows the reason why the login failed to the user.

Why this happened?
There's a 'Consumer' at the top most widget (MaterialApp) which gets rebuild everytime during logout and login. We don't need to notify listeners and rebuild the MaterialApp widget when logging out (cleaning up old data) during login. By doing so, context is in place and dialog appears. If the whole MaterialApp rebuilds, the old context is gone and a new context is given to all the widgets, which is where the issue arises and the dialog uses old context (which doens't exist in the first place).

Signed-off-by: AxelBlaz3 <karthikgaddam4@gmail.com>
 2021-10-14 08:51:18 +05:30
Roland Geider
4ad5263834 Merge branch 'better-linting-rules-1' 2021-10-13 17:45:59 +02:00
Roland Geider
188158e5d6 Merge branch 'sandimilohanic_master' 2021-10-13 17:40:46 +02:00
Sandi Milohanić
ee3df1bada #29 - Add minimum required server version 2021-10-12 18:43:45 +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
9d479e89b0 const_constructors 
info: Prefer const with constant constructors. prefer_const_constructors
 2021-10-07 20:40:09 +02:00
Marvin M
eae34f0b36 Fixes pt 2 2021-10-01 17:32:31 +02:00
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
f90ddc9366 Improve exercise initial loading and reading from cache 2021-09-15 20:41:59 +02:00
Roland Geider
8543652581 Merge branch 'master' into feature/measurements 
# Conflicts:
#	lib/screens/dashboard.dart
#	test/base_provider_test.mocks.dart
#	test/gallery_screen_test.mocks.dart
#	test/nutritional_plan_form_test.mocks.dart
#	test/workout_form_test.mocks.dart
#	test/workout_set_form_test.mocks.dart
 2021-09-07 17:03:15 +02:00
Patrick Witter
3dc32259de Changed max-line to 100 2021-08-30 15:05:14 -05:00
Patrick Witter
b53551c753 Added dialog to show user server-side errors 2021-08-29 15:12:42 -05:00
Roland Geider
6cbe164ec8 Merge remote-tracking branch 'origin/feature/measurements' into feature/measurements 
# Conflicts:
#	lib/models/measurements/measurement_entry.g.dart
 2021-08-25 21:34:22 +02:00
ton-An
19445c36a2 (Measurements) Added Equatable + Refactored 
(MeasurementProvider)
- Passing in the WgerBaseProvider instead of extending with it
- Re-written tests
- Added the fixture reader to make test file less crowded

(Measurement Models)
- Added Equatable
- Re-written tests
 2021-08-22 18:07:47 +02:00
Roland Geider
d01986238f Show percent of energy and g per body-kg for macros 2021-08-16 16:24:12 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
857d0453cc Automatic linting 2021-06-22 20:29:22 +00:00
Arun Muralidharan
a053c813bc Start Time Validator 
Implemented start time validator to ensure start time is not ahead of end time in gym mode.
 2021-06-22 20:19:16 +02:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
180e419e7e Group the plates for easier reading 2021-06-15 23:11:34 +02:00
Roland Geider
9bf46807f8 Simplify loop 2021-06-15 17:37:11 +02:00
Roland Geider
039b195e7a Fix error in plate calculator 
The smallest plate was never being taken into consideration, as the loop never
reached it
 2021-06-15 17:33:39 +02:00
Roland Geider
48ee80fffe Only show plate calculator for barbell exercises 
This might be a bit too constrained, since other exercises (e.g.) in the rack
or the leg press would also benefit from this. Perhaps adding a user switch?
 2021-06-13 21:09:37 +02:00