diff --git a/lib/config/customer_routes.dart b/lib/config/customer_routes.dart index 54565f4..609ab7d 100644 --- a/lib/config/customer_routes.dart +++ b/lib/config/customer_routes.dart @@ -1,4 +1,5 @@ import 'package:mc_common_app/models/requests_models/offers_model.dart'; +import 'package:mc_common_app/models/requests_models/request_model.dart'; import 'package:mc_common_app/views/appointments/appointment_detail_view.dart'; import 'package:mc_common_app/views/appointments/book_appointment_schedules_view.dart'; import 'package:mc_common_app/views/appointments/book_appointment_services_view.dart'; @@ -44,9 +45,11 @@ class CustomerAppRoutes { AppRoutes.paymentMethodsView: (context) => PaymentMethodsView(paymentType: ModalRoute.of(context)!.settings.arguments as PaymentTypes), AppRoutes.branchDetailPage: (context) => BranchDetailPage(branchDetailModel: ModalRoute.of(context)!.settings.arguments as BranchDetailModel), AppRoutes.providerProfilePage: (context) => ProviderProfilePage(providerId: ModalRoute.of(context)!.settings.arguments as int), - AppRoutes.offersListPage: (context) => OfferListPage(offersList: ModalRoute.of(context)!.settings.arguments as List), + AppRoutes.offersListPage: (context) => OfferListPage(offerListPageArguments: ModalRoute.of(context)!.settings.arguments as OfferListPageArguments), AppRoutes.createRequestPage: (context) => CreateRequestPage(), - AppRoutes.chatView: (context) => ChatView(), + AppRoutes.chatView: (context) => ChatView( + chatViewArguments: ModalRoute.of(context)!.settings.arguments as ChatViewArguments, + ), AppRoutes.settingOptionsFaqs: (context) => SettingOptionsFAQs(), AppRoutes.settingOptionsLanguages: (context) => SettingOptionsLanguage(), AppRoutes.settingOptionsInviteFriends: (context) => SettingOptionsInviteFriends(), diff --git a/lib/main.dart b/lib/main.dart index c5591af..5f0143b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -13,7 +13,7 @@ import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state.dart'; import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/config/routes.dart'; -import 'package:mc_common_app/models/general/post_params_model.dart'; +import 'package:mc_common_app/models/general_models/post_params_model.dart'; import 'package:mc_common_app/repositories/ads_repo.dart'; import 'package:mc_common_app/repositories/common_repo.dart'; import 'package:mc_common_app/repositories/payments_repo.dart'; diff --git a/lib/views/dashboard/dashboard_page.dart b/lib/views/dashboard/dashboard_page.dart index bfcfffa..eeaed6d 100644 --- a/lib/views/dashboard/dashboard_page.dart +++ b/lib/views/dashboard/dashboard_page.dart @@ -16,7 +16,7 @@ import 'package:car_customer_app/views/dashboard/widgets/bottom_nav_bar.dart'; import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/routes.dart'; -import 'package:mc_common_app/models/general/widgets_models.dart'; +import 'package:mc_common_app/models/general_models/widgets_models.dart'; import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/view_models/ad_view_model.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; @@ -136,6 +136,7 @@ class _DashboardPageState extends State { children: [ "${AppState().currentAppType}".toText(color: MyColors.darkTextColor).onPress(() { print("myId: ${AppState().getUser.data!.userInfo!.userId}"); + // context.read().buildHubConnection(); }), 10.width, MyAssets.notificationsBellIcon.buildSvg().onPress(() {}),