diff --git a/lib/config/provider_dependencies.dart b/lib/config/provider_dependencies.dart index 3bddfa8..ba6a028 100644 --- a/lib/config/provider_dependencies.dart +++ b/lib/config/provider_dependencies.dart @@ -1,7 +1,6 @@ -import 'package:car_provider_app/repositories/branch_repo.dart'; +import 'package:mc_common_app/repositories/branch_repo.dart'; import 'package:car_provider_app/repositories/items_repo.dart'; import 'package:car_provider_app/repositories/schedule_repo.dart'; - import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/repositories/subscription_repo.dart'; @@ -10,7 +9,6 @@ class ProviderAppDependencies { AppDependencies.addDependencies(); injector.registerSingleton(() => BranchRepoImp()); injector.registerSingleton(() => ItemsRepoImp()); - // injector.registerSingleton(() => CommonRepoImp()); injector.registerSingleton(() => SubscriptionRepoImp()); injector.registerSingleton(() => ScheduleRepoImp()); } diff --git a/lib/main.dart b/lib/main.dart index cc06bdb..bf39079 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,6 @@ import 'package:car_provider_app/config/provider_dependencies.dart'; -import 'package:car_provider_app/repositories/branch_repo.dart'; import 'package:car_provider_app/repositories/items_repo.dart'; import 'package:car_provider_app/repositories/schedule_repo.dart'; -import 'package:car_provider_app/view_models/branch_view_model.dart'; import 'package:car_provider_app/view_models/dashboard_view_model.dart'; import 'package:car_provider_app/view_models/items_view_model.dart'; import 'package:car_provider_app/view_models/schedule_view_model.dart'; @@ -10,12 +8,12 @@ import 'package:car_provider_app/view_models/service_view_model.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:mc_common_app/classes/app_state.dart'; -import 'package:mc_common_app/classes/consts.dart'; import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/models/general_models/post_params_model.dart'; import 'package:mc_common_app/repositories/ads_repo.dart'; import 'package:mc_common_app/repositories/appointment_repo.dart'; +import 'package:mc_common_app/repositories/branch_repo.dart'; import 'package:mc_common_app/repositories/chat_repo.dart'; import 'package:mc_common_app/repositories/common_repo.dart'; import 'package:mc_common_app/repositories/payments_repo.dart'; @@ -76,8 +74,7 @@ Future main() async { ), ), ChangeNotifierProvider( - create: (_) => - SubscriptionsVM(subscriptionRepo: injector.get()), + create: (_) => SubscriptionsVM(subscriptionRepo: injector.get()), ), ChangeNotifierProvider( create: (_) => ItemsVM( @@ -110,6 +107,7 @@ Future main() async { providerRepo: injector.get(), commonServices: injector.get(), commonRepo: injector.get(), + branchRepo: injector.get(), ), ), ChangeNotifierProvider( @@ -119,9 +117,7 @@ Future main() async { ), ), ChangeNotifierProvider( - create: (_) => PaymentVM( - paymentService: injector.get(), - paymentRepo: injector.get()), + create: (_) => PaymentVM(paymentService: injector.get(), paymentRepo: injector.get()), ), ], child: const MyApp(), @@ -144,19 +140,12 @@ class MyApp extends StatelessWidget { injector.get().setAppType(AppType.provider); AppState().setPostParamsModel( PostParamsModel( - languageID: - EasyLocalization.of(context)?.locale.languageCode == "ar" - ? 1 - : 2, + languageID: EasyLocalization.of(context)?.locale.languageCode == "ar" ? 1 : 2, ), ); - ThemeData data = AppTheme.getTheme( - isArabic: - EasyLocalization.of(context)?.locale.languageCode == "ar"); + ThemeData data = AppTheme.getTheme(isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar"); return MaterialApp( - theme: AppTheme.getTheme( - isArabic: - EasyLocalization.of(context)?.locale.languageCode == "ar"), + theme: AppTheme.getTheme(isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar"), debugShowCheckedModeBanner: false, localizationsDelegates: context.localizationDelegates, supportedLocales: context.supportedLocales, diff --git a/lib/repositories/branch_repo.dart b/lib/repositories/branch_repo.dart deleted file mode 100644 index 8b98de2..0000000 --- a/lib/repositories/branch_repo.dart +++ /dev/null @@ -1,324 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'dart:io'; -import 'package:http/http.dart' as http; - -import 'package:mc_common_app/api/api_client.dart'; -import 'package:mc_common_app/classes/app_state.dart'; - -import 'package:mc_common_app/classes/consts.dart'; -import 'package:mc_common_app/config/dependencies.dart'; -import 'package:mc_common_app/models/general_models/m_response.dart'; - -import 'package:flutter/cupertino.dart'; -import 'package:mc_common_app/models/provider_branches_models/profile/branch.dart'; -import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart'; -import 'package:mc_common_app/models/provider_branches_models/profile/document.dart'; -import 'package:mc_common_app/models/provider_branches_models/profile/services.dart'; -import 'package:mc_common_app/models/provider_branches_models/provider_model.dart'; - -abstract class BranchRepo { - Future createBranch(String branchName, String branchDescription, - String cityId, String address, String latitude, String longitude); - - Future updateBranch( - int id, - String branchName, - String branchDescription, - String cityId, - String address, - String latitude, - String longitude, - {bool isNeedToDelete = true}); - - Future fetchAllBranches(); - - Future fetchBranchCategory(); - - Future fetchServicesByCategoryId(String serviceCategoryId); - - Future fetchProviderServices(String branchID, String serviceCategoryId); - - Future createNewService(List> map); - - Future getServiceProviderDocument(dynamic userId); - - Future serviceProviderDocumentsUpdate( - List? documents); - - Future getBranchAndServices(); - - Future createService(List> map); - - Future updateService(List> map); - - Future getMatchedServices( - int oldBranchId, int newBranchId, int categoryId); - - Future duplicateItems(Map map); - - Future getAllProviderDealers(Map map); - - Future getBranchUsers(Map map); - - Future assignDealerToBranch(Map map); - - Future removeDealerFromBranch(Map map); - - Future addNewServicesInAppointment(Map map); -} - -class BranchRepoImp implements BranchRepo { - @override - Future createBranch(String branchName, String branchDescription, - String cityId, String address, String latitude, String longitude) async { - var postParams = { - "serviceProviderID": AppState().getUser.data?.userInfo?.providerId ?? "", - "branchName": branchName, - "branchDescription": branchDescription, - "cityID": cityId, - "address": address, - "latitude": latitude, - "longitude": longitude, - "isActive": true - }; - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.createProviderBranch, - postParams, - token: t); - } - - @override - Future fetchAllBranches() async { - var postParams = { - "ServiceProviderID": - AppState().getUser.data?.userInfo?.providerId.toString() ?? "" - }; - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().getJsonForObject( - (json) => Branch.fromJson(json), ApiConsts.ServiceProviderBranchGet, - queryParameters: postParams, token: t); - } - - @override - Future fetchBranchCategory() async { - var postParams = { - "ServiceProviderID": - AppState().getUser.data?.userInfo?.providerId.toString() ?? "" - }; - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().getJsonForObject( - (json) => Category.fromJson(json), ApiConsts.ServiceCategory_Get, - queryParameters: postParams, token: t); - } - - @override - Future fetchServicesByCategoryId(String serviceCategoryId) async { - var postParams = {"ServiceCategoryID": serviceCategoryId}; - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().getJsonForObject( - (json) => Services.fromJson(json), ApiConsts.Services_Get, - queryParameters: postParams, token: t); - } - - @override - Future createNewService(List> map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.ServiceProviderService_Create, - map, - token: t); - } - - @override - Future getServiceProviderDocument(dynamic userId) async { - var queryParameters = { - "ServiceProviderID": userId.toString(), - }; - String? token = AppState().getUser.data?.accessToken; - debugPrint(token); - return await injector.get().getJsonForObject( - (json) => Document.fromJson(json), ApiConsts.GetProviderDocument, - queryParameters: queryParameters, - token: AppState().getUser.data!.accessToken ?? ""); - } - - @override - Future serviceProviderDocumentsUpdate( - List? documents) async { - List> map = []; - for (int i = 0; i < documents!.length; i++) { - if (documents[i].document != null) { - var postParams = { - "id": documents[i].id, - "serviceProviderID": documents[i].serviceProviderId, - "documentID": documents[i].documentId, - "documentExt": documents[i].fileExt, - "documentImage": documents[i].document, - "isActive": true - }; - map.add(postParams); - } - } - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.ServiceProviderDocument_Update, - map, - token: t); - } - - @override - Future getBranchAndServices() async { - var postParams = { - "serviceProviderID": - AppState().getUser.data?.userInfo?.providerId.toString() ?? "" - }; - String t = AppState().getUser.data!.accessToken ?? ""; - print("tokeen121 " + t); - return await injector.get().getJsonForObject( - (json) => ProviderModel.fromJson(json), ApiConsts.BranchesAndServices, - queryParameters: postParams, token: t); - } - - @override - Future updateBranch( - int id, - String branchName, - String branchDescription, - String cityId, - String address, - String latitude, - String longitude, - {bool isNeedToDelete = true}) async { - String lat = "0", long = "0"; - try { - lat = latitude.substring(0, 9); - long = longitude.substring(0, 9); - } catch (e) {} - var postParams = { - "id": id, - "serviceProviderID": AppState().getUser.data?.userInfo?.providerId ?? "", - "branchName": branchName, - "branchDescription": branchDescription, - "cityID": cityId, - "address": address, - "latitude": lat, - "longitude": long, - "isActive": isNeedToDelete - }; - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.updateProviderBranch, - postParams, - token: t); - } - - @override - Future createService(List> map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.ServiceProviderService_Create, - map, - token: t); - } - - @override - Future updateService(List> map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.ServiceProviderService_Update, - map, - token: t); - } - - @override - Future getMatchedServices( - int oldBranchId, int newBranchId, int categoryId) async { - var postParams = { - "ProviderBranchIDExisted": oldBranchId.toString(), - "ProviderBranchIDNew": newBranchId.toString(), - "CategoryID": categoryId.toString(), - }; - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().getJsonForObject( - (json) => MResponse.fromJson(json), ApiConsts.getMatchedServices, - queryParameters: postParams, token: t); - } - - @override - Future duplicateItems(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), ApiConsts.duplicateItems, map, - token: t); - } - - @override - Future getAllProviderDealers(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().getJsonForObject( - (json) => MResponse.fromJson(json), ApiConsts.getAllProviderDealers, - queryParameters: map, token: t); - } - - @override - Future getBranchUsers(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().getJsonForObject( - (json) => MResponse.fromJson(json), ApiConsts.getBranchUser, - queryParameters: map, token: t); - } - - @override - Future assignDealerToBranch(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), ApiConsts.assignDealerToBranch, map, - token: t); - } - - @override - Future removeDealerFromBranch(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.removeDealerFromBranch, - map, - token: t); - } - - @override - Future fetchProviderServices(String branchID, String serviceCategoryId) async { - var postParams = { - "ServiceCategoryID": serviceCategoryId, - "ProviderBranchID": branchID, - }; - String t = AppState().getUser.data!.accessToken ?? ""; - debugPrint("token " + t); - return await injector.get().getJsonForObject( - (json) => Services.fromJson(json), ApiConsts.GetProviderServices, - queryParameters: postParams, token: t); - } - - @override - Future addNewServicesInAppointment(Map map) async { - String t = AppState().getUser.data!.accessToken ?? ""; - return await injector.get().postJsonForObject( - (json) => MResponse.fromJson(json), - ApiConsts.AddNewServicesInAppointment, - map, - token: t); - } -} diff --git a/lib/repositories/dashboard_repo.dart b/lib/repositories/dashboard_repo.dart deleted file mode 100644 index e69de29..0000000 diff --git a/lib/repositories/items_repo.dart b/lib/repositories/items_repo.dart index fc8faee..fcd2642 100644 --- a/lib/repositories/items_repo.dart +++ b/lib/repositories/items_repo.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:mc_common_app/api/api_client.dart'; import 'package:mc_common_app/classes/app_state.dart'; @@ -7,7 +6,6 @@ import 'package:mc_common_app/config/dependencies.dart'; import 'package:mc_common_app/models/general_models/m_response.dart'; import 'package:mc_common_app/models/services_models/item_model.dart'; - abstract class ItemsRepo { Future createServiceItems(Map map); @@ -41,6 +39,5 @@ class ItemsRepoImp implements ItemsRepo { String t = AppState().getUser.data!.accessToken ?? ""; debugPrint(t); return await injector.get().postJsonForObject((json) => MResponse.fromJson(json), ApiConsts.updateServiceItem, map, token: t); - } } diff --git a/lib/view_models/service_view_model.dart b/lib/view_models/service_view_model.dart index fceaf70..afb58aa 100644 --- a/lib/view_models/service_view_model.dart +++ b/lib/view_models/service_view_model.dart @@ -235,14 +235,11 @@ // } // } -import 'dart:convert'; import 'dart:io'; - -import 'package:car_provider_app/repositories/branch_repo.dart'; +import 'package:mc_common_app/repositories/branch_repo.dart'; import 'package:file_picker/file_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:mc_common_app/models/general_models/m_response.dart'; - import 'package:mc_common_app/models/provider_branches_models/branch_detail_model.dart'; import 'package:mc_common_app/models/provider_branches_models/profile/categroy.dart'; import 'package:mc_common_app/models/provider_branches_models/profile/document.dart'; @@ -251,7 +248,6 @@ import 'package:mc_common_app/models/provider_branches_models/provider_model.dar import 'package:mc_common_app/models/services_models/item_model.dart'; import 'package:mc_common_app/models/services_models/service_model.dart'; import 'package:mc_common_app/models/user_models/branch_user.dart'; - import 'package:mc_common_app/models/user_models/cities.dart'; import 'package:mc_common_app/models/user_models/country.dart'; import 'package:mc_common_app/repositories/common_repo.dart'; @@ -298,7 +294,7 @@ class ServiceVM extends BaseVM { setState(ViewState.idle); } - Future selectFile(BuildContext context,int index) async { + Future selectFile(BuildContext context, int index) async { final File? file = await commonServices.pickFile( context, fileType: FileType.custom, @@ -348,8 +344,7 @@ class ServiceVM extends BaseVM { setState(ViewState.idle); } - Future getAllCountriesList( - BranchDetailModel? branchData, String countryCode) async { + Future getAllCountriesList(BranchDetailModel? branchData, String countryCode) async { cities = null; country = null; setState(ViewState.busy); @@ -361,9 +356,7 @@ class ServiceVM extends BaseVM { countryId = element.id ?? -1; countryValue = DropValue( element.id ?? 0, - countryCode == "SA" - ? (element.countryNameN ?? "") - : (element.countryName ?? ""), + countryCode == "SA" ? (element.countryNameN ?? "") : (element.countryName ?? ""), element.countryCode ?? "", ); } @@ -371,9 +364,7 @@ class ServiceVM extends BaseVM { countryDropList.add( DropValue( element.id ?? 0, - countryCode == "SA" - ? (element.countryNameN ?? "") - : (element.countryName ?? ""), + countryCode == "SA" ? (element.countryNameN ?? "") : (element.countryName ?? ""), element.countryCode ?? "", ), ); @@ -384,8 +375,7 @@ class ServiceVM extends BaseVM { setState(ViewState.idle); } - Future getAllCities( - BranchDetailModel? branchData, String countryCode) async { + Future getAllCities(BranchDetailModel? branchData, String countryCode) async { setState(ViewState.busy); citiesDropList = []; cities = null; @@ -404,9 +394,7 @@ class ServiceVM extends BaseVM { cityId = branchData.cityId!; cityValue = DropValue( element.id ?? 0, - countryCode == "SA" - ? (element.cityNameN ?? "") - : (element.cityName ?? ""), + countryCode == "SA" ? (element.cityNameN ?? "") : (element.cityName ?? ""), element.id.toString() ?? "", ); } @@ -414,9 +402,7 @@ class ServiceVM extends BaseVM { citiesDropList.add( DropValue( element.id ?? 0, - countryCode == "SA" - ? (element.cityNameN ?? "") - : (element.cityName ?? ""), + countryCode == "SA" ? (element.cityNameN ?? "") : (element.cityName ?? ""), element.id.toString() ?? "", ), ); @@ -424,10 +410,8 @@ class ServiceVM extends BaseVM { setState(ViewState.idle); } - Future createBranch(String branchName, String branchDescription, - String cityId, String address, String latitude, String longitude) async { - return await branchRepo.createBranch(branchName, branchDescription, - cityId.toString(), address, latitude.toString(), longitude.toString()); + Future createBranch(String branchName, String branchDescription, String cityId, String address, String latitude, String longitude) async { + return await branchRepo.createBranch(branchName, branchDescription, cityId.toString(), address, latitude.toString(), longitude.toString()); } Future updateBranch( @@ -498,10 +482,10 @@ class ServiceVM extends BaseVM { setState(ViewState.idle); } - Future fetchServicesByCategoryId(String categoryId) async { + Future fetchServicesByCategoryId(int categoryId) async { servicesDropList = []; setState(ViewState.busy); - services = await branchRepo.fetchServicesByCategoryId(categoryId); + services = await branchRepo.fetchServicesByCategoryId(serviceCategoryId: categoryId); // to get all the services for (var element in services!.data!) { servicesDropList.add( @@ -549,16 +533,13 @@ class ServiceVM extends BaseVM { List? matchedServices; bool isAllSelected = false; - Future getAllMatchedServices( - int oldBranchId, int newBranchId, int categoryId) async { + Future getAllMatchedServices(int oldBranchId, int newBranchId, int categoryId) async { matchedServices = null; - final MResponse response = await branchRepo.getMatchedServices( - oldBranchId, newBranchId, categoryId); + final MResponse response = await branchRepo.getMatchedServices(oldBranchId, newBranchId, categoryId); matchedServices = []; if (response.messageStatus == 1) { - matchedServices = List.from( - response.data.map((x) => ServiceModel.fromJson(x))); + matchedServices = List.from(response.data.map((x) => ServiceModel.fromJson(x))); } notifyListeners(); } @@ -599,8 +580,7 @@ class ServiceVM extends BaseVM { MResponse response = await branchRepo.getAllProviderDealers(map); if (response.messageStatus == 1) { allProviderDealersList = []; - allProviderDealersList = List.from( - response.data.map((x) => BranchUser.fromJson(x))); + allProviderDealersList = List.from(response.data.map((x) => BranchUser.fromJson(x))); } setState(ViewState.idle); } @@ -610,8 +590,7 @@ class ServiceVM extends BaseVM { MResponse response = await branchRepo.getBranchUsers(map); if (response.messageStatus == 1) { branchUserList = []; - branchUserList = List.from( - response.data.map((x) => BranchUser.fromJson(x))); + branchUserList = List.from(response.data.map((x) => BranchUser.fromJson(x))); } setState(ViewState.idle); } diff --git a/lib/views/settings/services/create_services_page3.dart b/lib/views/settings/services/create_services_page3.dart index a9d0ddc..1c7dae6 100644 --- a/lib/views/settings/services/create_services_page3.dart +++ b/lib/views/settings/services/create_services_page3.dart @@ -35,19 +35,15 @@ class CreateServicesPage3 extends StatelessWidget { Widget build(BuildContext context) { ServiceVM serviceVM = context.read(); if (branchModel!.categoryId == null) { - serviceVM.fetchBranchCategory( - EasyLocalization.of(context)?.currentLocale?.countryCode ?? "SA"); + serviceVM.fetchBranchCategory(EasyLocalization.of(context)?.currentLocale?.countryCode ?? "SA"); } else { - isAppointmentAvailable = - branchModel?.serviceProviderService?.isAllowAppointment ?? false; + isAppointmentAvailable = branchModel?.serviceProviderService?.isAllowAppointment ?? false; // isHomeAppointmentAvailable=branchModel.serviceProviderService. - serviceRage = - branchModel?.serviceProviderService?.customerLocationRange ?? 0; + serviceRage = branchModel?.serviceProviderService?.customerLocationRange ?? 0; if (serviceRage > 0) { isHomeAppointmentAvailable = true; } - chargersPerKm = - branchModel?.serviceProviderService?.rangePricePerKm ?? "0"; + chargersPerKm = branchModel?.serviceProviderService?.rangePricePerKm ?? "0"; serviceId = branchModel?.serviceProviderService?.serviceId ?? -1; } return Scaffold( @@ -72,8 +68,7 @@ class CreateServicesPage3 extends StatelessWidget { fontWeight: FontWeight.bold, ), ).toContainer( - padding: const EdgeInsets.only( - left: 8, right: 8, bottom: 12, top: 12), + padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12, top: 12), backgroundColor: MyColors.textFieldColor, borderRadius: 0, width: double.infinity, @@ -87,14 +82,12 @@ class CreateServicesPage3 extends StatelessWidget { fontWeight: FontWeight.bold, ), ).toContainer( - padding: const EdgeInsets.only( - left: 8, right: 8, bottom: 12, top: 12), + padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12, top: 12), backgroundColor: MyColors.textFieldColor, borderRadius: 0, width: double.infinity, ) - : (branchModel!.categoryId == null && - model.categoryDropList.isNotEmpty) + : (branchModel!.categoryId == null && model.categoryDropList.isNotEmpty) ? DropdownField( (DropValue value) async { categoryId = value.id; @@ -103,28 +96,23 @@ class CreateServicesPage3 extends StatelessWidget { serviceId = -1; isAppointmentAvailable = false; isHomeAppointmentAvailable = false; - model.fetchServicesByCategoryId( - value.id.toString()); + model.fetchServicesByCategoryId(value.id); }, dropdownValue: category, list: model.categoryDropList, - hint: - LocaleKeys.selectServiceCategory.tr(), + hint: LocaleKeys.selectServiceCategory.tr(), ) : const CircularProgressIndicator(), 12.height, branchModel!.serviceProviderService != null ? Text( - branchModel!.serviceProviderService! - .serviceDescription ?? - "N/A", + branchModel!.serviceProviderService!.serviceDescription ?? "N/A", style: const TextStyle( fontSize: 12, fontWeight: FontWeight.bold, ), ).toContainer( - padding: const EdgeInsets.only( - left: 8, right: 8, bottom: 12, top: 12), + padding: const EdgeInsets.only(left: 8, right: 8, bottom: 12, top: 12), backgroundColor: MyColors.textFieldColor, borderRadius: 0, width: double.infinity, @@ -153,8 +141,7 @@ class CreateServicesPage3 extends StatelessWidget { CheckBoxWithTitleDescription( isSelected: isAppointmentAvailable, title: 'Available for appointment', - description: - 'This option will allow customer to book appointment for these services', + description: 'This option will allow customer to book appointment for these services', onSelection: (bool v) { isAppointmentAvailable = v; model.setState(ViewState.idle); @@ -164,8 +151,7 @@ class CreateServicesPage3 extends StatelessWidget { CheckBoxWithTitleDescription( isSelected: isHomeAppointmentAvailable, title: 'Allow home services', - description: - 'This option will allow customer to book appointment at their desired location', + description: 'This option will allow customer to book appointment at their desired location', onSelection: (bool v) { isHomeAppointmentAvailable = v; model.setState(ViewState.idle); @@ -178,18 +164,13 @@ class CreateServicesPage3 extends StatelessWidget { TxtField( hint: "Home Services Range", keyboardType: TextInputType.number, - value: serviceRage == 0 - ? null - : serviceRage.toString(), + value: serviceRage == 0 ? null : serviceRage.toString(), postfixWidget: Row( mainAxisSize: MainAxisSize.min, - crossAxisAlignment: - CrossAxisAlignment.center, - mainAxisAlignment: - MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, children: [ - "KM".toText( - color: MyColors.lightTextColor), + "KM".toText(color: MyColors.lightTextColor), ], ), onChanged: (v) { @@ -204,9 +185,7 @@ class CreateServicesPage3 extends StatelessWidget { TxtField( hint: "Charges per Kilometer", keyboardType: TextInputType.number, - value: chargersPerKm == "0.0" - ? null - : chargersPerKm, + value: chargersPerKm == "0.0" ? null : chargersPerKm, onChanged: (v) { if (v.isNotEmpty) { chargersPerKm = v;