diff --git a/lib/views/dashboard/fragments/appointments_fragment.dart b/lib/views/dashboard/fragments/appointments_fragment.dart index 7616a1d..8beea72 100644 --- a/lib/views/dashboard/fragments/appointments_fragment.dart +++ b/lib/views/dashboard/fragments/appointments_fragment.dart @@ -70,11 +70,12 @@ class AppointmentsFragment extends StatelessWidget { LocaleKeys.noAppointmentstoShow.tr().toText(fontSize: 16, color: MyColors.lightTextColor), ], ) - : ListView.builder( + : ListView.separated( + separatorBuilder: (context, index) => 12.height, shrinkWrap: true, itemCount: appointmentsVM.myFilteredAppointments.length, itemBuilder: (BuildContext context, int index) { - return BuildAppointmentContainerForCustomer( + return AppointmentFragmentTileWidget( onTapped: () { AppointmentListModel appointmentModel = appointmentsVM.myFilteredAppointments[index]; appointmentModel.appointmentServicesList!.forEach((service) { @@ -87,7 +88,7 @@ class AppointmentsFragment extends StatelessWidget { navigateWithName(context, AppRoutes.appointmentDetailView, arguments: appointmentModel); }, appointmentListModel: appointmentsVM.myFilteredAppointments[index], - ); + ).margin(left: 21, right: 21); }, ), ), diff --git a/lib/views/dashboard/fragments/home_fragment.dart b/lib/views/dashboard/fragments/home_fragment.dart index 7b4dc1c..459d40f 100644 --- a/lib/views/dashboard/fragments/home_fragment.dart +++ b/lib/views/dashboard/fragments/home_fragment.dart @@ -69,7 +69,10 @@ class HomeFragment extends StatelessWidget { context.read().applyFilterOnAppointmentsVM(appointmentStatusEnum: AppointmentStatusEnum.allAppointments); }, ).horPaddingMain(), - CommonAppointmentSliderWidget().toWhiteContainer(width: double.infinity,backgroundColor: Colors.transparent).margin(left: 21,right: 21), + CommonAppointmentSliderWidget().toWhiteContainer(width: double.infinity, backgroundColor: Colors.transparent).margin( + left: 21, + right: 21, + ), 7.height, Consumer( builder: (BuildContext context, AppointmentsVM appointmentVM, Widget? child) { diff --git a/lib/views/dashboard/widgets/my_recent_branches_widget.dart b/lib/views/dashboard/widgets/my_recent_branches_widget.dart index 896372c..86bdcb4 100644 --- a/lib/views/dashboard/widgets/my_recent_branches_widget.dart +++ b/lib/views/dashboard/widgets/my_recent_branches_widget.dart @@ -27,20 +27,10 @@ class MyRecentBranchesWidget extends StatelessWidget { width: 90, child: Column( children: [ - branchDetailModel.branchProfileImage - .buildNetworkImage( - height: 80, - width: 80, - fit: BoxFit.cover, - ) - .toCircle(borderRadius: 100), - 8.height, + branchDetailModel.branchProfileImage.buildNetworkImage(height: 73, width: 73, fit: BoxFit.cover).toCircle(borderRadius: 100), + 9.height, Flexible( - child: "${branchDetailModel.branchName}".toText( - fontSize: 14, - isBold: true, - textAlign: TextAlign.center, - ), + child: branchDetailModel.branchName!.toText(fontSize: 14, textAlign: TextAlign.center, letterSpacing: -0.84, height: 18 / 14), ), ], ), diff --git a/pubspec.yaml b/pubspec.yaml index 74705a5..501dc8d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: cupertino_icons: ^1.0.2 mc_common_app: - path: /Users/amir/StudioProjects/car_common_app + path: /Volumes/Data/Projects/Flutter/car_common_app dev_dependencies: flutter_test: