model classes renamed

lib/config/provider_routes.dart

@@ -24,7 +24,7 @@ import 'package:mc_common_app/config/routes.dart';
 import 'package:mc_common_app/models/advertisment_models/ad_details_model.dart';
 
 import 'package:flutter/material.dart';
-import 'package:mc_common_app/models/model/provider_model.dart';
+
 import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
 import 'package:mc_common_app/views/advertisement/ads_detail_view.dart';
 import 'package:mc_common_app/views/advertisement/create_ad_view.dart';
@@ -66,15 +66,22 @@ class ProviderAppRoutes {
   static final Map<String, WidgetBuilder> routes = {
     //Home page
     AppRoutes.dashboard: (context) => const DashboardPage(),
-    AppRoutes.adsDetailView: (context) => AdsDetailView(adDetails: ModalRoute.of(context)!.settings.arguments as AdDetailsModel),
+    AppRoutes.adsDetailView: (context) => AdsDetailView(
+        adDetails:
+            ModalRoute.of(context)!.settings.arguments as AdDetailsModel),
     AppRoutes.createAdView: (context) => const CreateAdView(),
 
     //setting
     defineLicense: (context) => DefineLicensePage(),
     dealershipSetting: (context) => DealershipPage(),
     // branchList: (context) => BranchListPage(),
-    defineBranch: (context) => DefineBranchPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as BranchDetailModel)),
-    branchDetail: (context) => BranchDetailPage(ModalRoute.of(context)!.settings.arguments as BranchDetailModel),
+    defineBranch: (context) => DefineBranchPage(
+        (ModalRoute.of(context)!.settings.arguments) == null
+            ? null
+            : (ModalRoute.of(context)!.settings.arguments
+                as BranchDetailModel)),
+    branchDetail: (context) => BranchDetailPage(
+        ModalRoute.of(context)!.settings.arguments as BranchDetailModel),
 
     //Appointments
     appointmentDetailList: (context) => const AppointmentDetailListPage(),
@@ -89,19 +96,31 @@ class ProviderAppRoutes {
     AppRoutes.subscriptionsPage: (context) => const SubscriptionsPage(),
 
     //Services
-    dealerUser: (context) => DealerUserPage(ModalRoute.of(context)!.settings.arguments as String),
+    dealerUser: (context) =>
+        DealerUserPage(ModalRoute.of(context)!.settings.arguments as String),
     servicesList: (context) => const ServicesListPage(),
     itemsList: (context) => ItemsListPage(),
     createItem: (context) => const CreateItemPage(),
     //createServices: (context) => CreateServicesPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as ServiceProviderBranch)),
     //createServices2: (context) => CreateServicesPage2((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as ServiceProviderBranch)),
-    createServices3: (context) => CreateServicesPage3((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as CreateBranchModel)),
+    createServices3: (context) => CreateServicesPage3(
+        (ModalRoute.of(context)!.settings.arguments) == null
+            ? null
+            : (ModalRoute.of(context)!.settings.arguments
+                as CreateBranchModel)),
 
     //Schedules
-    schedulesList: (context) => SchedulesListPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as String)),
+    schedulesList: (context) => SchedulesListPage(
+        (ModalRoute.of(context)!.settings.arguments) == null
+            ? null
+            : (ModalRoute.of(context)!.settings.arguments as String)),
     addSchedule: (context) => AddSchedulesPage(),
 
     //Branch Duplication
-    matchServices: (context) => MatchedServicesPage((ModalRoute.of(context)!.settings.arguments) == null ? null : (ModalRoute.of(context)!.settings.arguments as MatchServicesArguments)),
+    matchServices: (context) => MatchedServicesPage(
+        (ModalRoute.of(context)!.settings.arguments) == null
+            ? null
+            : (ModalRoute.of(context)!.settings.arguments
+                as MatchServicesArguments)),
   };
 }

lib/main.dart

@@ -15,7 +15,7 @@ import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/dependencies.dart';
 import 'package:mc_common_app/config/routes.dart';
-import 'package:mc_common_app/models/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/request_repo.dart';
@@ -88,13 +88,13 @@ Future<void> main() async {
           commonRepo: injector.get<CommonRepo>(),
         ),
       ),
