Added Damage Pictures in ad_detail_view and extend edit ad

aamir_dev
Faiz Hashmi 1 year ago
parent 91ea03c834
commit 6f527b7e8f

@ -1,5 +1,5 @@
import 'package:car_customer_app/views/branches/branch_detail_page.dart';
import 'package:car_customer_app/views/branches/provider_profile_page.dart';
import 'package:car_customer_app/views/branches/branch_detail_view.dart';
import 'package:car_customer_app/views/branches/provider_profile_view.dart';
import 'package:mc_common_app/views/appointments/appointment_detail_view.dart';
import 'package:mc_common_app/views/appointments/book_appointment_schedules_view.dart';
import 'package:mc_common_app/views/appointments/book_appointment_services_view.dart';
@ -38,9 +38,9 @@ class CustomerAppRoutes {
),
AppRoutes.bookAppointmentsItemView: (context) => BookAppointmentsItemView(),
AppRoutes.reviewAppointmentView: (context) => ReviewAppointment(),
AppRoutes.branchDetailPage: (context) => BranchDetailPage(branchDetailModel: ModalRoute.of(context)!.settings.arguments as BranchDetailModel),
AppRoutes.branchDetailView: (context) => BranchDetailView(branchDetailModel: ModalRoute.of(context)!.settings.arguments as BranchDetailModel),
AppRoutes.branchSearchFilterPage: (context) => BranchesFilterView(),
AppRoutes.appoinmentSearchFilterPage: (context) => AppointmentsFilterView(),
AppRoutes.providerProfilePage: (context) => ProviderProfilePage(providerId: ModalRoute.of(context)!.settings.arguments as int),
AppRoutes.providerProfileView: (context) => ProviderProfileView(providerId: ModalRoute.of(context)!.settings.arguments as int),
};
}

