From 56673db6bc3dadca180143d785238e67c798abf8 Mon Sep 17 00:00:00 2001 From: Faiz Hashmi Date: Thu, 17 Oct 2024 11:35:08 +0300 Subject: [PATCH] fixed Things before QA --- lib/views/branches/branch_detail_view.dart | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/views/branches/branch_detail_view.dart b/lib/views/branches/branch_detail_view.dart index fe91961..70181ed 100644 --- a/lib/views/branches/branch_detail_view.dart +++ b/lib/views/branches/branch_detail_view.dart @@ -191,17 +191,16 @@ class _BranchDetailViewState extends State { itemBuilder: (context, index) { return ExpansionTile( tilePadding: EdgeInsets.zero, - title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText( - fontSize: 16, - isBold: true, - ), + title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16), children: [ Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - showItem(LocaleKeys.allowingHomeService.tr() + " :", (widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false) ? "Yes" : "No", valueColor: Colors.green), - showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + "KM"), - showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), + 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() + "KM"), + showItem(LocaleKeys.chargesPerKM.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.sar.tr()), + ], 8.height, ((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0) ? widget.branchDetailModel.branchServices![index].itemsCount.toString() + " items" @@ -247,9 +246,9 @@ class _BranchDetailViewState extends State { crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start, children: [ - item.toText(fontSize: 12, color: MyColors.lightTextColor, isBold: true), + item.toText(fontSize: 12, color: MyColors.lightTextColor), 4.width, - value.toText(fontSize: 12, color: valueColor, isBold: true), + value.toText(fontSize: 12, color: valueColor), ], ); }