-      ChangeNotifierProvider<RequestsVM>(
-        create: (_) => RequestsVM(
-          commonServices: injector.get<CommonAppServices>(),
-          commonRepo: injector.get<CommonRepo>(),
-          requestRepo: injector.get<RequestRepo>(),
-        ),
-      ),
+      // ChangeNotifierProvider<RequestsVM>(
+      //   create: (_) => RequestsVM(
+      //     commonServices: injector.get<CommonAppServices>(),
+      //     commonRepo: injector.get<CommonRepo>(),
+      //     requestRepo: injector.get<RequestRepo>(),
+      //   ),
+      // ),
     ],
     child: const MyApp(),
   ).setupLocale());

lib/repositories/branch_repo.dart

@@ -8,14 +8,16 @@ import 'package:mc_common_app/classes/app_state.dart';
 
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/dependencies.dart';
-import 'package:mc_common_app/models/m_response.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+
+
 
-import 'package:mc_common_app/models/model/provider_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/branch.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/document.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/services.dart';
+import 'package:mc_common_app/models/provider_branches_models/provider_model.dart';
 
 abstract class BranchRepo {
   Future<MResponse> createBranch(String branchName, String branchDescription, String cityId, String address, String latitude, String longitude);

lib/repositories/items_repo.dart

@@ -4,8 +4,9 @@ import 'package:mc_common_app/api/api_client.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/dependencies.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/services/item_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
+
 
 abstract class ItemsRepo {
   Future<MResponse> createServiceItems(Map map);

lib/repositories/schedule_repo.dart

@@ -1,10 +1,10 @@
+import 'package:mc_common_app/models/appointments_models/schedule_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/services.dart';
-import 'package:mc_common_app/models/schedule_model.dart';
 import 'package:mc_common_app/api/api_client.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/dependencies.dart';
-import 'package:mc_common_app/models/m_response.dart';
 
 abstract class ScheduleRepo {
   Future<Services> getAllServices(String branchId);

lib/repositories/subscription_repo.dart

@@ -3,8 +3,8 @@ import 'package:mc_common_app/api/api_client.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/dependencies.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/subscription_model.dart';
+import 'package:mc_common_app/models/subscriptions_models/subscription_model.dart';
+
 
 abstract class SubscriptionRepo {
   Future<SubscriptionModel> getAllSubscriptions(String? serviceProviderID);

lib/view_models/dashboard_view_model.dart

@@ -5,7 +5,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/generated/locale_keys.g.dart';
-import 'package:mc_common_app/models/user/image_response.dart';
+import 'package:mc_common_app/models/user_models/image_response.dart';
 import 'package:mc_common_app/repositories/user_repo.dart';
 import 'package:mc_common_app/services/common_services.dart';
 import 'package:mc_common_app/utils/location/Location.dart';

lib/view_models/items_view_model.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
 import 'package:car_provider_app/repositories/items_repo.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/services/item_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
 import 'package:mc_common_app/services/common_services.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/view_models/schedule_view_model.dart

@@ -1,8 +1,8 @@
+import 'package:mc_common_app/models/appointments_models/schedule_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/services.dart';
-import 'package:mc_common_app/models/schedule_model.dart';
 import 'package:car_provider_app/repositories/schedule_repo.dart';
 import 'package:car_provider_app/views/settings/schedule/widgets/chips_picker_item.dart';
-import 'package:mc_common_app/models/m_response.dart';
 
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/view_models/base_view_model.dart';

lib/view_models/service_view_model.dart

@@ -240,23 +240,26 @@ import 'dart:io';
 
 import 'package:car_provider_app/repositories/branch_repo.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/model/provider_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+
 import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/document.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/services.dart';
-import 'package:mc_common_app/models/services/item_model.dart';
-import 'package:mc_common_app/models/services/service_model.dart';
-import 'package:mc_common_app/models/user/cities.dart';
-import 'package:mc_common_app/models/user/country.dart';
+import 'package:mc_common_app/models/provider_branches_models/provider_model.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
+import 'package:mc_common_app/models/services_models/service_model.dart';
+import 'package:mc_common_app/models/user_models/branch_user.dart';
+
+import 'package:mc_common_app/models/user_models/cities.dart';
+import 'package:mc_common_app/models/user_models/country.dart';
 import 'package:mc_common_app/repositories/common_repo.dart';
 import 'package:mc_common_app/services/common_services.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/utils.dart';
 import 'package:mc_common_app/view_models/base_view_model.dart';
 import 'package:mc_common_app/widgets/dropdown/dropdow_field.dart';
-import 'package:mc_common_app/models/user/branch_user.dart';
+
 
 class ServiceVM extends BaseVM {
   final BranchRepo branchRepo;

lib/view_models/subscriptions_view_model.dart

@@ -1,6 +1,6 @@
 
 import 'package:car_provider_app/repositories/subscription_repo.dart';
-import 'package:mc_common_app/models/subscription_model.dart';
+import 'package:mc_common_app/models/subscriptions_models/subscription_model.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/view_models/base_view_model.dart';
 import 'package:mc_common_app/widgets/dropdown/dropdow_field.dart';

lib/views/dashboard/dashboard_page.dart

@@ -38,7 +38,7 @@ class _DashboardPageState extends State<DashboardPage> {
     super.initState();
     dashboardVM = Provider.of<DashboardVM>(context, listen: false);
     scheduleMicrotask(() {
-      context.read<RequestsVM>().populateRequestsFilterList();
+      // context.read<RequestsVM>().populateRequestsFilterList();
       _onRefresh();
     });
   }
@@ -75,6 +75,9 @@ class _DashboardPageState extends State<DashboardPage> {
         onRefresh: () async {
           _onRefresh();
         },
+        onNotificaitonClick: () {
+          _onRefresh();
+        },
       ),
       AdsFragment(
         onBackButtonTapped: () {

lib/views/dashboard/fragments/home_fragment.dart

@@ -17,10 +17,10 @@ import 'package:provider/provider.dart';
 import '../widget/appointment_slider_widget.dart';
 
 class HomeFragment extends StatelessWidget {
-  VoidCallback onTap;
+  VoidCallback onTap,onNotificaitonClick;
   RefreshCallback onRefresh;
 
-  HomeFragment({required this.onTap, required this.onRefresh, Key? key}) : super(key: key);
+  HomeFragment({required this.onTap, required this.onRefresh,required this.onNotificaitonClick, Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -32,7 +32,7 @@ class HomeFragment extends StatelessWidget {
         onTap: onTap,
         actions: [
           IconButton(
-            onPressed: () {},
+            onPressed: onNotificaitonClick,
             icon: const b.Badge(
               badgeContent: Text(
                 '3',

lib/views/dashboard/fragments/request_list_fragment.dart

@@ -52,50 +52,50 @@ class RequestListFragment extends StatelessWidget {
               selectedColor: MyColors.darkPrimaryColor,
             ),
             12.height,
-            Expanded(
-              child: Consumer(builder: (BuildContext context, RequestsVM requestsVM, Widget? child) {
-                return Column(
-                  children: [
-                    ShowFillButton(
-                        title: "title",
-                        onPressed: () {
-                          context.read<RequestsVM>().getRequests();
-                        }),
-                    16.height,
-                    FiltersList(
-                      filterList: requestsVM.requestsFilterOptions,
-                      onFilterTapped: (index, selectedFilterId) => requestsVM.applyFilterOnRequestsVM(index: index),
-                    ),
-                    8.height,
-                    Expanded(
-                      child: requestsVM.isRequestLoading
-                          ? const Center(child: CircularProgressIndicator())
-                          : requestsVM.requests.isEmpty
-                          ? Center(
-                        child: "No Request Available".toText(
-                          isBold: true,
-                        ),
-                      )
-                          : ListView.separated(
-                        itemBuilder: (context, index) {
-                          return RequestItem(requestsVM.requests[index]);
-                        },
-                        separatorBuilder: (context, index) {
-                          return 16.height;
-                        },
-                        itemCount: requestsVM.requests.length,
-                        padding: const EdgeInsets.only(
-                          left: 16,
-                          right: 16,
-                          bottom: 16,
-                          top: 8,
-                        ),
-                      ),
-                    )
-                  ],
-                );
-              }),
-            ),
+            // Expanded(
+            //   child: Consumer(builder: (BuildContext context, RequestsVM requestsVM, Widget? child) {
+            //     return Column(
+            //       children: [
+            //         ShowFillButton(
+            //             title: "title",
+            //             onPressed: () {
+            //               context.read<RequestsVM>().getRequests();
+            //             }),
+            //         16.height,
+            //         FiltersList(
+            //           filterList: requestsVM.requestsFilterOptions,
+            //           onFilterTapped: (index, selectedFilterId) => requestsVM.applyFilterOnRequestsVM(index: index),
+            //         ),
+            //         8.height,
+            //         Expanded(
+            //           child: requestsVM.isRequestLoading
+            //               ? const Center(child: CircularProgressIndicator())
+            //               : requestsVM.requests.isEmpty
+            //               ? Center(
+            //             child: "No Request Available".toText(
+            //               isBold: true,
+            //             ),
+            //           )
+            //               : ListView.separated(
+            //             itemBuilder: (context, index) {
+            //               return RequestItem(requestsVM.requests[index]);
+            //             },
+            //             separatorBuilder: (context, index) {
+            //               return 16.height;
+            //             },
+            //             itemCount: requestsVM.requests.length,
+            //             padding: const EdgeInsets.only(
+            //               left: 16,
+            //               right: 16,
+            //               bottom: 16,
+            //               top: 8,
+            //             ),
+            //           ),
+            //         )
+            //       ],
+            //     );
+            //   }),
+            // ),
             // const Padding(
             //   padding: EdgeInsets.symmetric(horizontal: 21),
             //   child: RequestListCardWidget(

lib/views/dashboard/widget/drawer_widget.dart

@@ -12,7 +12,7 @@ import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/routes.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/user/image_response.dart';
+import 'package:mc_common_app/models/user_models/image_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/views/settings/branch/branch_detail_page.dart

@@ -14,7 +14,6 @@ import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/config/routes.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/model/provider_model.dart';
 import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart';
 import 'package:mc_common_app/theme/colors.dart';

lib/views/settings/branch/branch_list_page.dart

@@ -11,7 +11,7 @@ import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';

lib/views/settings/branch/dealer/dealer_user_page.dart

@@ -4,8 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/user/branch_user.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/views/settings/branch/dealer/widget/add_phone_num_wiget.dart

@@ -5,7 +5,7 @@ import 'package:car_provider_app/generated/locale_keys.g.dart';
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/user/country.dart';
+import 'package:mc_common_app/models/user_models/country.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/views/settings/branch/dealer/widget/assign_dealer_user_sheet.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';

lib/views/settings/branch/define_branch_page.dart

@@ -7,8 +7,7 @@ import 'package:car_provider_app/view_models/branch_view_model.dart';
 import 'package:car_provider_app/views/location/pick_location_page.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/model/provider_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';

lib/views/settings/define_license_page.dart

@@ -11,7 +11,7 @@ import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:mc_common_app/generated/locale_keys.g.dart';
-import 'package:mc_common_app/models/m_response.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/AppPermissionHandler.dart';
 import 'package:mc_common_app/utils/enums.dart';

lib/views/settings/schedule/add_schedules_page.dart

@@ -7,8 +7,8 @@ import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/schedule_model.dart';
+import 'package:mc_common_app/models/appointments_models/schedule_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/date_helper.dart';
 import 'package:mc_common_app/utils/utils.dart';
@@ -283,6 +283,7 @@ class AddSchedulesPage extends StatelessWidget {
       days.add(element.id);
     }
 
+    //TODO: needs to verify with Zahoor about appointment type while creating Schedule
     var map = {
       "scheduleName": name,
       "serviceProviderBranchID": scheduleData.branchId,
@@ -293,6 +294,7 @@ class AddSchedulesPage extends StatelessWidget {
       "slotDurationMinute": slotsTime,
       "perSlotAppointment": appointmentPerSlot,
       "deliveryServiceType": 1,
+      "appointmentType": 1,
       "weeklyOffDays": days
     };
 

lib/views/settings/schedule/schedules_list_page.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/schedule_model.dart';
+import 'package:mc_common_app/models/appointments_models/schedule_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/date_helper.dart';
 import 'package:mc_common_app/utils/navigator.dart';

lib/views/settings/services/create_item_page.dart

@@ -4,9 +4,8 @@ import 'package:car_provider_app/view_models/items_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
-
-import 'package:mc_common_app/models/services/item_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/AppPermissionHandler.dart';
 import 'package:mc_common_app/utils/date_helper.dart';

lib/views/settings/services/create_services_page3.dart

@@ -5,7 +5,7 @@ import 'package:car_provider_app/views/settings/services/services_list_page.dart
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/m_response.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/views/settings/services/duplication/matched_services_page.dart

@@ -8,8 +8,8 @@ import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:mc_common_app/models/m_response.dart';
-import 'package:mc_common_app/models/services/item_model.dart';
+import 'package:mc_common_app/models/general_models/m_response.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/utils/utils.dart';

lib/views/settings/services/duplication/sheet/items_selection_sheet.dart

@@ -2,7 +2,7 @@ import 'package:car_provider_app/view_models/service_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/services/item_model.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/navigator.dart';
 import 'package:mc_common_app/widgets/button/show_fill_button.dart';

lib/views/settings/services/items_list_page.dart

@@ -5,10 +5,8 @@ import 'package:flutter/material.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/model/provider_model.dart';
-
-import 'package:mc_common_app/models/services/item_model.dart';
-import 'package:mc_common_app/models/services/service_model.dart';
+import 'package:mc_common_app/models/services_models/item_model.dart';
+import 'package:mc_common_app/models/services_models/service_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';
@@ -114,7 +112,7 @@ class ItemsListPage extends StatelessWidget {
                   context,
                   ProviderAppRoutes.createItem,
                   arguments: ItemData(
-                    serviceProviderServiceId: serviceProviderService!.serviceId,
+                    serviceProviderServiceId: serviceProviderService!.serviceProviderServiceId,
                   ),
                 );
               },

lib/views/settings/services/services_list_page.dart

@@ -5,7 +5,7 @@ import 'package:flutter_svg/svg.dart';
 import 'package:mc_common_app/classes/consts.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart';
-import 'package:mc_common_app/models/services/service_model.dart';
+import 'package:mc_common_app/models/services_models/service_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';

lib/views/subscriptions/widget/subscriptions_card.dart

@@ -2,7 +2,7 @@
 import 'package:flutter/material.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
-import 'package:mc_common_app/models/subscription_model.dart';
+import 'package:mc_common_app/models/subscriptions_models/subscription_model.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/utils/date_helper.dart';
 import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';

pubspec.lock

@@ -141,10 +141,10 @@ packages:
     dependency: transitive
     description:
       name: easy_localization
-      sha256: "30ebf25448ffe169e0bd9bc4b5da94faa8398967a2ad2ca09f438be8b6953645"
+      sha256: de63e3b422adfc97f256cbb3f8cf12739b6a4993d390f3cadb3f51837afaefe5
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   easy_logger:
     dependency: transitive
     description:
@@ -493,6 +493,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  logging:
+    dependency: transitive
+    description:
+      name: logging
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
   matcher:
     dependency: transitive
     description:
@@ -772,6 +780,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
+  signalr_core:
+    dependency: transitive
+    description:
+      name: signalr_core
+      sha256: dca676372a00c051511591ed0e24521ff7aa4e9320a7fa778a1007f7f522c8c0
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.1"
+  simple_gesture_detector:
+    dependency: transitive
+    description:
+      name: simple_gesture_detector
+      sha256: "86d08f85f1f58583b7b4b941d989f48ea6ce08c1724a1d10954a277c2ec36592"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.0"
   sizer:
     dependency: transitive
     description:
@@ -809,6 +833,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.4.5"
+  sse_client:
+    dependency: transitive
+    description:
+      name: sse_client
+      sha256: "71bd826430b41ab20a69d85bf2dfe9f11cfe222938e681ada1aea71fc8adf348"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   stack_trace:
     dependency: transitive
     description:
@@ -849,6 +881,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
+  table_calendar:
+    dependency: transitive
+    description:
+      name: table_calendar
+      sha256: "1e3521a3e6d3fc7f645a58b135ab663d458ab12504f1ea7f9b4b81d47086c478"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.9"
   term_glyph:
     dependency: transitive
     description:
@@ -865,6 +905,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.5.1"
+  tuple:
+    dependency: transitive
+    description:
+      name: tuple
+      sha256: a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.2"
   typed_data:
     dependency: transitive
     description:
@@ -885,10 +933,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher
-      sha256: eb1e00ab44303d50dd487aab67ebc575456c146c6af44422f9c13889984c00f3
+      sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.11"
+    version: "6.1.14"
   url_launcher_android:
     dependency: transitive
     description:
@@ -961,6 +1009,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  web_socket_channel:
+    dependency: transitive
+    description:
+      name: web_socket_channel
+      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   win32:
     dependency: transitive
     description:
@@ -986,5 +1042,5 @@ packages:
     source: hosted
     version: "6.1.0"
 sdks:
-  dart: ">=3.0.0-0 <4.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=3.0.0 <4.0.0"
+  flutter: ">=3.10.0"