Commit Graph

107 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
Roland Geider
b9b51dbad3 Rename constant to make it more clear what they are 2024-01-11 11:17:36 +01:00
null
4d90b8fc13 Fix bugs (#476)
* #454 issue, prefill only on debug mode

* #454 issue, prefill only on debug mode

* added myself <3

* -

* -

* fix #478 LateInitializationError

* add consts, make the funcs private

* latest update, change the name of prod, adding test server in debug mode

* -

---------

Co-authored-by: allohibihanaa <digitalhanaa@gmail.com>
Co-authored-by: Roland Geider <roland@geider.net>
2024-01-11 10:42:24 +01: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
c4577ca5d7 Further tweaking exercise cache handling
handleUpdateExerciseFromApi should now be faster and save up on some requests.
Ideally we would pre-populate the database with all exercises on first run, or
even just ship it pre-filled
2023-12-28 17:48:15 +01:00
Roland Geider
b64458603f Rename further occurrences of "exercise base" to just "exercise" 2023-12-26 21:38:07 +01:00
Roland Geider
c5cbb4f851 Rework exercise database
This is now separated into individual tables and methods so that they can be
tested separately
2023-12-26 17:03:20 +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
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
Github-actions
ca27faf9e2 Automatic linting 2023-11-09 19:26:45 +00:00
Roland Geider
7659d06ea6 Merge branch 'master' into 12people_maintenance
# Conflicts:
#	lib/theme/theme.dart
#	lib/widgets/core/charts.dart
#	lib/widgets/dashboard/widgets.dart
#	lib/widgets/nutrition/charts.dart
#	lib/widgets/workouts/charts.dart
#	pubspec.lock
#	pubspec.yaml
#	test_driver/screenshot_driver.dart
2023-11-09 20:24:01 +01:00
Roland Geider
b4686978f2 Remove getRandomColor, wasn't being used 2023-11-08 19:59:12 +01:00
Miroslav Mazel
f0930ba84a Ignore specific unused field warning 2023-11-05 23:17:11 +01:00
Abhishek Saini
3d948dfec4 measurement and nutrition chart issues fixes 2023-11-05 22:23:16 +05:30
Roland Geider
70b63b1b26 Add first version of the repetition chart and finally remove old chart library 2023-10-09 20:22:12 +02:00
Roland Geider
84ccc67c37 Merge branch 'master' into fix/replace-chart-lib
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2023-10-01 12:14:17 +02:00
Roland Geider
33b1c47676 Add missing translation key 2023-08-23 18:23:59 +02:00
Roland Geider
c83f8feb76 Update server translations 2023-06-06 11:55:48 +02:00
Roland Geider
84bdb56b65 Rename some constants so they are the same as in the react app 2023-06-05 17:26:03 +02:00
Roland Geider
237b4daaba Further work on pie chart for the nutritional plan 2023-05-19 20:59:37 +02:00
Roland Geider
04bd1c748b Rename some constants so they are the same as in the react app 2023-05-19 19:17:40 +02:00
Roland Geider
026ba114ee Update i18n.dart helper 2023-05-19 16:47:18 +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
Mirek Mazel
f7f3072352 Fixing bug #293 2023-03-22 17:29:22 +01:00
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