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
bc6a5ebdbf
Make common widget for when an image format is not supported
2025-10-16 22:03:40 +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
af482ab9e3
Set a debounce time for TypeAhead-fields (exercises and ingredients)
2025-09-06 22:46:13 +02:00
Roland Geider
1dc3776e7e
Improve video error handling
...
Users now see a smaller error message in the exercise description, instead
of the big general popup.
2025-09-02 14:49:28 +02:00
Roland Geider
b16120cddb
Remove debug output
2025-05-14 14:45:18 +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
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
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
Roland Geider
3ca0c1781f
Add a maximum height for exercise images
2025-03-26 16:24:54 +01:00
Yashas H Majmudar
b2802e3a98
fix: isExpanded variable bool flip
2025-03-25 23:10:05 -04: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
f987de1b4d
Handle case where an exercise has no variations
2025-03-18 14:59:33 +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
5a39c6c229
Rename some functions, a bit of cleanup
2025-01-10 15:52:26 +01:00
Roland Geider
c5f4eec12f
Extract exercise autocompleter to its own widget
2024-11-16 15:16:32 +01:00
Dieter Plaetinck
420f9ae16d
dcm fix --only-rules=avoid-inferrable-type-arguments lib
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
8db1a7c960
dcm fix --only-rules=unnecessary-trailing-comma lib
2024-06-07 14:59:00 +03:00
Dieter Plaetinck
7f74bff32c
dcm fix --only-rules=prefer-trailing-comma lib
2024-06-07 14:59:00 +03: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
Github-actions
0bc5e8e9e6
Automatic linting
2024-01-10 14:45:21 +00: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
acbee49100
Simplify generating translation objects
2023-12-30 17:55:52 +01:00
Roland Geider
b64458603f
Rename further occurrences of "exercise base" to just "exercise"
2023-12-26 21:38:07 +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
29a6839a61
Run dart fix on the code base
2023-11-19 18:49:35 +01:00
Abhishek Saini
c21b278e36
test cases fixes
2023-11-19 16:56:49 +05:30
Abhishek Saini
82a49f6cac
Merge branch 'master' into feat/data-persistence
2023-11-18 23:23:30 +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
Abhishek Saini
582bc611a4
feat(drift-database): Shifted from shared prefs to drift for Exercises
2023-11-16 22:34:40 +05:30
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
Roland Geider
6a1f231e48
Make chips a bit smaller and give them a bit of color
2023-11-09 20:19:19 +01:00
Miroslav Mazel
f31bcc770d
Consts and finals where possible
2023-11-05 23:27:22 +01:00
Miroslav Mazel
420b06a661
Organize imports / remove unnecessary ones
2023-11-05 23:22:34 +01:00
Roland Geider
80ec0e80fb
Start moving to material 3
...
Also dark mode at last
2023-04-22 13:38:13 +02:00
Roland Geider
bf7e2e8956
Move platform check to helper
...
Also, use TargetPlatform since it it better suited for tests (and seems to
be now the recommended way of checking this for UI elements)
2023-04-15 12:17:08 +02:00
Miroslav Mazel
283605eb4b
Platform check for videos library
2023-03-21 21:22:07 +01:00
Roland Geider
f68afd91fd
Rename exercise object to translation
...
This is what they are now anyway and makes it more clear
2023-02-05 21:24:28 +01:00
Roland Geider
e6ea4e6053
Remove unused code
2022-10-01 13:50:58 +02:00
Roland Geider
db479cf4a2
Show exercise aliases
2022-09-10 23:48:05 +02:00
Roland Geider
515defe7f3
Fix merge conflicts
2022-09-07 20:12:21 +02:00
