diff --git a/lib/api/api_client.dart b/lib/api/api_client.dart index 35f9d21..eebb711 100644 --- a/lib/api/api_client.dart +++ b/lib/api/api_client.dart @@ -75,8 +75,8 @@ class ApiClientImp implements ApiClient { headers0.addAll(headers); } if (!kReleaseMode) { - logger.i("Url:$url"); - logger.i("body:$jsonObject"); + logger.i(url); + logger.i(jsonEncode(jsonObject.toString())); } var response = await postJsonForResponse(url, jsonObject, token: token, queryParameters: queryParameters, headers: headers0, retryTimes: retryTimes); try { @@ -240,8 +240,8 @@ class ApiClientImp implements ApiClient { } if (!kReleaseMode) { - logger.i("Url:$url"); - logger.i("queryParameters:$queryParameters"); + logger.i(url); + logger.i("$queryParameters"); } var response = await _get(Uri.parse(url), headers: headers0).timeout(const Duration(seconds: 60)); diff --git a/lib/models/general_models/generic_resp_model.dart b/lib/models/general_models/generic_resp_model.dart index ffd31e8..88b7755 100644 --- a/lib/models/general_models/generic_resp_model.dart +++ b/lib/models/general_models/generic_resp_model.dart @@ -247,10 +247,10 @@ class VehiclePostingImages { return data; } - // @override - // String toString() { - // return 'VehiclePostingImages{id: $id, imageName: $imageName, imageUrl: $imageUrl, imageStr: $imageStr, vehiclePostingID: $vehiclePostingID, vehiclePosting: $vehiclePosting}'; - // } + @override + String toString() { + return 'VehiclePostingImages{id: $id, imageName: $imageName, imageUrl: $imageUrl, imageStr: $imageStr, vehiclePostingID: $vehiclePostingID, vehiclePosting: $vehiclePosting}'; + } } class RequestPostingImages { @@ -268,9 +268,9 @@ class RequestPostingImages { Map toJson() { final Map data = {}; - data['id'] = id; + data['id'] = id ?? 0; data['requestImage'] = requestImage; - data['requestID'] = requestID; + data['requestID'] = requestID ?? 0; return data; } @@ -310,8 +310,8 @@ class VehiclePostingDamageParts { return data; } - // @override - // String toString() { - // return 'VehiclePostingDamageParts{id: $id, comment: $comment, vehicleImageBase64: $vehicleImageBase64, vehicleDamagePartID: $vehicleDamagePartID, vehiclePostingID: $vehiclePostingID, isActive: $isActive}'; - // } +// @override +// String toString() { +// return 'VehiclePostingDamageParts{id: $id, comment: $comment, vehicleImageBase64: $vehicleImageBase64, vehicleDamagePartID: $vehicleDamagePartID, vehiclePostingID: $vehiclePostingID, isActive: $isActive}'; +// } } diff --git a/lib/repositories/ads_repo.dart b/lib/repositories/ads_repo.dart index 246641a..85b9775 100644 --- a/lib/repositories/ads_repo.dart +++ b/lib/repositories/ads_repo.dart @@ -1,3 +1,4 @@ +import 'dart:convert'; import 'dart:developer'; import 'package:mc_common_app/api/api_client.dart'; @@ -5,6 +6,7 @@ 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/extensions/string_extensions.dart'; +import 'package:mc_common_app/main.dart'; import 'package:mc_common_app/models/advertisment_models/ad_details_model.dart'; import 'package:mc_common_app/models/advertisment_models/ads_bank_details_model.dart'; import 'package:mc_common_app/models/advertisment_models/ads_duration_model.dart'; @@ -16,8 +18,6 @@ import 'package:mc_common_app/models/general_models/generic_resp_model.dart'; import 'package:mc_common_app/utils/enums.dart'; abstract class AdsRepo { - - Future> getAdsDuration(); Future> getSpecialServices({required int specialServiceId}); @@ -53,7 +53,7 @@ class AdsRepoImp implements AdsRepo { Future> getAdsDuration() async { GenericRespModel adsGenericModel = await apiClient.getJsonForObject( token: appState.getUser.data!.accessToken, - (json) => GenericRespModel.fromJson(json), + (json) => GenericRespModel.fromJson(json), ApiConsts.vehicleAdsDurationGet, ); List vehicleAdsDuration = List.generate(adsGenericModel.data.length, (index) => AdsDurationModel.fromJson(adsGenericModel.data[index])); @@ -66,7 +66,7 @@ class AdsRepoImp implements AdsRepo { "SpecialServiceType": specialServiceId.toString(), }; GenericRespModel adsGenericModel = - await apiClient.getJsonForObject(token: appState.getUser.data!.accessToken, (json) => GenericRespModel.fromJson(json), ApiConsts.vehicleAdsSpecialServicesGet, queryParameters: params); + await apiClient.getJsonForObject(token: appState.getUser.data!.accessToken, (json) => GenericRespModel.fromJson(json), ApiConsts.vehicleAdsSpecialServicesGet, queryParameters: params); List vehicleAdsDuration = List.generate(adsGenericModel.data.length, (index) => SpecialServiceModel.fromJson(adsGenericModel.data[index])); return vehicleAdsDuration; } @@ -134,7 +134,7 @@ class AdsRepoImp implements AdsRepo { } }; - log("posting this ads: ${postParams.toString()}"); + logger.i(jsonEncode(postParams.toString())); String token = appState.getUser.data!.accessToken ?? ""; GenericRespModel adsGenericModel = await apiClient.postJsonForObject( (json) => GenericRespModel.fromJson(json), diff --git a/lib/view_models/requests_view_model.dart b/lib/view_models/requests_view_model.dart index 8096c08..0efe36a 100644 --- a/lib/view_models/requests_view_model.dart +++ b/lib/view_models/requests_view_model.dart @@ -239,35 +239,34 @@ class RequestsVM extends BaseVM { description = v; } - Future convertFileToRequestPostingImages({required File file}) async { + Future convertFileToRequestPostingImages({required File file}) async { List imageBytes = await file.readAsBytes(); String image = base64Encode(imageBytes); - String fileName = file.path.split('/').last; - VehiclePostingImages vehiclePostingImages = VehiclePostingImages( - imageName: fileName, - imageStr: image, - imageUrl: file.path, - ); + RequestPostingImages vehiclePostingImages = RequestPostingImages(requestImage: image); return vehiclePostingImages; } - Future> getVehiclePostingImageList() async { - List vehicleImages = []; - log("vehicleImages: ${pickedVehicleImages.length}"); + Future> getVehiclePostingImageList() async { + List requestImages = []; + log("requestImages: ${pickedVehicleImages.length}"); for (var image in pickedVehicleImages) { var value = await convertFileToRequestPostingImages(file: image); - vehicleImages.add(value); + requestImages.add(value); } - return vehicleImages; + return requestImages; } Future onCreateRequestTapped(BuildContext context) async { if (validateCreateRequestForm()) { Utils.showLoading(context); - List vehicleImages = await getVehiclePostingImageList(); + List vehicleImages = await getVehiclePostingImageList(); + List requestImages = []; + vehicleImages.forEach((element) { + requestImages.add(element.toJson()); + }); Map body = { "customerID": AppState().getUser.data!.userInfo!.customerId ?? 0, "requestType": requestTypeId.selectedId, @@ -281,7 +280,7 @@ class RequestsVM extends BaseVM { "price": price, "description": description, "isSpecialServiceNeeded": false, - "requestImages": vehicleImages, + "requestImages": requestImages, }; try { GenericRespModel respModel = await requestRepo.createRequest(body); diff --git a/lib/views/profile/profile_view.dart b/lib/views/profile/profile_view.dart index 5cc7ef1..b7a72d6 100644 --- a/lib/views/profile/profile_view.dart +++ b/lib/views/profile/profile_view.dart @@ -1,14 +1,11 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; -import 'package:image_picker/image_picker.dart'; +import 'package:mc_common_app/classes/app_state.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/theme/colors.dart'; -import 'package:mc_common_app/utils/navigator.dart'; -import 'package:mc_common_app/utils/utils.dart'; import 'package:mc_common_app/views/setting_options/widgets/custom_setting_options_tile.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; @@ -56,6 +53,7 @@ class ProfileScreen extends StatelessWidget { @override Widget build(BuildContext context) { + return Scaffold( extendBody: true, backgroundColor: const Color(0xffefefef), @@ -111,7 +109,7 @@ class ProfileScreen extends StatelessWidget { ], ).horPaddingMain(), 10.height, - "Muhammad Ahmad".toText(fontSize: 20).paddingOnly(left: 25), + "${AppState().getUser.data!.userInfo!.firstName} ${AppState().getUser.data!.userInfo!.lastName ?? ""}".toText(fontSize: 20).paddingOnly(left: 25), Column( children: [ CustomProfileOptionsTile( @@ -122,13 +120,13 @@ class ProfileScreen extends StatelessWidget { ), CustomProfileOptionsTile( titleText: "Email", - subtitleText: "mail@gmail.com", + subtitleText: "${AppState().getUser.data!.userInfo!.email}", needBorderBelow: true, onTap: () {}, ), CustomProfileOptionsTile( titleText: "Phone Number", - subtitleText: "0504278212", + subtitleText: "${AppState().getUser.data!.userInfo!.email}", needBorderBelow: true, onTap: () {}, ), diff --git a/lib/views/requests/create_request_page.dart b/lib/views/requests/create_request_page.dart index 54acc45..6ed828f 100644 --- a/lib/views/requests/create_request_page.dart +++ b/lib/views/requests/create_request_page.dart @@ -37,185 +37,192 @@ class CreateRequestPage extends StatelessWidget { const Center( child: CircularProgressIndicator(), ), - ] else ...[ - Builder(builder: (context) { - List requestTypeDrop = []; - for (var element in requestsVM.myRequestsTypeEnum) { - requestTypeDrop.add(DropValue(element.enumValue.toInt() ?? 0, element.enumValueStr ?? "", "")); - } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionRequestTypeId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: requestTypeDrop, - dropdownValue: requestsVM.requestTypeId.selectedId != -1 ? DropValue(requestsVM.requestTypeId.selectedId, requestsVM.requestTypeId.selectedOption, "") : null, - hint: "Request Type", - errorValue: requestsVM.requestTypeId.errorValue, - ); - }), - ], - 8.height, - if (requestsVM.requestTypeId.selectedId != -1) - if (requestsVM.isFetchingVehicleType) ...[ - const Center( - child: CircularProgressIndicator(), - ), - ] else ...[ + ] else + ...[ Builder(builder: (context) { - List vehicleTypeDrop = []; - for (var element in requestsVM.vehicleTypes) { - vehicleTypeDrop.add(DropValue(element.id?.toInt() ?? 0, element.vehicleTypeName ?? "", "")); + List requestTypeDrop = []; + for (var element in requestsVM.myRequestsTypeEnum) { + requestTypeDrop.add(DropValue(element.enumValue.toInt() ?? 0, element.enumValueStr ?? "", "")); } return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleTypeId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: vehicleTypeDrop, - dropdownValue: requestsVM.vehicleTypeId.selectedId != -1 ? DropValue(requestsVM.vehicleTypeId.selectedId, requestsVM.vehicleTypeId.selectedOption, "") : null, - hint: "Vehicle Type", - errorValue: requestsVM.vehicleTypeId.errorValue, + (DropValue value) => requestsVM.updateSelectionRequestTypeId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: requestTypeDrop, + dropdownValue: requestsVM.requestTypeId.selectedId != -1 ? DropValue(requestsVM.requestTypeId.selectedId, requestsVM.requestTypeId.selectedOption, "") : null, + hint: "Request Type", + errorValue: requestsVM.requestTypeId.errorValue, ); }), ], 8.height, + if (requestsVM.requestTypeId.selectedId != -1) + if (requestsVM.isFetchingVehicleType) ...[ + const Center( + child: CircularProgressIndicator(), + ), + ] else + ...[ + Builder(builder: (context) { + List vehicleTypeDrop = []; + for (var element in requestsVM.vehicleTypes) { + vehicleTypeDrop.add(DropValue(element.id?.toInt() ?? 0, element.vehicleTypeName ?? "", "")); + } + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleTypeId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: vehicleTypeDrop, + dropdownValue: requestsVM.vehicleTypeId.selectedId != -1 ? DropValue(requestsVM.vehicleTypeId.selectedId, requestsVM.vehicleTypeId.selectedOption, "") : null, + hint: "Vehicle Type", + errorValue: requestsVM.vehicleTypeId.errorValue, + ); + }), + ], + 8.height, if (requestsVM.vehicleTypeId.selectedId != -1) if (requestsVM.isFetchingVehicleDetail) ...[ const Center( child: CircularProgressIndicator(), ), - ] else ...[ - Column( - children: [ - Builder(builder: (context) { - List vehicleBrandsDrop = []; - for (var element in requestsVM.vehicleBrands) { - vehicleBrandsDrop.add(DropValue(element.id?.toInt() ?? 0, element.vehicleBrandDescription ?? "", "")); - } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleBrandId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: vehicleBrandsDrop, - dropdownValue: requestsVM.vehicleBrandId.selectedId != -1 ? DropValue(requestsVM.vehicleBrandId.selectedId, requestsVM.vehicleBrandId.selectedOption, "") : null, - hint: "Brand", - errorValue: requestsVM.vehicleBrandId.errorValue, - ); - }), - 8.height, - Builder(builder: (context) { - List vehicleModelsDrop = []; - for (var element in requestsVM.vehicleModels) { - if (requestsVM.vehicleBrandId.selectedId == element.vehicleBrandID) vehicleModelsDrop.add(DropValue(element.id?.toInt() ?? 0, element.model ?? "", "")); - } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleModelId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: vehicleModelsDrop, - dropdownValue: requestsVM.vehicleModelId.selectedId != -1 ? DropValue(requestsVM.vehicleModelId.selectedId, requestsVM.vehicleModelId.selectedOption, "") : null, - hint: "Model", - errorValue: requestsVM.vehicleModelId.errorValue, - ); - }), - 8.height, - Builder(builder: (context) { - List vehicleYearModelsDrop = []; - for (var element in requestsVM.vehicleModelYears) { - vehicleYearModelsDrop.add(DropValue(element.id?.toInt() ?? 0, element.modelYear ?? "", "")); - } + ] else + ...[ + Column( + children: [ + Builder(builder: (context) { + List vehicleBrandsDrop = []; + for (var element in requestsVM.vehicleBrands) { + vehicleBrandsDrop.add(DropValue(element.id?.toInt() ?? 0, element.vehicleBrandDescription ?? "", "")); + } + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleBrandId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: vehicleBrandsDrop, + dropdownValue: requestsVM.vehicleBrandId.selectedId != -1 ? DropValue(requestsVM.vehicleBrandId.selectedId, requestsVM.vehicleBrandId.selectedOption, "") : null, + hint: "Brand", + errorValue: requestsVM.vehicleBrandId.errorValue, + ); + }), + 8.height, + Builder(builder: (context) { + List vehicleModelsDrop = []; + for (var element in requestsVM.vehicleModels) { + if (requestsVM.vehicleBrandId.selectedId == element.vehicleBrandID) vehicleModelsDrop.add(DropValue(element.id?.toInt() ?? 0, element.model ?? "", "")); + } + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleModelId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: vehicleModelsDrop, + dropdownValue: requestsVM.vehicleModelId.selectedId != -1 ? DropValue(requestsVM.vehicleModelId.selectedId, requestsVM.vehicleModelId.selectedOption, "") : null, + hint: "Model", + errorValue: requestsVM.vehicleModelId.errorValue, + ); + }), + 8.height, + Builder(builder: (context) { + List vehicleYearModelsDrop = []; + for (var element in requestsVM.vehicleModelYears) { + vehicleYearModelsDrop.add(DropValue(element.id?.toInt() ?? 0, element.modelYear ?? "", "")); + } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleModelYearId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: vehicleYearModelsDrop, - dropdownValue: - requestsVM.vehicleModelYearId.selectedId != -1 ? DropValue(requestsVM.vehicleModelYearId.selectedId, requestsVM.vehicleModelYearId.selectedOption, "") : null, - hint: "Year", - errorValue: requestsVM.vehicleModelYearId.errorValue, - ); - }), - 8.height, - Builder(builder: (context) { - List vehicleCountriesDrop = []; - for (var element in requestsVM.vehicleCountries) { - vehicleCountriesDrop.add(DropValue(element.id?.toInt() ?? 0, element.countryName ?? "", "")); - } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleCountryId(SelectionModel(selectedOption: value.value, selectedId: value.id)), - list: vehicleCountriesDrop, - dropdownValue: requestsVM.vehicleCountryId.selectedId != -1 ? DropValue(requestsVM.vehicleCountryId.selectedId, requestsVM.vehicleCountryId.selectedOption, "") : null, - hint: "Country", - errorValue: requestsVM.vehicleCountryId.errorValue, - ); - }), - if (requestsVM.vehicleCountryId.selectedId != -1) ...[ - if (requestsVM.isCountryFetching) ...[ + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleModelYearId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: vehicleYearModelsDrop, + dropdownValue: + requestsVM.vehicleModelYearId.selectedId != -1 ? DropValue(requestsVM.vehicleModelYearId.selectedId, requestsVM.vehicleModelYearId.selectedOption, "") : null, + hint: "Year", + errorValue: requestsVM.vehicleModelYearId.errorValue, + ); + }), + 8.height, + Builder(builder: (context) { + List vehicleCountriesDrop = []; + for (var element in requestsVM.vehicleCountries) { + vehicleCountriesDrop.add(DropValue(element.id?.toInt() ?? 0, element.countryName ?? "", "")); + } + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleCountryId(SelectionModel(selectedOption: value.value, selectedId: value.id)), + list: vehicleCountriesDrop, + dropdownValue: requestsVM.vehicleCountryId.selectedId != -1 + ? DropValue(requestsVM.vehicleCountryId.selectedId, requestsVM.vehicleCountryId.selectedOption, "") + : null, + hint: "Country", + errorValue: requestsVM.vehicleCountryId.errorValue, + ); + }), + if (requestsVM.vehicleCountryId.selectedId != -1) ...[ + if (requestsVM.isCountryFetching) ...[ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [const CircularProgressIndicator().paddingAll(10)], + ), + ] else + ...[ + 8.height, + Builder(builder: (context) { + List vehicleCitiesDrop = []; + for (var element in requestsVM.vehicleCities) { + vehicleCitiesDrop.add(DropValue(element.id?.toInt() ?? 0, element.cityName ?? "", "")); + } + return DropdownField( + (DropValue value) => requestsVM.updateSelectionVehicleCityId(SelectionModel(selectedId: value.id, selectedOption: value.value)), + list: vehicleCitiesDrop, + dropdownValue: requestsVM.vehicleCityId.selectedId != -1 ? DropValue(requestsVM.vehicleCityId.selectedId, requestsVM.vehicleCityId.selectedOption, "") : null, + hint: "City", + errorValue: requestsVM.vehicleCityId.errorValue, + ); + }), + ], + ], + 8.height, + TxtField( + hint: "Price", + value: requestsVM.price, + keyboardType: TextInputType.number, + onChanged: (e) => requestsVM.updatePrice(e), + ), + 8.height, + TxtField( + hint: "Description", + maxLines: 5, + value: requestsVM.description, + onChanged: (e) => requestsVM.updateDescription(e), + ), + 8.height, + DottedRectContainer( + onTap: () => context.read().pickMultipleImages(), + text: "Attach Image", + icon: MyAssets.attachmentIcon.buildSvg(), + ), + if (requestsVM.vehicleImageError != "") ...[ + 10.height, Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [const CircularProgressIndicator().paddingAll(10)], + mainAxisAlignment: MainAxisAlignment.end, + children: [ + requestsVM.vehicleImageError.toText(fontSize: 14, color: Colors.red), + ], + ).paddingOnly(right: 10) + ], + if (requestsVM.pickedVehicleImages.isNotEmpty) ...[ + 16.height, + PickedFilesContainer( + pickedFiles: requestsVM.pickedVehicleImages, + onCrossPressedPrimary: requestsVM.removeImageFromList, + onAddFilePressed: () { + context.read().pickMultipleImages(); + }, ), - ] else ...[ - 8.height, - Builder(builder: (context) { - List vehicleCitiesDrop = []; - for (var element in requestsVM.vehicleCities) { - vehicleCitiesDrop.add(DropValue(element.id?.toInt() ?? 0, element.cityName ?? "", "")); - } - return DropdownField( - (DropValue value) => requestsVM.updateSelectionVehicleCityId(SelectionModel(selectedId: value.id, selectedOption: value.value)), - list: vehicleCitiesDrop, - dropdownValue: requestsVM.vehicleCityId.selectedId != -1 ? DropValue(requestsVM.vehicleCityId.selectedId, requestsVM.vehicleCityId.selectedOption, "") : null, - hint: "City", - errorValue: requestsVM.vehicleCityId.errorValue, - ); - }), ], - ], - 8.height, - TxtField( - hint: "Price", - value: requestsVM.price, - onChanged: (e) => requestsVM.updatePrice(e), - ), - 8.height, - TxtField( - hint: "Description", - maxLines: 5, - value: requestsVM.description, - onChanged: (e) => requestsVM.updateDescription(e), - ), - 8.height, - DottedRectContainer( - onTap: () => context.read().pickMultipleImages(), - text: "Attach Image", - icon: MyAssets.attachmentIcon.buildSvg(), - ), - if (requestsVM.vehicleImageError != "") ...[ - 10.height, + 16.height, Row( - mainAxisAlignment: MainAxisAlignment.end, + mainAxisAlignment: MainAxisAlignment.start, children: [ - requestsVM.vehicleImageError.toText(fontSize: 14, color: Colors.red), + Checkbox( + value: requestsVM.isShippingDeliveryEnabled, + onChanged: null, + ), + "Shipping/Delivery".toText(color: MyColors.darkPrimaryColor, isBold: true, fontSize: 18) ], - ).paddingOnly(right: 10) + ).onPress(() { + requestsVM.updateShippingDeliverEnabled(!requestsVM.isShippingDeliveryEnabled); + }), ], - if (requestsVM.pickedVehicleImages.isNotEmpty) ...[ - 16.height, - PickedFilesContainer( - pickedFiles: requestsVM.pickedVehicleImages, - onCrossPressedPrimary: requestsVM.removeImageFromList, - onAddFilePressed: () { - context.read().pickMultipleImages(); - }, - ), - ], - 16.height, - Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Checkbox( - value: requestsVM.isShippingDeliveryEnabled, - onChanged: null, - ), - "Shipping/Delivery".toText(color: MyColors.darkPrimaryColor, isBold: true, fontSize: 18) - ], - ).onPress(() { - requestsVM.updateShippingDeliverEnabled(!requestsVM.isShippingDeliveryEnabled); - }), - ], - ), - ] + ), + ] ], ).toContainer(isShadowEnabled: true, marginAll: 16, paddingAll: 12), ), diff --git a/lib/views/setting_options/setting_options_faqs.dart b/lib/views/setting_options/setting_options_faqs.dart index 34dc9e5..ed0d8eb 100644 --- a/lib/views/setting_options/setting_options_faqs.dart +++ b/lib/views/setting_options/setting_options_faqs.dart @@ -1,10 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:mc_common_app/config/routes.dart'; import 'package:mc_common_app/extensions/string_extensions.dart'; -import 'package:mc_common_app/theme/colors.dart'; -import 'package:mc_common_app/utils/navigator.dart'; import 'package:mc_common_app/views/setting_options/widgets/custom_setting_options_tile.dart'; -import 'package:mc_common_app/widgets/button/show_fill_button.dart'; import 'package:mc_common_app/widgets/common_widgets/app_bar.dart'; import 'package:mc_common_app/widgets/extensions/extensions_widget.dart'; diff --git a/lib/views/user/login_with_password_page.dart b/lib/views/user/login_with_password_page.dart index bdc96f9..a5b189a 100644 --- a/lib/views/user/login_with_password_page.dart +++ b/lib/views/user/login_with_password_page.dart @@ -35,7 +35,7 @@ class _LoginWithPasswordState extends State { //TODO: ONLY FOR DEVELOPMENT PURPOSE // String phoneNum = "966504278212", password = "Fa@1234"; // String phoneNum = "966504278213", password = "Fa@1234"; - String phoneNum = "966504278214", password = "Fa@1234"; + String phoneNum = "966504278213", password = "Fa@1234"; String email = ""; String countryCode = ""; Country? _country;