Commit Graph

954 Commits

Author SHA1 Message Date
Roland Geider
b16120cddb Remove debug output 2025-05-14 14:45:18 +02:00
Roland Geider
8e567e332d Split up some files for easier editing 2025-05-14 14:45:04 +02:00
Roland Geider
0d49030c60 Merge branch 'master' into fork/eyJhb/api-token
# Conflicts:
#	lib/screens/auth_screen.dart
#	test/nutrition/nutritional_plan_screen_test.mocks.dart
#	test/nutrition/nutritional_plans_screen_test.mocks.dart
#	test/workout/day_form_test.mocks.dart
#	test/workout/gym_mode_session_screen_test.mocks.dart
#	test/workout/repetition_unit_form_widget_test.mocks.dart
#	test/workout/routine_edit_screen_test.mocks.dart
#	test/workout/routine_edit_test.mocks.dart
#	test/workout/routine_form_test.mocks.dart
#	test/workout/routine_logs_screen_test.mocks.dart
#	test/workout/slot_entry_form_test.mocks.dart
#	test/workout/weight_unit_form_widget_test.mocks.dart
2025-05-11 18:04:09 +02:00
Roland Geider
a194145563 Bump fl_chart to 1.0 2025-05-11 17:51:41 +02:00
Roland Geider
116888d824 Also add link to exercise submission screen 2025-05-11 17:00:17 +02:00
Roland Geider
f091694b47 Extract common urls to consts.dart 2025-05-09 22:37:06 +02:00
Roland Geider
624b043367 Merge branch 'master' into feature/rework-about-us 2025-05-09 22:23:58 +02:00
Roland Geider
e9435cd4aa Fix test 2025-05-09 21:46:09 +02:00
Roland Geider
7141e26480 Update SessionForm test 2025-05-09 21:23:09 +02:00
Roland Geider
01c5c9186d Merge branch 'master' into feature/better-error-handling
# Conflicts:
#	lib/widgets/routines/gym_mode/session_page.dart
2025-05-09 21:16:55 +02:00
Roland Geider
d663bcd88a Move common logic to SessionForm
Refactor and polish a bit the form in the log overview.
2025-05-09 21:12:49 +02:00
Roland Geider
e8ff3458e0 Merge branch 'master' into fork/Rohitdhall987/edit-session-feature 2025-05-09 14:57:53 +02:00
Roland Geider
aafb2c90c8 Delete unused file 2025-05-09 14:16:45 +02:00
Roland Geider
0863b44fe6 Merge branch 'master' into feature/better-error-handling
# Conflicts:
#	lib/screens/home_tabs_screen.dart
#	test/workout/day_form_test.mocks.dart
#	test/workout/gym_mode_session_screen_test.mocks.dart
#	test/workout/repetition_unit_form_widget_test.mocks.dart
#	test/workout/routine_edit_screen_test.mocks.dart
#	test/workout/routine_edit_test.mocks.dart
#	test/workout/routine_form_test.mocks.dart
#	test/workout/routine_logs_screen_test.mocks.dart
#	test/workout/slot_entry_form_test.mocks.dart
#	test/workout/weight_unit_form_widget_test.mocks.dart
2025-05-09 14:11:17 +02:00
Roland Geider
f8000a5454 Catch and handle WgerHttpException specially
This shows the server errors directly in the form, instead of a modal dialog
(which is the default for all the other forms and places that throw the exception)
2025-05-09 13:54:58 +02:00
Roland Geider
013721ba71 Refactor WgerHttpException
We can now use a widget to show any errors returned by WgerHttpException. This has
to be added on a form-by-form basis, otherwise, the general error handling shows
the results in a modal dialog
2025-05-08 22:06:48 +02:00
Roland Geider
7e0910b56b Handle network connectivity a bit different
When the server is not reachable, we show a slightly different error message
and remove the option to automatically create an issue.
2025-05-08 15:07:12 +02:00
Roland Geider
5e22d69bb1 Improve error handling and logging
Now we process and catch all errors that might happen in the application, instead
of silently ignoring them. These errors are shown in a better error dialog, that
shows the details to the user and allows to create an issue on GitHub with the
error and traceback data already filled in.
2025-05-07 18:19:15 +02:00
Roland Geider
41edc35650 Rework about us page and remove unused translation keys 2025-05-07 16:28:29 +02:00
Roland Geider
9ebaf58fea Refactor routine handling for the dashboard widgets
This makes sure that edits to the routine (such as changing the order
of the days, etc.) are properly reflected in the dashboard.
2025-05-03 15:39:46 +02:00
Roland Geider
ece38a39d2 Refactor login screen
The api token toggle is now only visible when showing a custom server, since at
the moment this is the only time when such an auth method makes sense (plus it
keeps the rest of the UI cleaner). The different fields in the screen have been
moved to individual files, to make the structure clearer.
2025-04-30 22:50:55 +02:00
Roland Geider
7f42b47f97 Actually set the RiR value in the logs 2025-04-27 16:10:41 +02:00
Rohitdhall987
f45ed540b3 feat: allow editing old sessions via popup dialog 2025-04-25 22:55:56 +05:30
Roland Geider
1ecbfa88d1 Correctly set the start and end time to null, if this is what comes from the API 2025-04-18 00:40:05 +02:00
Roland Geider
bc0672d81b Correctly initialize the data in form from existing session
Also, add some simple tests for this
2025-04-17 17:30:01 +02:00
Roland Geider
8acde9adaa Add startTime to GymState and update GymMode to use it
This keeps the start time, even if the user leaves the gym mode and returns
later, which is what we want anyway.
2025-04-17 16:34:42 +02:00
Roland Geider
c673fa0ea6 Add test for the workout log deletion dialog 2025-04-17 15:18:49 +02:00
Roland Geider
88d66b336c Properly update the UI when deleting workout logs
The problem was that we were passing the exercises and session from the
calendar events, which wasn't being reloaded when the logs were deleted. Now
we only pass the selected date and fetch the logs from the routine.
2025-04-17 10:26:44 +02:00
Roland Geider
4920c2a091 Fix overflow bug in meal.dart
This should also fix the problem when generating the goldens. The loadAppFonts
and the check for Linux was removed as well, if the pseudo-font helps with a
constant rendering among all platforms we don't need those.
2025-04-12 17:57:24 +02:00
Roland Geider
4effd5af5a Show server side validation errors 2025-04-04 19:22:21 +02:00
Roland Geider
bc45e46b11 Use clock package in workout_logs.dart
This is needed in order to be able to mock the current time in the tests
2025-03-30 12:44:32 +02:00
Roland Geider
301f48a966 More renaming of exercise base to just exercise 2025-03-29 15:50:13 +01:00
Roland Geider
9b1e369efe Remove todo, we just merged the carousel for images 2025-03-29 15:31:44 +01:00
Roland Geider
6fd74f0f80 Use localized kcal message 2025-03-29 15:06:45 +01:00
Roland Geider
0cc0bc94fe Merge branch 'fork/yashas-hm/yhm/issue-767' 2025-03-29 14:45:26 +01:00
Roland Geider
ef003c28ab Add some padding so that the images don't collide with the info dots 2025-03-29 14:45:12 +01:00
Yashas H Majmudar
6d0d93bd8f fix: unused import error 2025-03-28 22:08:29 -04:00
Yashas H Majmudar
8f9ae5bcc0 update: carousel to carousel slider 2025-03-27 11:22:03 -04:00
Yashas H Majmudar
3716dae2d2 update: custom carousel indicator spacing 2025-03-27 10:07:30 -04:00
Yashas H Majmudar
808970d738 feat: Carousel for images in exercise details 2025-03-27 10:06:03 -04:00
Yashas H Majmudar
7728bb0d70 Merge branch 'master' into yhm/issue-724
# Conflicts:
#	AUTHORS.md
#	ios/Runner.xcodeproj/project.pbxproj
2025-03-26 18:45:56 -04:00
thisisyoussef
b1328fa048 Added to AUTHORS.md 2025-03-26 21:32:03 +01:00
thisisyoussef
3312da1f61 Fix rendering of muscles in MuscleWidget
Ensure that when a muscle is both main and secondary, only the main muscle background is drawn.
This addresses potential overlaps and redundant rendering in the MuscleWidget.
2025-03-26 21:32:03 +01:00
Yashas H Majmudar
ce07a9cf00 format dart convention 2025-03-26 12:25:50 -04:00
Yashas H Majmudar
59799669c7 update: ingredient image look 2025-03-26 12:16:27 -04:00
Roland Geider
d2097bf319 Show full exercise info in gym mode
This makes the ExerciseOverview smaller and more consistent

See #301
2025-03-26 16:31:27 +01:00
Roland Geider
3ca0c1781f Add a maximum height for exercise images 2025-03-26 16:24:54 +01:00
Roland Geider
821ffbfc2e Merge pull request #766 from yashas-hm/yhm/issue-743
Exercise filters bug fix: Issue #743
2025-03-26 15:54:19 +01:00
Roland Geider
74752505eb Change rir and rirTarget types from String to num
This is more consistent with the other fields and is now the same as the backend
2025-03-26 15:03:15 +01:00
Yashas H Majmudar
b2802e3a98 fix: isExpanded variable bool flip 2025-03-25 23:10:05 -04:00