Roland Geider
98f2fb0096
Merge branch 'master' into powersync
...
# Conflicts:
# Gemfile.lock
# android/settings.gradle
# fastlane/report.xml
# integration_test/1_dashboard.dart
# integration_test/2_workout.dart
# integration_test/3_gym_mode.dart
# integration_test/5_nutritional_plan.dart
# integration_test/6_weight.dart
# lib/helpers/i18n.dart
# lib/helpers/ui.dart
# lib/main.dart
# lib/models/nutrition/meal.g.dart
# lib/models/nutrition/nutritional_plan.dart
# lib/providers/auth.dart
# lib/providers/nutrition.dart
# lib/screens/add_exercise_screen.dart
# lib/screens/auth_screen.dart
# lib/screens/dashboard.dart
# lib/screens/exercises_screen.dart
# lib/screens/home_tabs_screen.dart
# lib/screens/log_meal_screen.dart
# lib/screens/log_meals_screen.dart
# lib/screens/nutritional_plan_screen.dart
# lib/screens/routine_list_screen.dart
# lib/screens/workout_plan_screen.dart
# lib/widgets/add_exercise/steps/step1basics.dart
# lib/widgets/add_exercise/steps/step5images.dart
# lib/widgets/add_exercise/steps/step_2_variations.dart
# lib/widgets/add_exercise/steps/step_3_description.dart
# lib/widgets/add_exercise/steps/step_4_translations.dart
# lib/widgets/core/about.dart
# lib/widgets/core/settings.dart
# lib/widgets/dashboard/calendar.dart
# lib/widgets/dashboard/widgets.dart
# lib/widgets/exercises/exercises.dart
# lib/widgets/gallery/overview.dart
# lib/widgets/measurements/categories_card.dart
# lib/widgets/measurements/charts.dart
# lib/widgets/measurements/entries.dart
# lib/widgets/measurements/forms.dart
# lib/widgets/measurements/helpers.dart
# lib/widgets/nutrition/charts.dart
# lib/widgets/nutrition/forms.dart
# lib/widgets/nutrition/helpers.dart
# lib/widgets/nutrition/meal.dart
# lib/widgets/nutrition/nutritional_diary_table.dart
# lib/widgets/nutrition/nutritional_plan_detail.dart
# lib/widgets/nutrition/nutritional_plans_list.dart
# lib/widgets/nutrition/widgets.dart
# lib/widgets/routines/charts.dart
# lib/widgets/routines/workout_logs.dart
# lib/widgets/weight/forms.dart
# lib/widgets/weight/weight_overview.dart
# lib/widgets/workouts/app_bar.dart
# lib/widgets/workouts/day.dart
# lib/widgets/workouts/forms.dart
# lib/widgets/workouts/gym_mode.dart
# lib/widgets/workouts/workout_plan_detail.dart
# lib/widgets/workouts/workout_plans_list.dart
# linux/flutter/generated_plugin_registrant.cc
# linux/flutter/generated_plugins.cmake
# pubspec.lock
# pubspec.yaml
# test/auth/auth_screen_test.dart
# test/core/settings_test.dart
# test/core/settings_test.mocks.dart
# test/nutrition/nutritional_meal_form_test.mocks.dart
# test/nutrition/nutritional_meal_item_form_test.dart
# test/nutrition/nutritional_plan_form_test.mocks.dart
# test/nutrition/nutritional_plan_screen_test.dart
# test/nutrition/nutritional_plans_screen_test.dart
# test/routine/repetition_unit_form_widget_test.dart
# test/routine/routine_screen_test.dart
# test/routine/routines_screen_test.dart
# test/routine/weight_unit_form_widget_test.dart
# test/workout/gym_mode_screen_test.dart
# test/workout/workout_day_form_test.dart
# test/workout/workout_form_test.dart
# test/workout/workout_set_form_test.dart
2025-10-19 14:48:15 +02:00
Roland Geider
64dc10cdb2
Fix import for localization strings
2025-10-19 14:23:58 +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
Roland Geider
cf1beddb75
Add translated exercises for the screenshots
2024-01-10 22:42:49 +01:00
Roland Geider
9a1a31c248
Update screenshots
2024-01-09 16:47:46 +01:00
Roland Geider
d51b6d7d87
Merge branch 'master' into feat/data-persistence
...
# Conflicts:
# lib/main.dart
# lib/providers/exercises.dart
# lib/widgets/workouts/day.dart
# pubspec.lock
# pubspec.yaml
2024-01-09 15:37:48 +01:00
Roland Geider
c5cbb4f851
Rework exercise database
...
This is now separated into individual tables and methods so that they can be
tested separately
2023-12-26 17:03:20 +01:00
Roland Geider
65ba2275ae
Run "dart format --line-length=100 ." to make the diff smaller
2023-12-23 16:40:05 +01:00
Abhishek Saini
c69c639fac
fix(drift): built a model for exercise and fixes in fromSql type converter
2023-12-23 14:28:38 +05:30
Roland Geider
cf30ad6594
Add tablet screenshots as well
...
While these don't look as pretty as the phone ones, the application is
still usable
2023-11-19 10:59:06 +01:00
Roland Geider
7b076f383a
Update app screenshots
2023-11-18 17:55:30 +01:00
Roland Geider
95f863a0b6
Merge branch 'master' into feature/material-3
...
# Conflicts:
# lib/widgets/nutrition/meal.dart
# lib/widgets/workouts/day.dart
2023-11-10 19:27:27 +01:00
Miroslav Mazel
f31bcc770d
Consts and finals where possible
2023-11-05 23:27:22 +01:00
Roland Geider
43d61ecfbf
Merge branch 'master' into feature/material-3
...
# Conflicts:
# pubspec.yaml
2023-08-10 07:17:27 +02:00
Roland Geider
aecbcfe663
Update models to work with new keys
...
creation_date was renamed to created and
update_date to last_updated
2023-08-08 11:12:55 +02:00
Roland Geider
80ec0e80fb
Start moving to material 3
...
Also dark mode at last
2023-04-22 13:38:13 +02:00
Roland Geider
fa8dd7e46f
Fix merge errors
2023-03-20 14:19:29 +01:00
Roland Geider
fcfa1ceabf
Annotate the needed mocks for each test
...
This makes it clear where they are loaded from
2023-02-11 13:45:42 +01:00
Roland Geider
a977d4ec48
Refactor add_exercise_screen.dart
...
Use the is_trustworthy flag from the server, which also takes the account's age
into account. The widgets in the screen are split so it's easier to test and read
2023-02-07 20:30:09 +01:00
Roland Geider
b1b60b691c
Fix screenshot tests
2023-02-06 22:32:22 +01:00
Roland Geider
12310f4a5c
Remove debug banner from play store screenshots
2023-01-27 19:58:40 +01:00
