12 feb,2025

lib/views/branches/provider_profile_view.dart

@@ -90,7 +90,7 @@ class _ProviderProfileViewState extends State<ProviderProfileView> {
                         Row(
                           children: [
                             ("${LocaleKeys.companyName.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12),
-                            4.width,
+                            4.width, 
                             (appointmentsVM.providerProfileModel!.companyName ?? appointmentsVM.providerProfileModel!.name).toString().toText(
                                   fontSize: 16,
                                   isBold: true,

lib/views/dashboard/dashboard_view.dart

@@ -34,7 +34,7 @@ class _DashboardViewState extends State<DashboardView> {
   void initState() {
     super.initState();
     dashboardVM = context.read<DashboardVmCustomer>();
-    scheduleMicrotask(() => dashboardVM.onRefresh(context, dashboardRouteEnum: widget.dashboardRouteEnum));
+    scheduleMicrotask(() async => await dashboardVM.onRefresh(context, dashboardRouteEnum: widget.dashboardRouteEnum));
   }
 
   @override

lib/views/dashboard/fragments/appointments_fragment.dart

@@ -60,63 +60,65 @@ class AppointmentsFragment extends StatelessWidget {
                   },
                 ),
                 16.height,
-                RefreshIndicator(
+                Expanded(
-                  onRefresh: () async {
+                  child: RefreshIndicator(
-                    int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected);
+                    onRefresh: () async {
-                    if (index != -1) {
+                      int index = appointmentsVM.appointmentsFilterOptions.indexWhere((element) => element.isSelected);
-                      AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum();
+                      if (index != -1) {
-                      appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum);
+                        AppointmentStatusEnum appointmentStatusEnum = appointmentsVM.appointmentsFilterOptions[index].id.toAppointmentStatusEnum();
-                    }
+                        appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: appointmentStatusEnum);
-                  },
+                      }
-                  child: appointmentsVM.state == ViewState.busy
+                    },
-                      ? const Center(child: CircularProgressIndicator())
+                    child: appointmentsVM.state == ViewState.busy
-                      : appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty
+                        ? const Center(child: CircularProgressIndicator())
-                          ? AppState().getIsViewOnly
+                        : appointmentsVM.myFilteredAppointmentsForCustomers.isEmpty
-                              ? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor)
+                            ? AppState().getIsViewOnly
-                              : Column(
+                                ? LocaleKeys.loginToViewAppointments.tr().toText(fontSize: 16, color: MyColors.lightTextColor)
-                                  mainAxisAlignment: MainAxisAlignment.center,
+                                : Column(
-                                  children: [
+                                    mainAxisAlignment: MainAxisAlignment.center,
-                                    LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor),
+                                    children: [
-                                    if (appointmentsVM.appointmentFiltersCounter > 0) ...[
+                                      LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor),
-                                      8.height,
+                                      if (appointmentsVM.appointmentFiltersCounter > 0) ...[
-                                      InkWell(
+                                        8.height,
-                                        onTap: () async {
+                                        InkWell(
-                                          appointmentsVM.clearAppointmentFilters();
+                                          onTap: () async {
-                                          await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
+                                            appointmentsVM.clearAppointmentFilters();
-                                        },
+                                            await appointmentsVM.applyFilterOnAppointmentsVMForCustomers(appointmentStatusEnum: AppointmentStatusEnum.allAppointments);
-                                        child: LocaleKeys.clearFilters.tr().toText(
+                                          },
-                                              fontSize: 14,
+                                          child: LocaleKeys.clearFilters.tr().toText(
-                                              isBold: true,
+                                                fontSize: 14,
-                                              color: MyColors.darkPrimaryColor,
+                                                isBold: true,
-                                            ),
+                                                color: MyColors.darkPrimaryColor,
-                                      ),
+                                              ),
+                                        ),
+                                      ],
                                     ],
-                                  ],
+                                  )
-                                )
+                            : ListView.separated(
-                          : ListView.separated(
+                                separatorBuilder: (context, index) => 12.height,
-                              separatorBuilder: (context, index) => 12.height,
+                                shrinkWrap: true,
-                              shrinkWrap: true,
+                                itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length,
-                              itemCount: appointmentsVM.myFilteredAppointmentsForCustomers.length,
+                                itemBuilder: (BuildContext context, int index) {
-                              itemBuilder: (BuildContext context, int index) {
+                                  return AppointmentFragmentTileWidget(
-                                return AppointmentFragmentTileWidget(
+                                    onTapped: () {
-                                  onTapped: () {
+                                      AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index];
-                                    AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointmentsForCustomers[index];
+                                      appointmentModel.appointmentServicesList!.forEach((service) {
-                                    appointmentModel.appointmentServicesList!.forEach((service) {
+                                        double totalServicePrice = 0.0;
-                                      double totalServicePrice = 0.0;
+                                        service.serviceItems!.forEach((item) {
-                                      service.serviceItems!.forEach((item) {
+                                          totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
-                                        totalServicePrice = totalServicePrice + (double.parse("${item.price ?? 0.0}"));
+                                        });
+                                        service.currentTotalServicePrice = totalServicePrice;
                                       });
-                                      service.currentTotalServicePrice = totalServicePrice;
+                                      navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel);
-                                    });
+                                    },
-                                    navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel);
+                                    appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index],
-                                  },
+                                  ).margin(left: 21, right: 21).toViewOnly(context, onTap: () {
-                                  appointmentListModel: appointmentsVM.myFilteredAppointmentsForCustomers[index],
+                                    navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
-                                ).margin(left: 21, right: 21);
+                                  });
-                              },
+                                },
-                            ),
+                              ),
-                ).toViewOnly(context, onTap: () {
+                  ),
-                  navigateWithName(context, AppRoutes.loginWithPassword, arguments: false);
+                )
-                }),
               ],
             ),
           ),

lib/views/dashboard/fragments/home_fragment.dart

@@ -1,15 +1,12 @@
 import 'package:car_customer_app/views/dashboard/widgets/drawer_widget.dart';
-import 'package:car_customer_app/views/dashboard/widgets/my_recent_branches_widget.dart';
 import 'package:car_customer_app/views/dashboard/widgets/my_services_categories_widget.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:mc_common_app/classes/app_state.dart';
 import 'package:mc_common_app/config/routes.dart';
 import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/generated/locale_keys.g.dart';
 import 'package:mc_common_app/utils/enums.dart';
 import 'package:mc_common_app/utils/navigator.dart';
-import 'package:mc_common_app/utils/utils.dart';
 import 'package:mc_common_app/view_models/ad_view_model.dart';
 import 'package:mc_common_app/view_models/appointments_view_model.dart';
 import 'package:mc_common_app/view_models/dashboard_view_model_customer.dart';
@@ -58,9 +55,7 @@ class HomeFragment extends StatelessWidget {
         width: double.infinity,
         height: double.infinity,
         child: RefreshIndicator(
-          onRefresh: () async {
+          onRefresh: () async => await context.read<DashboardVmCustomer>().onRefresh(context),
-            await context.read<DashboardVmCustomer>().onRefresh(context);
-          },
           child: ListView(
             children: [
               16.height,