From 8fa231d512cf93eb1a1a4ddb4058cb91a7456463 Mon Sep 17 00:00:00 2001 From: maxxkim Date: Wed, 21 Aug 2024 16:26:02 +0300 Subject: [PATCH 1/2] feat(app): Styled new assets --- .../widgets/bottom_navigation_bar_widget.dart | 18 ++++++++++-------- lib/widgets/custom_navigation_menu.dart | 16 ++++++++-------- lib/widgets/custom_navigation_menu_item.dart | 7 ++++++- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart index 5b890281..b3f74075 100644 --- a/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart +++ b/lib/features/bottom_navigation_bar/presentation/widgets/bottom_navigation_bar_widget.dart @@ -85,12 +85,13 @@ class _BottomNavigationBarWidgetState extends State { BottomNavigationBarItem( label: 'Лента', icon: SvgPicture.asset( + colorFilter: ColorFilter.mode(Colors.grey, BlendMode.srcIn), width: 24, height: 24, - ImageConstant.imgFeed, + ImageConstant.icnFeed, ), activeIcon: SvgPicture.asset( - ImageConstant.imgFeed, + ImageConstant.icnFeed, width: 24, height: 24, colorFilter: ColorFilter.mode( @@ -102,12 +103,13 @@ class _BottomNavigationBarWidgetState extends State { BottomNavigationBarItem( label: "diary".tr, icon: SvgPicture.asset( - ImageConstant.imgDiary, + colorFilter: ColorFilter.mode(Colors.grey, BlendMode.srcIn), + ImageConstant.icnDiary, width: 24, height: 24, ), activeIcon: SvgPicture.asset( - ImageConstant.imgDiary, + ImageConstant.icnDiary, width: 24, height: 24, colorFilter: ColorFilter.mode( @@ -129,7 +131,7 @@ class _BottomNavigationBarWidgetState extends State { ), ), child: SvgPicture.asset( - ImageConstant.imgChat, + ImageConstant.icnChat, width: 24, height: 24, colorFilter: currentBottomNavBarIndex == 3 @@ -137,7 +139,7 @@ class _BottomNavigationBarWidgetState extends State { appTheme.blueA400, BlendMode.srcIn, ) - : null, + : ColorFilter.mode(Colors.grey, BlendMode.srcIn), ), ); }, @@ -156,13 +158,13 @@ class _BottomNavigationBarWidgetState extends State { ), ), child: SvgPicture.asset( - ImageConstant.imgBell, + ImageConstant.icnBell, colorFilter: currentBottomNavBarIndex == 4 ? ColorFilter.mode( appTheme.blueA400, BlendMode.srcIn, ) - : null, + : ColorFilter.mode(Colors.grey, BlendMode.srcIn), width: 24, height: 24, ), diff --git a/lib/widgets/custom_navigation_menu.dart b/lib/widgets/custom_navigation_menu.dart index b35d5fbd..eece5f8f 100644 --- a/lib/widgets/custom_navigation_menu.dart +++ b/lib/widgets/custom_navigation_menu.dart @@ -14,42 +14,42 @@ class CustomNavigationMenu extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ MenuItem( - icon: ImageConstant.imgSettings, + icon: ImageConstant.icnProfileSettings, text: 'Настройки профиля', onTap: () => GoRouter.of(context).push('/my-settings-screen'), ), MenuItem( - icon: ImageConstant.imgRecipes, + icon: ImageConstant.icnRecipes, text: 'Мои рецепты', onTap: () => GoRouter.of(context).push('/recipe-select-screen'), ), MenuItem( - icon: ImageConstant.imgDiets, + icon: ImageConstant.icnVeggies, text: 'Мои диеты', onTap: () => GoRouter.of(context).push('/diet-select-screen'), ), MenuItem( - icon: ImageConstant.imgPlans, + icon: ImageConstant.icnPlans, text: 'Мои планы', onTap: () => GoRouter.of(context).push('/plan-select-screen'), ), MenuItem( - icon: ImageConstant.imgRecipes, + icon: ImageConstant.icnPlans, text: 'Календарь', onTap: () => GoRouter.of(context).push('/calendar-screen'), ), MenuItem( - icon: ImageConstant.imgFinance, + icon: ImageConstant.icnGlossary, text: 'Глоссарий', onTap: () => GoRouter.of(context).push('/glossary-screen'), ), MenuItem( - icon: ImageConstant.imgSupport, + icon: ImageConstant.icnSupport, text: 'Поддержка', onTap: () {}, ), MenuItem( - icon: ImageConstant.imgExit, + icon: ImageConstant.icnExit, text: 'Выход', onTap: _onTapLogout(context), ), diff --git a/lib/widgets/custom_navigation_menu_item.dart b/lib/widgets/custom_navigation_menu_item.dart index 44850fa3..06996a3e 100644 --- a/lib/widgets/custom_navigation_menu_item.dart +++ b/lib/widgets/custom_navigation_menu_item.dart @@ -23,7 +23,12 @@ class MenuItem extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, // Выравнивание по центру вертикально children: [ - CustomImageView(imagePath: icon), + CustomImageView( + color: appTheme.blueA400, + imagePath: icon, + height: 24.0, + width: 24.0, + ), SizedBox( width: 8.0, ), // Добавляем небольшой отступ между иконкой и текстом From 6b6ca35fbbada63a6397c865aa394ae881aab94b Mon Sep 17 00:00:00 2001 From: maxxkim Date: Wed, 21 Aug 2024 16:26:26 +0300 Subject: [PATCH 2/2] feat(app): Styled new assets --- lib/widgets/custom_navigation_menu_item.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/widgets/custom_navigation_menu_item.dart b/lib/widgets/custom_navigation_menu_item.dart index 06996a3e..3307daaf 100644 --- a/lib/widgets/custom_navigation_menu_item.dart +++ b/lib/widgets/custom_navigation_menu_item.dart @@ -1,5 +1,4 @@ import 'package:eatvio_app/core/app_export.dart'; -import 'package:eatvio_app/widgets/custom_image_view.dart'; import 'package:flutter/material.dart'; class MenuItem extends StatelessWidget {