@ -1,5 +1,9 @@
import 'dart:async';
import 'dart:developer';
import 'package:car_customer_app/views/branches/components/branch_reviews_widget.dart';
import 'package:car_customer_app/views/branches/components/items_list_sheet.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:car_customer_app/views/branches/sheet/items_list_sheet.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
@ -16,33 +20,42 @@ import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class BranchDetailPage extends StatefulWidget {
class BranchDetailView extends StatefulWidget {
final BranchDetailModel branchDetailModel;
BranchDetailPage({required this.branchDetailModel});
BranchDetailView({required this.branchDetailModel});
@override
State<BranchDetailPage> createState() => _BranchDetailPageState();
State<BranchDetailView> createState() => _BranchDetailViewState();
}
class _BranchDetailPageState extends State<BranchDetailPage> {
class _BranchDetailViewState extends State<BranchDetailView> {
late AppointmentsVM appointmentsVM;
@override
void initState() {
// TODO: implement initState
appointmentsVM = context.read<AppointmentsVM>();
super.initState();
if (widget.branchDetailModel.branchServices!.length > 0) widget.branchDetailModel.branchServices?.first.isExpandedOrSelected = true;
getBranchReviews();
}
Future<void> getBranchReviews() async {
scheduleMicrotask(() async {
await appointmentsVM.getReviewsByBranchId(serviceProviderBranchID: widget.branchDetailModel.id!);
});
}
@override
void dispose() {
appointmentsVM.resetCurrentBranchRatings();
super.dispose();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CustomAppBar(
title: LocaleKeys.branchDetail.tr(),
onBackButtonTapped: () {
context.read<AppointmentsVM>().resetCategorySelectionBottomSheet();
Navigator.pop(context);
},
),
appBar: CustomAppBar(title: LocaleKeys.branchDetail.tr()),
body: Column(
children: [
Expanded(
@ -115,9 +128,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
color: MyColors.primaryColor,
),
],
)
.padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2))
.onPress(() => navigateWithName(context, AppRoutes.providerProfilePage, arguments: widget.branchDetailModel.serviceProviderId)),
).padding(EdgeInsets.symmetric(vertical: 6, horizontal: 2)).onPress(() => navigateWithName(context, AppRoutes.providerProfileView, arguments: widget.branchDetailModel.serviceProviderId)),
],
),
20.height,
@ -126,22 +137,27 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
color: MyColors.lightTextColor,
isBold: true,
),
if (widget.branchDetailModel.branchServices!.length == 0) LocaleKeys.noServicesAvailable.tr().toText(fontSize: 12, isBold: true),
showServicesList(),
if (widget.branchDetailModel.branchServices!.length == 0)
LocaleKeys.noServicesAvailable.tr().toText(
fontSize: 12,
color: MyColors.lightTextColor,
isBold: true,
),
buildServicesList(),
],
).toWhiteContainer(
width: double.infinity,
allPading: 12,
),
).toWhiteContainer(width: double.infinity, allPading: 12),
10.height,
BranchReviewsWidget(branchRateAvg: widget.branchDetailModel.branchRateAvg ?? 0.0),
],
),
),
),
),
ShowFillButton(
maxHeight: 55,
title: LocaleKeys.bookAppointment.tr(),
margin: EdgeInsets.all(12),
maxWidth: double.infinity,
margin: EdgeInsets.all(21),
onPressed: () {
navigateWithName(context, AppRoutes.bookAppointmenServicesView);
context.read<AppointmentsVM>().updateSelectedBranch(widget.branchDetailModel);
@ -152,7 +168,7 @@ class _BranchDetailPageState extends State<BranchDetailPage> {
);
}
Widget showServicesList() {
Widget buildServicesList() {
return ListView.separated(
itemBuilder: (context, index) {
return ExpansionTile(

@ -0,0 +1,95 @@
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class BranchReviewsWidget extends StatelessWidget {
final double branchRateAvg;
const BranchReviewsWidget({super.key, required this.branchRateAvg});
@override
Widget build(BuildContext context) {
return Consumer(builder: (BuildContext context, AppointmentsVM appointmentsVM, Widget? child) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
LocaleKeys.review.tr().toText(fontSize: 18, isBold: true, letterSpacing: 0.1),
if (branchRateAvg != 0.0) ...[
"$branchRateAvg".toString().toText(fontSize: 18, isBold: true, letterSpacing: 0.1),
]
],
),
10.height,
if (appointmentsVM.state == ViewState.busy) ...[
Center(child: CircularProgressIndicator())
] else if (appointmentsVM.currentBranchReviews.isEmpty) ...[
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
"This branch has no reviews.".toText(fontSize: 14, color: MyColors.lightTextColor),
],
),
] else ...[
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: List.generate(
5,
(index) => MyAssets.icStar.buildSvg(
color: (index <= branchRateAvg - 1) ? MyColors.lightPrimaryColor : MyColors.lightGreyDDColor,
height: 50,
),
),
),
10.height,
ListView.separated(
separatorBuilder: (context, index) => Divider(height: 1),
itemCount: !appointmentsVM.isReadMoreEnabled ? 3 : appointmentsVM.currentBranchReviews.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
10.height,
Row(
children: [
("Mohammad Al Shafa - 5.0").toText(fontSize: 14, isBold: true),
MyAssets.icStar.buildSvg(color: MyColors.darkPrimaryColor, height: 13).paddingOnly(left: 5, bottom: 2),
],
),
3.height,
"Some Reviews about the Provider from Customer".toText(fontSize: 12, color: MyColors.lightTextColor),
10.height,
],
);
},
),
if (appointmentsVM.isReadMoreEnabled) ...[
("Read Less").toText(fontSize: 13, color: MyColors.darkPrimaryColor, isUnderLine: true).onPress(() {
appointmentsVM.updateIsReadMoreEnabled(false);
}),
] else ...[
("Read More Reviews").toText(fontSize: 13, color: MyColors.darkPrimaryColor, isUnderLine: true).onPress(() {
appointmentsVM.updateIsReadMoreEnabled(true);
}),
]
]
],
).toWhiteContainer(
width: double.infinity,
allPading: 12,
);
});
}
}

