mirror of
https://github.com/wger-project/flutter.git
synced 2026-02-18 00:17:48 +01:00
98f2fb0096
# 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