Merge branch 'master' into faiz_dev

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
faiz_dev
faizatflutter 13 hours ago
commit 10db964fd8

@ -0,0 +1,3 @@
<svg width="17" height="17" viewBox="0 0 17 17" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.3606 0.045C7.4231 -0.015 6.44807 -0.015 5.51807 0.045C2.56307 0.24 0.215625 2.6025 0.028125 5.5575C-0.009375 6.1125 -0.009375 6.67501 0.028125 7.22251C0.095625 8.33251 0.583125 9.32253 1.11563 10.125C1.25063 10.38 1.19063 10.8 0.890625 11.3475L0.87561 11.3775C0.77811 11.565 0.680581 11.7526 0.620581 11.9176C0.560581 12.0901 0.485581 12.3825 0.658081 12.6825C0.823081 12.9525 1.07063 13.05 1.26563 13.0875C1.42312 13.1175 1.61813 13.1175 1.79063 13.125H1.82058C2.74308 13.1475 3.40308 12.885 3.92058 12.5025C4.00308 12.4425 4.05558 12.3976 4.10808 12.3676C4.17558 12.3976 4.26557 12.435 4.39307 12.4875C4.74557 12.63 5.15057 12.7126 5.51807 12.7426C6.44807 12.8026 7.4231 12.8026 8.3606 12.7426C11.3081 12.5476 13.6556 10.185 13.8431 7.22251C13.8806 6.67501 13.8806 6.1125 13.8431 5.5575C13.6556 2.6025 11.3081 0.24 8.3606 0.045ZM4.6856 8.62503C4.3781 8.62503 4.1231 8.37003 4.1231 8.06253C4.1231 7.75503 4.3781 7.50003 4.6856 7.50003L9.1856 7.50003C9.4931 7.50003 9.7481 7.75503 9.7481 8.06253C9.7481 8.37003 9.4931 8.62503 9.1856 8.62503H4.6856ZM4.6856 5.62503C4.3781 5.62503 4.1231 5.37003 4.1231 5.06253C4.1231 4.75503 4.3781 4.50003 4.6856 4.50003L6.9356 4.50003C7.2431 4.50003 7.4981 4.75503 7.4981 5.06253C7.4981 5.37003 7.2431 5.62503 6.9356 5.62503L4.6856 5.62503ZM8.42813 13.86C11.9456 13.6275 14.7431 10.815 14.9681 7.29751C14.9981 6.82501 15.0131 6.59254 15.1406 6.54004C15.1706 6.52504 15.2081 6.51756 15.2456 6.51756C15.3806 6.52506 15.4706 6.72756 15.6431 7.11756C15.8981 7.70256 16.0556 8.33256 16.1006 8.99256C16.1306 9.51006 16.1306 10.0425 16.1006 10.56C16.0331 11.6025 15.5681 12.54 15.0656 13.29C14.9531 13.5225 14.9981 13.89 15.2756 14.4075L15.2906 14.4375C15.3806 14.61 15.4781 14.79 15.5381 14.94C15.5981 15.1125 15.6656 15.405 15.4931 15.6975C15.3356 15.96 15.0881 16.05 14.9006 16.0875C14.7506 16.1175 14.5631 16.1175 14.4056 16.125H14.3756C13.4981 16.1475 12.8756 15.8925 12.3806 15.5325C12.3206 15.495 12.2906 15.4725 12.2606 15.4575C12.2306 15.45 12.2006 15.45 12.1781 15.45C12.1406 15.45 12.1031 15.465 12.0356 15.495L11.9681 15.525C11.6306 15.66 11.2481 15.7425 10.9031 15.765C10.0181 15.825 9.10307 15.825 8.21807 15.765C7.02557 15.6825 5.9531 15.2175 5.0981 14.4975C4.8281 14.28 4.6931 14.1675 4.6856 14.0775C4.6781 14.0025 4.70807 13.935 4.76807 13.8825C4.83557 13.8225 5.03807 13.8375 5.44307 13.86C6.42557 13.9275 7.44563 13.9275 8.42813 13.86Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

@ -1802,5 +1802,6 @@
"networkUnknownError": "حدث خطأ ما. يرجى المحاولة لاحقاً.",
"networkErrorWhileFetching": "حدث خطأ أثناء تحميل البيانات. يرجى المحاولة مجدداً.",
"networkPleaseCheckInternet": "يرجى التحقق من اتصالك بالإنترنت والمحاولة مجدداً.",
"networkServerErrorNoMessage": "حدث خطأ في الخادم. يرجى المحاولة لاحقاً."
"networkServerErrorNoMessage": "حدث خطأ في الخادم. يرجى المحاولة لاحقاً.",
"startLiveChat": "بدء المحادثة المباشرة"
}

@ -1792,7 +1792,8 @@
"networkUnknownError": "Something went wrong. Please try again later.",
"networkErrorWhileFetching": "Something went wrong while loading data. Please try again.",
"networkPleaseCheckInternet": "Please check your internet connection and try again.",
"networkServerErrorNoMessage": "A server error occurred. Please try again later."
"networkServerErrorNoMessage": "A server error occurred. Please try again later.",
"startLiveChat": "Start Live Chat"
}