@ -1,5 +1,8 @@
import 'dart:async';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/models/services_models/item_model.dart';
import 'package:mc_common_app/utils/enums.dart';
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
@ -10,7 +13,6 @@ import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
import 'package:easy_localization/easy_localization.dart';
class ItemsListSheet extends StatefulWidget {
final int serviceId;
@ -24,7 +26,9 @@ class _ItemsListSheetState extends State<ItemsListSheet> {
@override
void initState() {
super.initState();
context.read<AppointmentsVM>().getServiceItems(widget.serviceId);
scheduleMicrotask(() {
context.read<AppointmentsVM>().getServiceItems(widget.serviceId);
});
}
@override
@ -33,6 +37,9 @@ class _ItemsListSheetState extends State<ItemsListSheet> {
height: MediaQuery.of(context).size.height / 1.2,
child: Consumer<AppointmentsVM>(
builder: (context, appointmentsVM, _) {
if (appointmentsVM.state == ViewState.busy) {
return Center(child: CircularProgressIndicator());
}
return appointmentsVM.serviceItemsFromApi.isEmpty
? const EmptyWidget()
: ListView.separated(

@ -1,113 +0,0 @@
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/provider_details_card.dart';
import 'package:mc_common_app/widgets/empty_widget.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class ProviderProfilePage extends StatefulWidget {
final int providerId;
ProviderProfilePage({required this.providerId});
@override
State<ProviderProfilePage> createState() => _ProviderProfilePageState();
}
class _ProviderProfilePageState extends State<ProviderProfilePage> {
@override
void initState() {
super.initState();
context.read<AppointmentsVM>().getBranchAndServices(widget.providerId);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: CustomAppBar(
title: LocaleKeys.providerDetails.tr(),
),
body: Container(
width: double.infinity,
height: double.infinity,
padding: EdgeInsets.all(21),
child: Consumer<AppointmentsVM>(
builder: (context, model, _) {
return model.providerProfileModel == null
? const Center(child: CircularProgressIndicator())
: model.providerProfileModel == null
? const EmptyWidget()
: SingleChildScrollView(
child: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
//TODO: company logo/banner not added form provider app yet
Image.asset(MyAssets.bnCar),
12.height,
model.providerProfileModel!.companyName.toString().toText(
fontSize: 16,
isBold: true,
),
Row(
children: [
("Mowater Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12),
4.width,
//TODO: date is missing from API side
"2023".toText(fontSize: 12, isBold: true),
],
),
4.height,
//TODO: company description not added form provider app yet
// model.providerModel!.data!.companyDescription!.toText(color: MyColors.lightTextColor, fontSize: 12),
LocaleKeys.someDescriptionExperienceandtheirReputation.tr().toText(color: MyColors.lightTextColor, fontSize: 12),
],
).toWhiteContainer(
width: double.infinity,
allPading: 12,
),
12.height,
model.providerProfileModel!.serviceProviderBranch == null
? Center(child: Text(LocaleKeys.noBranchFound))
: model.providerProfileModel!.serviceProviderBranch!.isEmpty
? Center(child: Text(LocaleKeys.no_branch.tr()))
: ListView.separated(
itemBuilder: (context, index) {
return ProviderDetailsCard(
onCardTapped: () {
navigateWithName(context, AppRoutes.branchDetailPage, arguments: model.providerProfileModel!.serviceProviderBranch![index]);
},
providerImageUrl: MyAssets.bnCar,
title: model.providerProfileModel!.serviceProviderBranch![index].branchName ?? "",
providerLocation: model.providerProfileModel!.serviceProviderBranch![index].distanceKm.toString() + " KM",
providerName: model.providerProfileModel!.serviceProviderBranch![index].serviceProviderName ?? "",
providerRatings: "4.9",
services: model.providerProfileModel!.serviceProviderBranch![index].branchServices,
);
},
separatorBuilder: (context, index) {
return 12.height;
},
itemCount: model.providerProfileModel!.serviceProviderBranch!.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
)
],
),
);
},
),
),
);
}
}

@ -0,0 +1,117 @@
import 'package:mc_common_app/view_models/appointments_view_model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:mc_common_app/classes/consts.dart';
import 'package:mc_common_app/config/routes.dart';
import 'package:mc_common_app/extensions/int_extensions.dart';
import 'package:mc_common_app/extensions/string_extensions.dart';
import 'package:mc_common_app/generated/locale_keys.g.dart';
import 'package:mc_common_app/theme/colors.dart';
import 'package:mc_common_app/utils/navigator.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/provider_details_card.dart';
import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
import 'package:provider/provider.dart';
class ProviderProfileView extends StatefulWidget {
final int providerId;
ProviderProfileView({required this.providerId});
@override
State<ProviderProfileView> createState() => _ProviderProfileViewState();
}
class _ProviderProfileViewState extends State<ProviderProfileView> {
@override
void initState() {
super.initState();
context.read<AppointmentsVM>().getBranchAndServices(widget.providerId);
}
@override
Widget build(BuildContext context) {
return Consumer(
builder: (BuildContext context, AppointmentsVM appointmentsVM, Widget? child) {
if (appointmentsVM.providerProfileModel == null) {
return Scaffold(
backgroundColor: MyColors.white,
body: Center(
child: CircularProgressIndicator(),
),
);
}
return Scaffold(
appBar: CustomAppBar(
title: LocaleKeys.providerDetails.tr(),
actions: [
Icon(
appointmentsVM.providerProfileModel!.isFavorite! ? Icons.favorite : Icons.favorite_border,
color: appointmentsVM.providerProfileModel!.isFavorite! ? MyColors.darkPrimaryColor : MyColors.black,
).horPaddingMain().onPress(() {}),
],
),
body: Container(
width: double.infinity,
height: double.infinity,
padding: EdgeInsets.all(21),
child: SingleChildScrollView(
child: Column(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
//TODO: company logo/banner not added form provider app yet
Image.asset(MyAssets.bnCar),
12.height,
appointmentsVM.providerProfileModel!.companyName.toString().toText(
fontSize: 16,
isBold: true,
),
Row(
children: [
("Mowater Member Since:").toText(color: MyColors.lightTextColor, fontSize: 12),
4.width,
//TODO: date is missing from API side
"2023".toText(fontSize: 12, isBold: true),
],
),
4.height,
appointmentsVM.providerProfileModel!.companyDescription!.toText(color: MyColors.lightTextColor, fontSize: 12),
],
).toWhiteContainer(width: double.infinity, allPading: 12),
12.height,
appointmentsVM.providerProfileModel!.serviceProviderBranch == null
? Center(child: Text(LocaleKeys.noBranchFound))
: appointmentsVM.providerProfileModel!.serviceProviderBranch!.isEmpty
? Center(child: Text(LocaleKeys.no_branch.tr()))
: ListView.separated(
itemBuilder: (context, index) {
return ProviderDetailsCard(
onCardTapped: () {
navigateWithName(context, AppRoutes.branchDetailView, arguments: appointmentsVM.providerProfileModel!.serviceProviderBranch![index]);
},
providerImageUrl: MyAssets.bnCar,
title: appointmentsVM.providerProfileModel!.serviceProviderBranch![index].branchName ?? "",
providerLocation: appointmentsVM.providerProfileModel!.serviceProviderBranch![index].distanceKm.toString() + " KM",
providerName: appointmentsVM.providerProfileModel!.serviceProviderBranch![index].serviceProviderName ?? "",
providerRatings: "4.9",
services: appointmentsVM.providerProfileModel!.serviceProviderBranch![index].branchServices,
);
},
separatorBuilder: (context, index) {
return 12.height;
},
itemCount: appointmentsVM.providerProfileModel!.serviceProviderBranch!.length,
physics: NeverScrollableScrollPhysics(),
shrinkWrap: true,
)
],
),
),
),
);
},
);
}
}

