Merge remote-tracking branch 'refs/remotes/origin/calendar'

# Conflicts:
#	lib/app_router.dart
#	lib/features/calendar/services/calendar_service.dart
#	lib/features/diary/presentation/bloc/diary_bloc.dart
#	lib/features/diary/services/diary_service.dart
#	lib/locator_service.dart
#	lib/main.dart
This commit is contained in:
mso7nueh
2024-07-31 13:49:24 +03:00
18 changed files with 312 additions and 627 deletions

View File

@@ -22,19 +22,21 @@ class CustomNavigationMenu extends StatelessWidget {
icon: ImageConstant.imgRecipes,
text: 'Мои рецепты',
onTap: () => GoRouter.of(context).push('/recipe-select-screen'),
// Действие при нажатии на "Мои рецепты"
),
MenuItem(
icon: ImageConstant.imgDiets,
text: 'Мои диеты',
onTap: () => GoRouter.of(context).push('/diet-select-screen'),
// Действие при нажатии на "Мои рецепты"
),
MenuItem(
icon: ImageConstant.imgPlans,
text: 'Мои планы',
onTap: () => GoRouter.of(context).push('/plan-select-screen'),
// Действие при нажатии на "Мои рецепты"
),
MenuItem(
icon: ImageConstant.imgRecipes,
text: 'Календарь',
onTap: () => GoRouter.of(context).push('/calendar-screen'),
),
MenuItem(
icon: ImageConstant.imgFinance,
@@ -44,15 +46,12 @@ class CustomNavigationMenu extends StatelessWidget {
MenuItem(
icon: ImageConstant.imgSupport,
text: 'Поддержка',
onTap: () {
// Действие при нажатии на "Поддержка"
},
onTap: () {},
),
MenuItem(
icon: ImageConstant.imgExit,
text: 'Выход',
onTap: _onTapLogout(context),
// Действие при нажатии на "Выход"
),
],
),