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
|
6146201531
|
Allow setting the slot entry type as well
|
2025-10-09 17:28:23 +02:00 |
|
Roland Geider
|
ccbaf0b42a
|
Allow multiple weight entries per day
|
2025-09-26 12:21:50 +02:00 |
|
Dieter Plaetinck
|
20713ee6fc
|
fix tests
|
2025-06-28 17:02:22 +02:00 |
|
Dieter Plaetinck
|
a0e2659e60
|
dart format --line-length=100 .
|
2025-06-27 23:37:56 +02:00 |
|
Dieter Plaetinck
|
1e5b44c0f5
|
fix tests part 1
|
2025-06-27 23:36:52 +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
|
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 |
|
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
|
14a5d7285b
|
Extract the day data for the current routine
instead of loading the same data from the server
|
2025-02-16 21:19:17 +01:00 |
|
Roland Geider
|
460b6e7125
|
Add smoke test for fetchAndSetRoutineFull
|
2025-02-02 22:38:05 +01:00 |
|
Roland Geider
|
2498183094
|
Rename further instances of "reps" to "repetitions"
|
2025-02-01 19:24:15 +01:00 |
|
Roland Geider
|
323b18320f
|
Rename key to be more consistent
|
2025-02-01 15:34:00 +01:00 |
|
Roland Geider
|
5058498c4f
|
Allow passing all parameters to the WorkoutSession constructor
|
2025-01-31 16:24:56 +01:00 |
|
Roland Geider
|
4bd16f5c0d
|
Remove logs from the routine
The logs are now in the session list and can be easily extracted if needed
|
2025-01-30 18:21:09 +01:00 |
|
Roland Geider
|
3a398d0f36
|
Simplify arguments for routine objects and add a smoke test
|
2025-01-18 19:37:33 +01:00 |
|
Roland Geider
|
9ab55a6c83
|
Save iteration and slot entry id to the logs
|
2025-01-18 16:46:08 +01:00 |
|
Roland Geider
|
c397e10e3f
|
Fix tests
|
2025-01-18 14:40:13 +01:00 |
|
Roland Geider
|
5d542c51d9
|
Use updated name of repetition in API response
Also use the same name locally for more consistency
|
2025-01-14 20:41:40 +01:00 |
|
Roland Geider
|
5a39c6c229
|
Rename some functions, a bit of cleanup
|
2025-01-10 15:52:26 +01:00 |
|
Roland Geider
|
6d970052ef
|
Update the routine test data
|
2025-01-07 22:35:36 +01:00 |
|
Roland Geider
|
6e7284e104
|
Update the routine test data
|
2025-01-07 21:42:26 +01:00 |
|
Roland Geider
|
b0e1da49b9
|
Some renaming for consistency
|
2025-01-06 22:34:30 +01:00 |
|
Roland Geider
|
ca6c682483
|
Remove more unused code
|
2025-01-05 20:17:26 +01:00 |
|
Roland Geider
|
056ed2b894
|
Allow day objects to load slots
|
2024-11-12 22:08:45 +01:00 |
|
Dieter Plaetinck
|
5c44678557
|
WIP: use new string id's for nutrition stuff so we can use powersync
|
2024-11-01 17:48:19 +02: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
|
a79b6d6b4e
|
Start implementing new flexible routines
|
2024-10-30 19:17:51 +01:00 |
|
Roland Geider
|
7db93f0b6e
|
Start implementing new flexible routines
|
2024-10-30 12:14:26 +01:00 |
|
Dieter Plaetinck
|
85c245d67d
|
dcm fix --only-rules=unnecessary-trailing-comma lib test test_data
|
2024-09-18 16:01:10 +03: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
|
d06ecabadf
|
use ingredientinfo api, for image + new source and remote id fields
also update fixtures accordingly
|
2024-07-12 13:50:04 +03:00 |
|
Roland Geider
|
5d237e1ddf
|
Consistently use "fiber"
|
2024-05-23 17:54:50 +02:00 |
|
Roland Geider
|
239e1a1caa
|
Consistently use "fibers" instead of "fibres"
|
2024-05-20 22:06:47 +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 |
|
Dieter Plaetinck
|
578d56a0df
|
fix tests, introduce golden tests
to make golden tests work, we no longer plot the "now time" for "other logs"
this was pretty silly anyway...
|
2024-05-08 22:48:26 +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
|
9c7b65bc49
|
Allow users to quickly increment the body weight
|
2024-02-17 18:48:48 +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
|
d4e4f3384a
|
Use the user's preferred unit for body weight
|
2024-01-23 16:33:32 +01:00 |
|
Roland Geider
|
dd12e040e9
|
Fun "dart fix"
|
2024-01-22 09:55:29 +01:00 |
|
Roland Geider
|
802da6aa1c
|
Don't use ExerciseBase anymore...
|
2024-01-11 11:28:25 +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
|
b64458603f
|
Rename further occurrences of "exercise base" to just "exercise"
|
2023-12-26 21:38:07 +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
|
c514842b59
|
Lint the code with a line length of 100
This makes it easier to understand the diffs
|
2023-11-16 21:36:21 +01:00 |
|