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

Merge branch 'master' into faiz_development_common

Browse Source 
# Conflicts:
#	lib/views/appointments/widgets/common_appointment_slider_widget.dart
master
FaizHashmi 2 weeks ago
parent dfbf5069f2 4dddd656e1
commit d59ae207d4
10 changed files with 134 additions and 34 deletions
Show Stats Download Patch File Download Diff File

6
assets/langs/ar-SA.json
Unescape Escape View File

@ -600,7 +600,7 @@
"requestAlreadyInProgress": "هذا الطلب قيد التقدم بالفعل.",
"acceptOfferConfirmation": "هل تريد قبول هذا العرض؟",
"acceptOfferConfirmationMessage": "سيتم قبول هذا العرض وستدفع المبلغ المطلوب للمشتري في وقت معين وإلا سيتم إلغاء هذا العرض.",
"noUpcomingAppointments": "لا مواعيد قادم..",
"noUpcomingAppointments": "لا توجد مواعيد قادمه..",
"addNewAppointment": "إضافة موعد جديد",
"myNearbyBranches": "فروعي القريبة",
"myRecentBranches": "فروعي الأخيرة",
@ -919,5 +919,7 @@
"numberOfShipping": "عدد الشحنات",
"loading": "جار التحميل...",
"pleaseSelectAccidentFree": "يرجى تحديد ما إذا كانت المركبة خالية من الحوادث",
"pleaseSelectMileageIncrease": "يرجى تحديد ما إذا كان يمكن زيادة المسافة المقطوعة"
"pleaseSelectMileageIncrease": "يرجى تحديد ما إذا كان يمكن زيادة المسافة المقطوعة",
"formatNeedsUpdate": "تنسيق الاعلان يحتاج الى تحديث",
"noAdsMatchesYourSearch" :"لا توجد اعلانات تطابق بحثك"
}

4
assets/langs/en-US.json
Unescape Escape View File

@ -917,5 +917,7 @@
"androidApp": "Android",
"iosApp": "iOS",
"pleaseWait": "Please wait...",
"numberOfShipping": "Number of Shipping"
"numberOfShipping": "Number of Shipping",
"formatNeedsUpdate": "Ad format needs to be updated.",
"noAdsMatchesYourSearch": "No Ads that matches your search"
}

34
lib/extensions/string_extensions.dart
Unescape Escape View File

