diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index 37b7b8c..91afaa3 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -47,7 +47,6 @@ class _BranchDetailViewState extends State { }); } - @override void dispose() { appointmentsVM.resetCurrentBranchRatings(); @@ -109,7 +108,8 @@ class _BranchDetailViewState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - if ((widget.branchDetailModel.latitude != null && widget.branchDetailModel.latitude!.isNotEmpty) && (widget.branchDetailModel.longitude != null && widget.branchDetailModel.longitude!.isNotEmpty)) ...[ + if ((widget.branchDetailModel.latitude != null && widget.branchDetailModel.latitude!.isNotEmpty) && + (widget.branchDetailModel.longitude != null && widget.branchDetailModel.longitude!.isNotEmpty)) ...[ Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -155,7 +155,9 @@ class _BranchDetailViewState extends State { color: MyColors.primaryColor, ), ], - ).padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2)).onPress(() => navigateWithName(context, AppRoutes.providerProfileView, arguments: widget.branchDetailModel.serviceProviderId)), + ) + .padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2)) + .onPress(() => navigateWithName(context, AppRoutes.providerProfileView, arguments: widget.branchDetailModel.serviceProviderId)), ], ), 20.height, @@ -206,18 +208,20 @@ class _BranchDetailViewState extends State { itemBuilder: (context, index) { return ExpansionTile( tilePadding: EdgeInsets.zero, - // title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16), + // title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16), title: (isArabic - ? (widget.branchDetailModel.branchServices![index].serviceDescriptionN ?? widget.branchDetailModel.branchServices![index].serviceDescription ?? "") - : (widget.branchDetailModel.branchServices![index].serviceDescription ?? "")).toText(fontSize: 16), + ? (widget.branchDetailModel.branchServices![index].serviceDescriptionN ?? widget.branchDetailModel.branchServices![index].serviceDescription ?? "") + : (widget.branchDetailModel.branchServices![index].serviceDescription ?? "")) + .toText(fontSize: 16), children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? LocaleKeys.yes.tr() : LocaleKeys.no.tr(), valueColor: Colors.green), + showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? LocaleKeys.yes.tr() : LocaleKeys.no.tr(), + valueColor: Colors.green), if ((widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false)) ...[ showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.km.tr()), - showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), + showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].rangePricePerKm.toString() + " " + LocaleKeys.sar.tr()), ], 8.height, ((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0) @@ -271,3 +275,4 @@ class _BranchDetailViewState extends State { ); } } +