Commit Graph

377 Commits

Author SHA1 Message Date
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
Roland Geider
a534e323dd Merge pull request #94 from sandimilohanic/master
Consistenly display nutritional values
2021-10-08 13:55:51 +02:00
Sandi Milohanić
bed7da48c6 New language keys have been added for some short names of macronutrients (energy, fats, carbohydrates, proteins) 2021-10-08 13:14:02 +02:00
Marvin M
1e8080cc02 always_declare_return_types 2021-10-07 20:43:55 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
Marko Milosevic
48063634cc Fixed 100 characters limit in code 2021-10-07 19:58:57 +02:00
Marvin M
923b44ba97 Marked as '@immutable'
This class (or a class that this class inherits from) is marked as '@immutable', but one or more of its instance fields aren't final: WorkoutForm._plan
2021-10-07 19:58:40 +02:00
Marko Milosevic
88f1f200b1 Added the option to delete workout log entries 2021-10-07 19:37:16 +02:00
Marvin M
c2e881c139 Minor changes 2021-10-07 18:50:33 +02:00
Sandi Milohanić
0c1e80e660 Optimization code lines 2021-10-07 13:35:46 +02:00
Sandi Milohanić
7deef06b1d Consistenly display nutritional values
Additional: Removed macronutrients sugars and saturated fats
2021-10-07 11:36:19 +02:00
Github-actions
18622b0c62 Automatic linting 2021-10-07 06:00:51 +00:00
Roland Geider
a1791b3af3 Merge pull request #93 from TomerPacific/fix/preset-time-session-form-31
Correct Preset Time In Session Form
2021-10-07 07:59:16 +02:00
unknown
81944cbe19 Merge branch 'fix/preset-time-session-form-31' of https://github.com/TomerPacific/flutter into fix/preset-time-session-form-31 2021-10-06 22:16:56 +03:00
unknown
769043598b fix/preset-time-session-form creating constructor in session to initialize timeStart/end 2021-10-06 22:16:44 +03:00
Github-actions
9b6e7e9ccf Automatic linting 2021-10-06 19:05:37 +00:00
Tomer Ben-Rachel
12da49ed65 Merge branch 'master' into fix/preset-time-session-form-31 2021-10-06 21:22:07 +03:00
unknown
e523c287ad fix/preset-time-session-form making sure to use timeStart/end as values for initialTime of TimePicker and setting them as well 2021-10-06 20:58:10 +03:00
Thilina Herath
27cbbed38f Update gym_mode.dart 2021-10-06 18:37:49 +08:00
Thilina Herath
96ac3b2ec6 Bad internet duplicate exercise entries #54 2021-10-06 18:23:01 +08:00
Thilina Herath
d01c60b6ab Missing double workout entries #58 2021-10-05 21:24:16 +08:00
Github-actions
9a9f0b2965 Automatic linting 2021-10-03 19:56:09 +00:00
Roland Geider
dae1e39ea7 Merge pull request #89 from ThilinaTCH/master
Allow user to give meals a description #70
2021-10-03 21:54:27 +02:00
Thilina Herath
5ad01e4cac test: resolve conflicts 2021-10-03 11:24:48 +08:00
Github-actions
1a84fec097 Automatic linting 2021-10-02 10:58:18 +00: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
Thilina Herath
d6eb3deda7 Allow user to give meals a description #70
Add name field to meal form
2021-09-30 21:22:28 +08: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
Roland Geider
53346dc24e Some improvements to the link to the measurement sub page
I'm still not convinced, though
2021-09-07 16:48:03 +02:00
Roland Geider
45986a78ad Show units in weight and measurement charts 2021-09-07 15:59:35 +02:00
Roland Geider
a1f5c026c1 Allow adding measurement entries from overview 2021-09-07 15:36:12 +02:00
Roland Geider
099a2dad75 Merge branch 'master' into bug-53/Double-displayed-training-plans 2021-09-06 21:38:21 +02:00
Roland Geider
3874a49fe0 Add measurement entries in the dashboard calendar 2021-09-06 18:33:54 +02:00
Roland Geider
c704f561db Show entries graph in the category overview 2021-09-06 18:08:07 +02:00
Roland Geider
606a73a114 Load all measurement data upfront 2021-09-06 17:40:26 +02:00
Roland Geider
c8d1d1ad84 Replace getImage with pickImage, was deprecated 2021-09-01 15:46:31 +02:00
Roland Geider
0394922dfc Prevent keyboard from appearing when selecting a date in the gallery 2021-09-01 15:45:56 +02:00
Roland Geider
4f885c88ab Merge pull request #74 from patrickwitter/BugFixAteempt1
Fixes Issue #72
2021-08-30 22:19:24 +02:00
Patrick Witter
3dc32259de Changed max-line to 100 2021-08-30 15:05:14 -05:00
Roland Geider
60f7c3ed1b Add length validator to the notes
This is also checked server side anyway so we better inform the user before
submitting the form
2021-08-30 20:28:47 +02:00
Roland Geider
00caf09d0d Show measurement category name in the top navigation bar
This makes it easier to keep the orientation in the app
2021-08-30 20:27:57 +02:00
Roland Geider
a4dbbcf28d Use same color scheme for weight entry dismissible 2021-08-30 19:56:44 +02:00