Roland Geider
3713399dc1
More merge fixes
2025-12-04 15:12:33 +01:00
Roland Geider
b75ee0dece
Merge conflicts
2025-12-04 13:07:39 +01:00
Roland Geider
d8a5369519
Merge branch 'master' into feature/powersync-test
...
# Conflicts:
# integration_test/3_gym_mode.dart
# lib/database/exercises/exercise_database.g.dart
# lib/models/exercises/category.g.dart
# lib/models/exercises/exercise.g.dart
# lib/models/exercises/exercise_api.freezed.dart
# lib/models/exercises/exercise_api.g.dart
# lib/models/exercises/translation.g.dart
# lib/models/workouts/log.dart
# lib/models/workouts/log.g.dart
# lib/models/workouts/session.dart
# lib/models/workouts/session_api.dart
# lib/models/workouts/weight_unit.g.dart
# lib/providers/gym_state.dart
# lib/screens/gym_mode.dart
# lib/widgets/dashboard/calendar.dart
# lib/widgets/routines/gym_mode/gym_mode.dart
# lib/widgets/routines/gym_mode/log_page.dart
# lib/widgets/routines/gym_mode/session_page.dart
# lib/widgets/routines/log.dart
# pubspec.lock
# pubspec.yaml
# test/core/settings_test.mocks.dart
# test/core/validators_test.mocks.dart
# test/exercises/contribute_exercise_test.dart
# test/exercises/contribute_exercise_test.mocks.dart
# test/exercises/exercises_detail_widget_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.mocks.dart
# test/nutrition/nutritional_plans_screen_test.mocks.dart
# test/providers/plate_calculator_test.dart
# test/routine/forms/session_form_test.mocks.dart
# test/routine/gym_mode/gym_mode_test.mocks.dart
# test/routine/gym_mode/session_page_test.dart
# test/routine/gym_mode_screen_test.dart
# test/user/provider_test.mocks.dart
# test/weight/weight_provider_test.mocks.dart
# test/weight/weight_screen_test.mocks.dart
2025-12-04 12:48:40 +01:00
Roland Geider
556713319c
Correctly calculate the total number of pages
2025-12-02 16:55:25 +01:00
Roland Geider
909b85c850
Merge conflicts
2025-12-02 13:12:38 +01:00
Roland Geider
56cdffb010
Merge branch 'master' into feature/gym-mode
...
# Conflicts:
# integration_test/3_gym_mode.dart
# ios/Podfile.lock
# lib/screens/gym_mode.dart
# pubspec.yaml
2025-12-02 12:35:32 +01:00
Roland Geider
60cb00945c
Small cleanups and optimizations
2025-12-01 23:00:23 +01:00
Roland Geider
7f9d09492b
Add workflows to automatically update screenshots
...
These are also now tracked with git-lfs
2025-11-29 17:14:37 +01:00
Roland Geider
4a36b1de96
Expand logic to support screenshot generation for iOS
2025-11-27 18:16:29 +01:00
Roland Geider
b291329350
Add workout stats screen to the screenshot / integration tests
...
Still need to decide if we want to keep the start page one, since it's
a bit... bare
2025-11-27 16:29:51 +01:00
Roland Geider
3119429a02
Cleanup, tests, etc
2025-11-17 14:36:47 +01:00
Roland Geider
a4909bd99c
Rename some tests
2025-11-15 18:20:22 +01:00
Roland Geider
e1359d0c51
Add a new riverpod provider for the routines
...
This is not a wrapper around the old one, which was making problems.
Delete unneeded generated files as well.
2025-11-10 15:37:59 +01:00
Roland Geider
49873d20bd
Cleanup some of the models
2025-11-08 23:07:40 +01:00
Roland Geider
4a2047ec8b
Edit sessions with the new sessions provider
2025-11-08 17:15:17 +01:00
Roland Geider
dd3f993d11
Remove old exercises provider 🥲
2025-11-04 22:26:30 +01:00
Roland Geider
1e9e5ab24c
Fix some more tests
2025-11-04 16:15:06 +01:00
Roland Geider
d255cdb573
Consolidate body weight repositories and other providers, cleanup
2025-10-23 22:19:31 +02:00
Roland Geider
8b8c4626eb
Powersync seems to be working now
2025-10-23 15:32:21 +02:00
Roland Geider
4d2083f05a
Update body weight provider to use riverpod
2025-10-21 12:04:59 +02:00
Roland Geider
93a11a16e4
Recreate generated files and reformat the repo
...
Seems the default dart formatting rules changed recently, and this was causing
huge diffs in branches
2025-10-09 17:39:02 +02:00
Roland Geider
d987b6c652
Update screenshots
2025-09-23 12:01:38 +02:00
Roland Geider
4330e51f86
Retrieve the current routine dynamically
...
This behaviour is now the same as the nutritional plans.
2025-09-05 22:47:27 +02:00
Roland Geider
65e5ad3cbd
Add missing languages
2025-06-17 20:29:16 +02:00
Roland Geider
d2dd9c144d
Fix some paths and recreate generated files
2025-05-16 18:01:30 +02:00
Roland Geider
7324f1b679
Set destination back to phone screenshots
2025-03-19 12:21:47 +01:00
Roland Geider
7f2b9c7488
Update screenshots
2025-03-19 11:07:55 +01:00
Roland Geider
87b3ba8072
Add Serbian to list of languages
2025-03-19 10:43:31 +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
65cccbe824
Update language list
2025-01-31 16:38:00 +01:00
Roland Geider
bfcc793e1c
Fix integration tests
2025-01-31 16:21:57 +01:00
Roland Geider
654fe613c6
Rename some more files
2025-01-18 19:01:17 +01:00
Roland Geider
5a39c6c229
Rename some functions, a bit of cleanup
2025-01-10 15:52:26 +01:00
Roland Geider
b0e1da49b9
Some renaming for consistency
2025-01-06 22:34:30 +01:00
Roland Geider
ad5d1be306
Pass the necessary IDs to the gym mode and load the rest of the data
2025-01-05 16:35:16 +01:00
Roland Geider
277628f329
Merge branch 'master' into feature/flexible-routines
...
# Conflicts:
# test/weight/weight_screen_test.mocks.dart
2024-11-14 20:30:19 +01:00
Roland Geider
9e9fa6be93
Allow setting the day order per drag and drop
2024-11-12 16:27:53 +01:00
Roland Geider
47e36eff48
More refactoring of routine screens and widgets
2024-11-10 15:13:30 +01:00
Roland Geider
5c947375ee
Rename provider
2024-11-10 14:48:03 +01:00
Roland Geider
4673bb5a64
Update screenshots
2024-11-09 13:08:29 +01:00
Roland Geider
9ff2bba13a
Load the new DayData entries and the regular data objects from structure endpoint
2024-10-30 23:19:10 +01:00
Roland Geider
7db93f0b6e
Start implementing new flexible routines
2024-10-30 12:14:26 +01:00
Dieter Plaetinck
66ced6ccc4
dcm fix --only-rules=prefer-trailing-comma lib test test_data integration_test
2024-09-18 16:00:43 +03:00
Dieter Plaetinck
11ee38c03d
dart fix --apply
2024-06-20 15:47:55 +03:00
Roland Geider
9222837be2
Update Gemfile.lock
2024-06-18 17:41:28 +02:00
Roland Geider
36928d540c
Update screenshots
2024-05-12 16:09:27 +02:00
Roland Geider
9ff0eae355
Add missing user provider to make screenshot generation work again
2024-05-12 14:53:38 +02:00
Roland Geider
9b0985fbf3
Add chart for percentage of logged nutritional values for meals
2024-02-23 19:19:13 +01:00
Roland Geider
faf1018f2a
Fixes for flutter typeahead 5.1.0
...
Also, add some models for the API response from the search
2024-01-29 12:07:26 +01:00
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