@ -82,7 +82,7 @@ class BranchesFragment extends StatelessWidget {
return ProviderDetailsCard(
onCardTapped: () {
navigateWithName(context, AppRoutes.branchDetailPage, arguments: branchDetailModel);
navigateWithName(context, AppRoutes.branchDetailView, arguments: branchDetailModel);
},
providerImageUrl: MyAssets.bnCar,
title: branchDetailModel.branchName ?? "",

@ -10,7 +10,7 @@ import 'package:mc_common_app/utils/navigator.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';
import 'package:mc_common_app/views/advertisement/ads_list.dart';
import 'package:mc_common_app/views/advertisement/components/ads_list_widget.dart';
import 'package:mc_common_app/views/appointments/widgets/common_appointment_slider_widget.dart';
import 'package:mc_common_app/widgets/common_widgets/app_bar.dart';
import 'package:mc_common_app/widgets/common_widgets/view_all_widget.dart';
@ -33,9 +33,7 @@ class HomeFragment extends StatelessWidget {
onTap: () => navigateWithName(context, AppRoutes.settingOptionsLanguages),
actions: [
IconButton(
onPressed: () {
context.read<DashboardVmCustomer>().onRefresh(context);
},
onPressed: () => context.read<DashboardVmCustomer>().onRefresh(context),
icon: const b.Badge(
badgeContent: Text(
'3',
@ -79,19 +77,39 @@ class HomeFragment extends StatelessWidget {
if (appointmentVM.state == ViewState.busy) {
return Center(child: CircularProgressIndicator());
}
return Column(
children: [
ViewAllWidget(
title: LocaleKeys.my_recent_providers.tr().toUpperCase(),
subTitle: '',
onSubtitleTapped: () {
// context.read<DashboardVmCustomer>().onNavbarTapped(0);
// context.read<AppointmentsVM>().applyFilterOnBranches(index: 0);
})
.horPaddingMain(),
MyRecentBranchesWidget(nearbyBranches: appointmentVM.myRecentBranches).horPaddingMain(),
],
);
if (appointmentVM.myRecentBranches.isNotEmpty) {
return Column(
children: [
ViewAllWidget(
title: LocaleKeys.myRecentBranches.tr().toUpperCase(),
subTitle: '',
onSubtitleTapped: () {
// context.read<DashboardVmCustomer>().onNavbarTapped(0);
// context.read<AppointmentsVM>().applyFilterOnBranches(index: 0);
},
).horPaddingMain(),
MyRecentBranchesWidget(nearbyBranches: appointmentVM.myRecentBranches).horPaddingMain(),
],
);
}
if (appointmentVM.nearbyBranches.isNotEmpty) {
return Column(
children: [
ViewAllWidget(
title: LocaleKeys.myNearbyBranches.tr().toUpperCase(),
subTitle: LocaleKeys.view_all.tr(),
onSubtitleTapped: () {
context.read<DashboardVmCustomer>().onNavbarTapped(0);
context.read<AppointmentsVM>().applyFilterOnBranches(index: 0);
},
).horPaddingMain(),
MyRecentBranchesWidget(nearbyBranches: appointmentVM.nearbyBranches).horPaddingMain(),
],
);
}
return SizedBox();
},
),
Consumer(
@ -112,7 +130,7 @@ class HomeFragment extends StatelessWidget {
context.read<DashboardVmCustomer>().onNavbarTapped(3);
context.read<AdVM>().updateIsExploreAds(false);
}).horPaddingMain(),
BuildAdsList(
AdsListWidget(
shouldShowAdStatus: true,
isAdsFragment: false,
adsList: adVM.myActiveAdsForHome,
@ -134,7 +152,7 @@ class HomeFragment extends StatelessWidget {
context.read<AdVM>().applyFilterOnExploreAds(createdByRoleFilter: CreatedByRoleEnum.allAds);
},
).horPaddingMain(),
BuildAdsList(
AdsListWidget(
shouldShowAdStatus: false,
adsList: adVM.exploreAds.length >= 3 ? adVM.exploreAds.take(3).toList() : adVM.exploreAds,
isAdsFragment: false,

@ -37,9 +37,7 @@ class MyRecentBranchesWidget extends StatelessWidget {
"${branchDetailModel.branchName}".toText(fontSize: 14, isBold: true, textAlign: TextAlign.center),
],
),
).onPress(() {
navigateWithName(context, AppRoutes.branchDetailPage, arguments: branchDetailModel);
});
).onPress(() => navigateWithName(context, AppRoutes.branchDetailView, arguments: branchDetailModel));
},
),
);

Loading…
Cancel
Save