@ -20,6 +20,7 @@ class AppAssets {
static const String document = '$svgBasePath/document.svg';
static const String report = '$svgBasePath/report.svg';
static const String sucess = '$svgBasePath/sucess.svg';
static const String livechatMessage = '$svgBasePath/live_chat_message_icon.svg';
// static const String globeOther = '$svgBasePath/globe_other.svg';
static const String cancel = '$svgBasePath/cancel.svg';

@ -1787,6 +1787,7 @@ abstract class LocaleKeys {
static const selectBloodDonationCity = 'selectBloodDonationCity';
static const selectBloodDonationGender = 'selectBloodDonationGender';
static const selectBloodType = 'selectBloodType';
static const startLiveChat = 'startLiveChat';
static const networkErrorTitle = 'networkErrorTitle';
static const networkErrorMessage = 'networkErrorMessage';
static const networkConnectionReset = 'networkConnectionReset';

@ -157,35 +157,65 @@ class _ImmediateLiveCarePendingRequestPageState extends State<ImmediateLiveCareP
),
),
),
SizedBox(
height: 55.h,
),
CustomButton(
text: LocaleKeys.startLiveChat.tr(),
onPressed: () async {
launchUrl(Uri.parse("tel://" + "011 525 9553"));
},
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
borderWidth: 0,
textColor: AppColors.whiteColor,
fontSize: 16,
isBold: true,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
icon: AppAssets.livechatMessage,
iconColor: AppColors.whiteColor,
iconSize: 21.h,
),
SizedBox(
height: 16.h,
),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
LocaleKeys.oR.tr().toText19(
color: AppColors.textColor,
),
],
),
SizedBox(
height: 16.h,
),
CustomButton(
text: LocaleKeys.callLiveCareSupport.tr(),
onPressed: () async {
launchUrl(Uri.parse("tel://" + "011 525 9553"));
},
backgroundColor: AppColors.lightRedButtonColor,
borderColor: AppColors.lightRedButtonColor,
borderWidth: 0,
textColor: AppColors.primaryRedColor,
fontSize: 16,
isBold: true,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
icon: AppAssets.call_fill,
iconColor: AppColors.whiteColor,
iconSize: 21.h,
)
],
),
),
),
),
Container(
decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
color: AppColors.whiteColor,
borderRadius: 24.h,
hasShadow: true,
),
child: CustomButton(
text: LocaleKeys.callLiveCareSupport.tr(),
onPressed: () async {
launchUrl(Uri.parse("tel://" + "011 525 9553"));
},
backgroundColor: AppColors.primaryRedColor,
borderColor: AppColors.primaryRedColor,
textColor: AppColors.whiteColor,
fontSize: 16,
isBold: true,
borderRadius: 12,
padding: EdgeInsets.fromLTRB(10, 0, 10, 0),
height: 50.h,
icon: AppAssets.call_fill,
iconColor: AppColors.whiteColor,
iconSize: 21.h,
).paddingSymmetrical(24.h, 24.h),
),
],
);
}),

@ -23,29 +23,45 @@ Widget buildTime(Duration duration, {bool isHomePage = false}) {
Widget buildTimeColumn(String time, String label, {bool isLast = false}) {
return Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Row(
children: [
buildDigit(time[0]),
buildDigit(time[1]),
if (!isLast) buildTimeSeparator(),
Column(
children: [
Row(
children: [
buildDigit(time[0]),
buildDigit(time[1]),
],
),
buildLabel(label),
],
),
if (!isLast) ...[
SizedBox(width: 8.w,),
buildTimeSeparator(),
SizedBox(width: 8.w,),
],
],
),
buildLabel(label),
],
);
}
Widget buildDigit(String digit) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
// margin: const EdgeInsets.symmetric(horizontal: 2),
decoration: BoxDecoration(
color: AppColors.whiteColor,
borderRadius: BorderRadius.circular(8),
),
child: ClipRect(
return
// Container(
// padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 4),
// // margin: const EdgeInsets.symmetric(horizontal: 2),
// decoration: BoxDecoration(
// color: AppColors.whiteColor,
// borderRadius: BorderRadius.circular(8),
// ),
// child:
ClipRect(
child: AnimatedSwitcher(
duration: const Duration(milliseconds: 600),
switchInCurve: Curves.easeOutExpo,
@ -88,16 +104,16 @@ Widget buildDigit(String digit) {
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black,
fontSize: 10.f,
fontSize: 27.f,
),
),
),
),
);
);
// );
}
Widget buildLabel(String label) {
return label.toText12(isBold: true);
return label.toText12(isBold: false, color: AppColors.textColor, fontWeight: FontWeight.w500);
}
Widget buildTimeSeparator() {
@ -107,7 +123,7 @@ Widget buildTimeSeparator() {
":",
style: TextStyle(
color: Colors.black,
fontSize: 20.f,
fontSize: 28.f,
),
),
);

Loading…
Cancel
Save