Hasan/eatvio_app
1
0
Fork 0
forked from eatvio/eatvio_app
Code Pull Requests Activity

Merge pull request 'main' (#237) from BLoC/eatvio_app:main into main

Browse Source 
Reviewed-on: eatvio/eatvio_app#237
This commit is contained in:
BLoC
2025-03-03 08:06:45 +00:00
parent 789afcfb76 cebbb4fb2d
commit ae6b2612d7
12 changed files with 749 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/core/app_router.dart
View File

@@ -29,6 +29,9 @@ import 'package:eatvio_app/features/feed/presentation/pages/feed_screen.dart';
import 'package:eatvio_app/features/glossary/presentation/pages/glossary_screen.dart';
import 'package:eatvio_app/features/menu/presentation/pages/menu_screen.dart';
import 'package:eatvio_app/features/my_diets/presentation/my_diets_screen.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/card_settings.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/consultant_finance_screen.dart';
import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart';
import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart';
import 'package:eatvio_app/features/notifications/presentation/pages/notifications_screen.dart';
import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
@@ -138,10 +141,34 @@ class AppRouter {
GoRoute(
path: '/menu-screen',
name: 'menuScreen',
pageBuilder: (context, state) => NoTransitionPage(child: MenuScreen()),
pageBuilder: (context, state) => NoTransitionPage(
child: BlocBuilder<ProfileAvatarCubit, ProfileAvatarState>(
builder: (BuildContext context, ProfileAvatarState state) {
if (state is ProfileAvatarStateLoaded) {
return MenuScreen(profileModel: state.profile);
}
return SizedBox.shrink();
},
),
),
),
],
),
GoRoute(
path: '/consultant-finance-screen',
name: 'consultantFinanceScreen',
builder: (context, state) => ConsultantFinanceScreen(),
),
GoRoute(
path: '/user-finance-screen',
name: 'userFinanceScreen',
builder: (context, state) => UserFinanceScreen(),
),
GoRoute(
path: '/card-settings-screen',
name: 'cardSettingsScreen',
builder: (context, state) => CardSettingsScreen(),
),
GoRoute(
path: '/about-plan-screen',
name: 'aboutPlanScreen',
@@ -156,7 +183,7 @@ class AppRouter {
),
GoRoute(
path: '/glossary-screen',
name: '/glossaryScreen',
name: 'glossaryScreen',
builder: (context, state) => GlossaryScreen(),
),
GoRoute(