Commit Graph

183 Commits

Author SHA1 Message Date
Ady
83c4b33234 implemented bar chart with domain labels of nutrition values 2021-12-14 10:40:54 +01:00
Github-actions
b42ad21464 Automatic linting 2021-10-14 09:02:32 +00: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
Roland Geider
9e53c387fd Small changes to update text 2021-10-13 14:30:20 +02:00
Sandi Milohanić
ee3df1bada #29 - Add minimum required server version 2021-10-12 18:43:45 +02:00
Marvin M
505edda762 Merge branch 'master' into better-linting-rules-1 2021-10-11 08:57:03 +02:00
Roland Geider
c17076005c Remove background color, change was committed by mistake 2021-10-10 19:25:12 +02:00
Roland Geider
67ce615d06 Use rive animation during initial loading
See #99
2021-10-10 19:15:43 +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
Marvin M
6fac7455c5 Merge branch 'master' into better-linting-rules-1 2021-10-09 00:05:45 +02:00
Marvin M
2bc2d472d0 unnecessary_await_in_return 2021-10-08 15:11:45 +02:00
Marvin M
9d479e89b0 const_constructors
info: Prefer const with constant constructors. prefer_const_constructors
2021-10-07 20:40:09 +02:00
infiniteoverflow
3ca8a2ca7c Fixed the infinite loader bug 2021-10-07 21:35:32 +05:30
infiniteoverflow
555e873a2f Fixed the infinite loader bug 2021-10-07 21:33:39 +05:30
infiniteoverflow
f5181822a8 Fixed continuos loading bug in auth screen 2021-10-07 21:25:17 +05:30
Marvin M
45a2a5f857 Fixes pt 1 2021-10-01 17:18:17 +02:00
Roland Geider
8c9307c2d0 Allow editing and deleting measurement categories
This functionality was removed in one of the last commits by mistake
2021-09-10 10:30:11 +02:00
Roland Geider
50de83c599 Merge branch 'feature/measurements'
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2021-09-09 21:13:18 +02:00
Roland Geider
efde66e01b Remove trailing slash from custom server
Closes #37
2021-09-08 17:55:26 +02:00
Roland Geider
829f152734 Merge master 2021-09-07 17:37:20 +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
Roland Geider
6b49abf816 Don't show the bottom navigation bar when showing the loading widget 2021-09-06 22:00:20 +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
606a73a114 Load all measurement data upfront 2021-09-06 17:40:26 +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
0a922ec7a1 Don't show the general options in app bar in measurements
These are sub pages and don't need it
2021-08-30 19:27:39 +02:00
Roland Geider
873512bc34 Update weight list when adding or removing entries 2021-08-29 22:38:16 +02:00
Roland Geider
b2195d4f55 Allow deleting and editing entries 2021-08-29 22:34:30 +02:00
Roland Geider
cc899cdf1c Update weight list when adding or removing entries 2021-08-29 22:17:20 +02:00
Roland Geider
dc22f236ef Allow adding measurement categories and entries 2021-08-28 21:52:06 +02:00
Roland Geider
4e9ca1db6b Fixes to use measurement provider with base provider as argument 2021-08-25 21:48:16 +02: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
Roland Geider
db976d0486 Add measurement category and entry overviews
This is still a work in progress, besides the UX it's not possible yet to
edit or add entries
2021-08-25 21:33:30 +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
e18e1a0aea Don't show the global app bar for the diary entries 2021-08-17 11:57:24 +02:00
Roland Geider
1222a70e61 Add content to the diary detail page 2021-08-16 18:29:38 +02:00
Marvin M
80a81a4f7b Moved future builder 2021-07-08 15:55:17 +02:00
Github-actions
c877e436b0 Automatic linting 2021-06-22 21:10:15 +00:00
Github-actions
7492b53c67 Automatic linting 2021-06-20 13:09:24 +00:00
Roland Geider
e57220938b Start working on nutritional diary detail page 2021-06-16 18:42:06 +02:00
Roland Geider
7940aa7e51 Filter allowed characters for usernames
This is the same regex that django uses on the backend.

Fixes #30
2021-06-12 17:54:41 +02:00
Roland Geider
45a404586e Move workout detail switcher to toggle buttons
This makes it more obvious that the page is part of the current workout
2021-05-21 12:39:29 +02:00
Roland Geider
0b29ac1405 Simplify workout widgets by moving the SliverList to the screen 2021-05-21 11:54:41 +02:00
Roland Geider
980b5e0526 Cleanup unneeded widgets in gym mode 2021-05-19 14:58:26 +02:00
Roland Geider
9ce8632dcc Move the close button to the top left corner in gym mode
This is a more standard behaviour (and the system's back button also leaves the
gym mode anyway)
2021-05-19 12:29:36 +02:00
Roland Geider
b915c764ef Don't check AppLocalizations for null values
This is not needed in flutter 2.2 anymore
2021-05-19 11:50:43 +02:00