@ -164,6 +164,40 @@ extension FormatDate on String {
var dates = date.split("-");
return "${dates[2]} ${getMonth(int.parse(dates[1]))}, ${dates[0]}";
}
String toLocalizedFormattedDateWithoutTime(BuildContext context) {
String date = split("T")[0];
var dates = date.split("-");
final isArabic =
Localizations.localeOf(context).languageCode == 'ar';
final month = isArabic
? getArabicMonth(int.parse(dates[1]))
: getMonth(int.parse(dates[1]));
return "${dates[2]} $month, ${dates[0]}";
}
String getArabicMonth(int month) {
const months = [
'',
'يناير',
'فبراير',
'مارس',
'أبريل',
'مايو',
'يونيو',
'يوليو',
'أغسطس',
'سبتمبر',
'أكتوبر',
'نوفمبر',
'ديسمبر',
];
return months[month];
}
}
extension RequestEnum on int {

2
lib/generated/locale_keys.g.dart
Unescape Escape View File

@ -901,5 +901,7 @@ abstract class LocaleKeys {
static const loading = 'loading';
static const pleaseSelectAccidentFree = 'pleaseSelectAccidentFree';
static const pleaseSelectMileageIncrease = 'pleaseSelectMileageIncrease';
static const formatNeedsUpdate = 'formatNeedsUpdate';
static const noAdsMatchesYourSearch = 'noAdsMatchesYourSearch';
}

3
lib/models/advertisment_models/ad_details_model.dart
Unescape Escape View File

@ -216,6 +216,7 @@ class Vehicle {
String? countryName;
String? countryNameN;
String? currency;
String? currencyN;
int? odometer;
int? isInUsed;
bool? isAccidentFree;
@ -249,6 +250,7 @@ class Vehicle {
this.countryName,
this.countryNameN,
this.currency,
this.currencyN,
this.odometer,
this.isInUsed,
this.isAccidentFree});
@ -292,6 +294,7 @@ class Vehicle {
countryName = json['countryName'];
countryNameN = json['countryNameN'] ?? json['countryName'];
currency = json['currency'];
currencyN = json['currencyN'];
odometer = json['odometer'];
isInUsed = json['isInUsed'];
isAccidentFree = json['isAccidentFree'];

1
lib/repositories/ads_repo.dart
Unescape Escape View File

@ -340,6 +340,7 @@ class AdsRepoImp implements AdsRepo {
ApiConsts.getMyDraftAds,
queryParameters: draftAdsParams,
);
//print("ADS DATA = ${adsGenericModel.data}");
List<AdDetailsModel> vehicleAdsDetails = List.generate(
adsGenericModel.data.length,
(index) => AdDetailsModel.fromJson(adsGenericModel.data[index], true, adsGenericModel.totalItemsCount ?? 1),

37
lib/views/advertisement/components/ads_list_widget.dart
Unescape Escape View File

@ -51,7 +51,7 @@ class AdsListWidget extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
const SizedBox(height: 25),
(adVM.adsFiltersCounter > 0 ? "No Ads that matches your search" : LocaleKeys.noAdsShow.tr()).toText(fontSize: 16, color: MyColors.lightTextColor, fontWeight: MyFonts.Medium),
(adVM.adsFiltersCounter > 0 ? LocaleKeys.noAdsMatchesYourSearch.tr() : LocaleKeys.noAdsShow.tr()).toText(fontSize: 16, color: MyColors.lightTextColor, fontWeight: MyFonts.Medium),
if (adVM.adsFiltersCounter > 0) ...[
const SizedBox(height: 16),
GestureDetector(
@ -166,7 +166,8 @@ class _AdCardState extends State<AdCard> {
Expanded(
child: Column(
children: [
"Ad format needs to be updated.".toText(),
LocaleKeys.formatNeedsUpdate.tr().toText(),
// "Ad format needs to be updated.".toText(),
],
),
),
@ -308,12 +309,12 @@ class _AdCardState extends State<AdCard> {
else if (isAdsFragment && widget.adDetails.adPostStatus! == AdPostStatus.sold && widget.adDetails.statuslabel != null && widget.adDetails.statuslabel!.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(top: 5),
child: Utils.statusContainerChip(text: widget.adDetails.statuslabel ?? "", chipColor: Utils.getChipColorByAdStatus(widget.adDetails.adPostStatus!)),
child: Utils.statusContainerChip(text: isArabic ? widget.adDetails.statuslabelN ?? "": widget.adDetails.statuslabel ?? "", chipColor: Utils.getChipColorByAdStatus(widget.adDetails.adPostStatus!)),
),
] else if (isAdsFragment && !context.read<AdVM>().isExploreAdsTapped && widget.adDetails.statuslabel != null && widget.adDetails.statuslabel!.isNotEmpty) ...[
Padding(
padding: const EdgeInsets.only(top: 5),
child: Utils.statusContainerChip(text: widget.adDetails.statuslabel ?? "", chipColor: Utils.getChipColorByAdStatus(widget.adDetails.adPostStatus!)),
child: Utils.statusContainerChip(text: isArabic ? widget.adDetails.statuslabelN ?? "": widget.adDetails.statuslabel ?? "", chipColor: Utils.getChipColorByAdStatus(widget.adDetails.adPostStatus!)),
),
],
(widget.adDetails.vehicle!.vehicleTitle ?? "").toText(
@ -347,7 +348,8 @@ class _AdCardState extends State<AdCard> {
),
2.width,
Expanded(
child: "${widget.adDetails.vehicle?.mileage?.mileageStart ?? ""} - ${widget.adDetails.vehicle?.mileage?.mileageEnd ?? ""} km".toText(
child: "${widget.adDetails.vehicle?.mileage?.mileageStart ?? ""} - ${widget.adDetails.vehicle?.mileage?.mileageEnd ?? ""}"
"${LocaleKeys.km.tr()}".toText(
overflow: TextOverflow.ellipsis,
fontSize: 12,
letterSpacing: -0.48,
@ -362,11 +364,15 @@ class _AdCardState extends State<AdCard> {
Column(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.start,
// children: [
// (widget.adDetails.vehicle!.cityName ?? "").toText(color: MyColors.lightTextColor, fontSize: 4),
// widget.adDetails.createdOn != null
// ? DateTime.parse(widget.adDetails.createdOn!).getTimeAgo(isArabic: isArabic).toText(color: MyColors.lightTextColor, fontSize: 4)
// : const SizedBox(),
// ],
children: [
(widget.adDetails.vehicle!.cityName ?? "").toText(color: MyColors.lightTextColor, fontSize: 4),
widget.adDetails.createdOn != null
? DateTime.parse(widget.adDetails.createdOn!).getTimeAgo(isArabic: isArabic).toText(color: MyColors.lightTextColor, fontSize: 4)
: const SizedBox(),
(isArabic ? widget.adDetails.vehicle!.cityNameN ?? "" : widget.adDetails.vehicle!.cityName ?? "").toText(color: MyColors.lightTextColor, fontSize: 4),
widget.adDetails.createdOn != null ? DateTime.parse(widget.adDetails.createdOn!).getTimeAgo(isArabic: context.locale.languageCode == 'ar',).toText(color: MyColors.lightTextColor, fontSize: 4) : const SizedBox(),
],
),
],
@ -381,14 +387,17 @@ class _AdCardState extends State<AdCard> {
children: [
(widget.adDetails.vehicle!.demandAmount!.toInt().toString()).toText(fontSize: 19, isBold: true, letterSpacing: -1.16, height: 29 / 19),
2.width,
(widget.adDetails.vehicle!.currency ?? "").toText(color: MyColors.lightTextColor, fontSize: 10, letterSpacing: -0.4, height: 16 / 10).paddingOnly(bottom: 3),
(isArabic ? widget.adDetails.vehicle!.currencyN ?? "" : widget.adDetails.vehicle!.currency ?? "").toText(color: MyColors.lightTextColor, fontSize: 10, letterSpacing: -0.4, height: 16 / 10).paddingOnly(bottom: 3),
],
),
),
SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
Transform.flip(
flipX: isArabic,
child: SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
),
// const Icon(Icons.arrow_forward)

64
lib/views/appointments/widgets/common_appointment_slider_widget.dart
Unescape Escape View File

@ -143,6 +143,7 @@ class AppointmentHomeTileWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
bool isArabic = AppState().isArabic(context);
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
@ -191,11 +192,19 @@ class AppointmentHomeTileWidget extends StatelessWidget {
),
),
//ic_arrow_right.svg
SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
// SvgPicture.asset(
// MyAssets.arrowRight,
// height: 9.69,
// width: 13,
// ),
Transform.flip(
flipX: isArabic,
child: SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
)
],
)
: Row(
@ -208,11 +217,19 @@ class AppointmentHomeTileWidget extends StatelessWidget {
fontSize: 14,
letterSpacing: -0.56,
),
SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
Transform.flip(
flipX: isArabic,
child: SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
)
// SvgPicture.asset(
// MyAssets.arrowRight,
// height: 9.69,
// width: 13,
// ),
],
)
],
@ -317,17 +334,38 @@ class AppointmentFragmentTileWidget extends StatelessWidget {
],
),
5.height,
// Row(
// crossAxisAlignment: CrossAxisAlignment.end,
// children: [
// Expanded(
// child: Column(
// children: buildServicesFromAppointment(appointmentListModel: appointmentListModel!),
// ),
// ),
// //ic_arrow_right.svg
// ],
// ).withArrow(context, isArrowEnabled: true)
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: Column(
children: buildServicesFromAppointment(appointmentListModel: appointmentListModel!),
children: buildServicesFromAppointment(
appointmentListModel: appointmentListModel!,
),
),
),
Transform.flip(
flipX: AppState().isArabic(context),
child: SvgPicture.asset(
MyAssets.arrowRight,
height: 9.69,
width: 13,
),
),
//ic_arrow_right.svg
],
).withArrow(isArrowEnabled: true)
)
],
),
),

