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
Roland Geider
86b61916f4
Remove the simple_barcode_scanner dependency
...
Turns out, we weren't even using it (or flutter_barcode_scanner)...
2025-03-21 09:10:49 +01:00
Roland Geider
d6eba96e50
Remove again the "Till end of the week" message
...
This wasn't describing properly how the rest days are being handled
2025-03-19 22:24:21 +01:00
Roland Geider
90681fadd9
Split up the gym mode widgets
2025-03-19 10:33:06 +01:00
Roland Geider
b681c264b3
Allow the session ID to be nullable
...
This will be filled in automatically by the backend
2025-03-19 10:19:54 +01:00
Roland Geider
0d1c55a9d3
Use logging package in the exception dialogs
2025-03-19 10:16:09 +01:00
Roland Geider
ea41b49051
If there is no session known locally, just re-fetch the whole routine
2025-03-19 10:15:43 +01:00
Roland Geider
f65a0dfbc8
Change weight and reps by the configured rounding value
2025-03-19 09:37:38 +01:00
Roland Geider
da059e7c36
Adjust image width for consistent sizing
2025-03-18 23:24:04 +01:00
Roland Geider
fea9d89621
Refactor widget so it's easier to test
2025-03-18 21:13:28 +01:00
Roland Geider
d071d143df
Update flutter to 3.29
...
The translations are not stored in a synthetic package anymore, but the
files are just copied to a specific folder so it can be more easily imported
Also, flutter_barcode_scanner was replaced by simple_barcode_scanner since
the first hasn't been updated in 3 years and was already causing problems
for some time
2025-03-18 17:28:19 +01:00
Roland Geider
b8f4167c9e
Show special tile indicating end of the week
2025-03-18 16:14:22 +01:00
Roland Geider
f987de1b4d
Handle case where an exercise has no variations
2025-03-18 14:59:33 +01:00
Roland Geider
1c2e988c82
Show the start and end dates for the current routine in the dashboard
...
The date in which the routine was created is not so important anymore
2025-03-17 21:03:12 +01:00
Roland Geider
58a641d298
Also put the list tile to add exercises in a card
...
This makes it look the same as the one to add new days and makes for
a more consistent behaviour
2025-03-17 19:44:58 +01:00
Roland Geider
5fdcb63207
Remove the optional refresh parameter
...
We always want to refresh the data since we don't update manually the
dayData lists
2025-03-17 19:27:43 +01:00
Roland Geider
1c8c2f7256
Don't show edit button in view mode
2025-03-17 19:27:43 +01:00
Roland Geider
567843aec8
Set the default value to fitInWeek to true
...
This is the same behaviour as in the web application is what most people
most like will be doing anyway.
2025-03-17 19:27:43 +01:00
Roland Geider
afff6731da
Group settings by exercise if these are the same
2025-03-17 13:23:10 +01:00
Roland Geider
d5a262491a
Add missing semantic labels
2025-03-17 13:22:02 +01:00
Roland Geider
ac458575b8
More renaming exerciseBase to exercise and exercise to translation
2025-03-17 13:21:51 +01:00
Roland Geider
2a422958f6
Remove commented code
2025-03-17 09:57:44 +01:00
Roland Geider
4e959d777a
The repetition and weight units can be null
...
and don't need to be loaded in this case
2025-03-16 19:59:00 +01:00
Roland Geider
0e4dbba245
Re-add showing null days
...
Still need a better solution in the UI for this, though
2025-03-15 14:59:59 +01:00
Roland Geider
753a126625
Don't load templates
...
At the moment templates are not supported in the mobile app.
2025-03-15 14:55:14 +01:00
Roland Geider
8de2199742
Render the "add day" within a Card
...
This makes it visually more similar to the rest of the options
2025-03-14 15:16:21 +01:00
Roland Geider
498e0a5011
Simplify code
2025-03-14 15:15:36 +01:00
Roland Geider
e26da371e6
Correctly calculate the current iteration
2025-03-14 13:37:11 +01:00
Roland Geider
6e01df2622
Use better type for requirements
...
(which are not editable on the flutter application anyway)
2025-03-13 14:45:35 +01:00
Roland Geider
f8e4304a01
Use better conversion function, the (max) rest time can be null
2025-03-13 14:42:48 +01:00
Roland Geider
a2ef3278fa
Show the trailing icon for the current day on rest days as well
2025-03-13 14:26:34 +01:00
Roland Geider
6cffdc9366
Merge branch 'master' into feature/flexible-routines
...
# Conflicts:
# lib/l10n/app_zh_Hant.arb
2025-03-13 14:13:20 +01:00
Roland Geider
6039f51b2a
If there is a rest time, show a countdown timer in the gym mode
2025-03-11 21:42:41 +01:00
Roland Geider
140fe11e2a
Mark the day in the routine for the current date
2025-03-11 21:03:20 +01:00
Roland Geider
4e60f14917
The dashboard can be a StatelessWidget
2025-03-11 20:44:42 +01:00
Roland Geider
325cc93865
Refresh the whole routine after modifying further objects.
...
This makes sure that all the structures are present and have the correct
content (dayData, etc.). Also, add more feedback to the user for some operations
that take a bit longer due to loading the whole routine.
2025-03-11 20:36:38 +01:00
Roland Geider
3abfd43be0
Rename variable to make it clearer what it does
2025-03-11 14:27:15 +01:00
Roland Geider
929acc7938
Refresh the whole routine after modifying a day
...
This makes sure that all the structures are present and have the correct
content (dayData, etc.)
2025-03-11 14:06:09 +01:00
Roland Geider
9c68a5abf4
Show button to edit the routine if it is empty
2025-03-11 13:51:47 +01:00
Roland Geider
1f647b5033
Correctly navigate to new routine after creating it
2025-03-11 13:50:13 +01:00
Roland Geider
883490ecd4
Juggle with the widgets so the routine form doesn't cause overflow errors
...
Seems this is the only form to make it work within the SingleChildScrollView
2025-03-11 13:25:30 +01:00
