Haroon6138
/
car_customer_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed Bugs

Browse Source
pull/5/head
FaizHashmi 2 months ago
parent 4d8a2a1680
commit a45e6f7d8b
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File

21
lib/views/branches/branch_detail_view.dart
Unescape Escape View File

@ -47,7 +47,6 @@ class _BranchDetailViewState extends State<BranchDetailView> {
}); });
} }
@override @override
void dispose() { void dispose() {
appointmentsVM.resetCurrentBranchRatings(); appointmentsVM.resetCurrentBranchRatings();
@ -109,7 +108,8 @@ class _BranchDetailViewState extends State<BranchDetailView> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ 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( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@ -155,7 +155,9 @@ class _BranchDetailViewState extends State<BranchDetailView> {
color: MyColors.primaryColor, 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, 20.height,
@ -206,18 +208,20 @@ class _BranchDetailViewState extends State<BranchDetailView> {
itemBuilder: (context, index) { itemBuilder: (context, index) {
return ExpansionTile( return ExpansionTile(
tilePadding: EdgeInsets.zero, tilePadding: EdgeInsets.zero,
// title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16), // title: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "").toText(fontSize: 16),
title: (isArabic title: (isArabic
? (widget.branchDetailModel.branchServices![index].serviceDescriptionN ?? widget.branchDetailModel.branchServices![index].serviceDescription ?? "") ? (widget.branchDetailModel.branchServices![index].serviceDescriptionN ?? widget.branchDetailModel.branchServices![index].serviceDescription ?? "")
: (widget.branchDetailModel.branchServices![index].serviceDescription ?? "")).toText(fontSize: 16), : (widget.branchDetailModel.branchServices![index].serviceDescription ?? ""))
.toText(fontSize: 16),
children: [ children: [
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ 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)) ...[ if ((widget.branchDetailModel.branchServices![index].isAllowAppointment ?? false)) ...[
showItem(LocaleKeys.homeServiceRange.tr() + " :", widget.branchDetailModel.branchServices![index].customerLocationRange.toString() + LocaleKeys.km.tr()), 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, 8.height,
((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0) ((widget.branchDetailModel.branchServices![index].itemsCount != null && widget.branchDetailModel.branchServices![index].itemsCount! > 0)
@ -271,3 +275,4 @@ class _BranchDetailViewState extends State<BranchDetailView> {
); );
} }
} }

Write Preview
Loading…
Cancel
Save