2
lib/views/requests/offer_list_page.dart
Unescape Escape View File

@ -106,7 +106,7 @@ class _OfferListPageState extends State<OfferListPage> {
children: [
"${offersModel.companyName}".toText(color: MyColors.lightTextColor, fontSize: 14),
if (offersModel.createdOn != null && offersModel.createdOn!.isNotEmpty) ...[
" | ${DateTime.parse(offersModel.createdOn!).getTimeAgo()}".toText(color: MyColors.lightTextColor, fontSize: 14),
" | ${DateTime.parse(offersModel.createdOn!).getTimeAgo(isArabic: context.locale.languageCode == 'ar')}".toText(color: MyColors.lightTextColor, fontSize: 14),
],
],
),

15
lib/views/setting_options/widgets/custom_setting_options_tile.dart
Unescape Escape View File

@ -59,12 +59,21 @@ class CustomSettingOptionsTile extends StatelessWidget {
],
),
isForLanguage
? (isArabic ? "English": "عربي")
? Container(
padding: const EdgeInsets.only(bottom: 2),
decoration: const BoxDecoration(
border: Border(
bottom: BorderSide(
color: MyColors.primaryColor,
width: 1)
)
),
child: (isArabic ? "English": "عربي")
.toText(
fontSize: 12,
isUnderLine: true,
// isUnderLine: true,
color: MyColors.primaryColor,
)
))
: showTrailingArrow
? const Icon(Icons.arrow_forward, size: 18)
: const SizedBox(),

Write Preview
Loading…
Cancel
Save