pull/167/head
haroon amjad 3 weeks ago
parent 3e9a381ed7
commit 7ead6d79e5

@ -0,0 +1,10 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.30035 1.33511C8.9364 1.42574 9.50638 1.62567 9.95973 2.10615C10.4073 2.58048 10.588 3.1664 10.6708 3.81915C10.75 4.44372 10.75 5.23274 10.75 6.18939L10.75 8.54675C10.7501 8.94071 10.7501 9.31238 10.7098 9.60156C10.6691 9.89334 10.5568 10.3526 10.106 10.6083C9.63692 10.8743 9.18013 10.7103 8.91251 10.5763C8.65662 10.4482 8.3599 10.2385 8.05396 10.0222L7.90824 9.91922C7.37012 9.539 7.22655 9.44738 7.07819 9.39977C6.93214 9.3529 6.76931 9.34468 6.12223 9.34468H5.0816C4.58857 9.34469 4.17451 9.3447 3.835 9.31745C3.47977 9.28894 3.14356 9.22714 2.82247 9.06845C2.23202 8.77664 1.7676 8.27902 1.50089 7.67284C1.35789 7.3478 1.30159 7.00727 1.27533 6.6397C1.24999 6.28499 1.24999 5.85059 1.25 5.32437V5.27033C1.24999 4.74411 1.24999 4.3097 1.27533 3.95499C1.30159 3.58742 1.35789 3.24688 1.50089 2.92185C1.7676 2.31566 2.23202 1.81805 2.82247 1.52624C3.14356 1.36754 3.47977 1.30574 3.835 1.27723C4.17452 1.24998 4.58856 1.24999 5.0816 1.25L6.05449 1.25C6.95079 1.24997 7.70264 1.24994 8.30035 1.33511ZM8.08874 2.82011C7.60928 2.75179 6.96524 2.75 6 2.75H5.11111C4.58084 2.75 4.22737 2.75057 3.95501 2.77243C3.69161 2.79357 3.56781 2.83106 3.48706 2.87097C3.22521 3.00039 3.00461 3.2288 2.87388 3.52593C2.8295 3.6268 2.7921 3.77381 2.77152 4.06189C2.75045 4.35679 2.75 4.73737 2.75 5.29734C2.75 5.85732 2.75045 6.2379 2.77152 6.5328C2.7921 6.82088 2.8295 6.96789 2.87388 7.06876C3.00461 7.36589 3.22521 7.5943 3.48706 7.72371C3.56781 7.76362 3.69161 7.80112 3.95501 7.82226C4.22737 7.84412 4.58084 7.84468 5.11111 7.84468L6.21256 7.84463C6.72544 7.84421 7.13878 7.84387 7.53652 7.97151C7.93206 8.09843 8.27231 8.33925 8.6987 8.64103L8.87809 8.76784C9.02044 8.86842 9.14066 8.95331 9.24674 9.02558C9.24961 8.88565 9.25 8.71355 9.25 8.49851V6.23944C9.25 5.22016 9.24858 4.52694 9.18274 4.00792C9.1191 3.50621 9.00696 3.28209 8.8687 3.13556C8.73626 2.99519 8.54195 2.88469 8.08874 2.82011Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2637 3C12.2637 2.58579 12.5994 2.25 13.0137 2.25C17.26 2.25 20.8706 4.9642 22.2087 8.75007C22.5109 9.60517 22.6972 10.5146 22.7489 11.459C22.7715 11.8726 22.4546 12.2262 22.041 12.2489C21.6274 12.2715 21.2738 11.9546 21.2511 11.541C21.2173 10.923 21.1155 10.3237 20.9533 9.75L16.6718 9.75C16.7186 10.3123 16.7481 10.8928 16.759 11.4863C16.7665 11.9005 16.4369 12.2423 16.0228 12.2499C15.6086 12.2574 15.2668 11.9278 15.2592 11.5137C15.2481 10.905 15.2163 10.315 15.1663 9.75H13.0137C12.5994 9.75 12.2637 9.41421 12.2637 9C12.2637 8.58579 12.5994 8.25 13.0137 8.25H14.9826C14.8295 7.28681 14.6205 6.43072 14.3716 5.72162C14.1181 4.99929 13.8374 4.47039 13.5644 4.13676C13.2867 3.79728 13.0967 3.75 13.0137 3.75C12.5994 3.75 12.2637 3.41421 12.2637 3ZM15.2948 4.06943C15.4772 4.41983 15.641 4.80883 15.787 5.22488C16.09 6.08816 16.3325 7.11463 16.5001 8.25H20.3643C19.3356 6.23768 17.5051 4.70403 15.2948 4.06943Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 11.25C2.41421 11.25 2.75 11.5858 2.75 12C2.75 12.7809 2.85829 13.5355 3.06035 14.25L7.34184 14.25C7.30863 13.851 7.28412 13.4429 7.26882 13.0276C7.25357 12.6137 7.57676 12.2658 7.99069 12.2505C8.40463 12.2353 8.75255 12.5585 8.7678 12.9724C8.78393 13.4102 8.81078 13.8368 8.84735 14.25H11C11.4142 14.25 11.75 14.5858 11.75 15C11.75 15.4142 11.4142 15.75 11 15.75H9.03108C9.19518 16.7828 9.42353 17.6915 9.69569 18.4273C9.94508 19.1016 10.2166 19.5905 10.4772 19.8968C10.7409 20.2067 10.9198 20.25 11 20.25C11.4142 20.25 11.75 20.5858 11.75 21C11.75 21.4142 11.4142 21.75 11 21.75C6.75362 21.75 3.1431 19.0358 1.80499 15.25C1.44535 14.2325 1.25 13.1382 1.25 12C1.25 11.5858 1.58579 11.25 2 11.25ZM8.71887 19.9306C8.56158 19.6284 8.41846 19.2981 8.28884 18.9477C7.95639 18.0488 7.69231 16.9607 7.5136 15.75L3.64934 15.75C4.67802 17.7623 6.5086 19.296 8.71887 19.9306Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9455 13.25C17.0492 13.25 16.2974 13.2499 15.6997 13.3351C15.0636 13.4257 14.4936 13.6257 14.0403 14.1062C13.5928 14.5805 13.412 15.1664 13.3292 15.8191C13.25 16.4437 13.25 17.2328 13.25 18.1894L13.25 20.5468C13.2499 20.9407 13.2499 21.3124 13.2902 21.6016C13.3309 21.8933 13.4432 22.3526 13.894 22.6083C14.3631 22.8743 14.8199 22.7103 15.0875 22.5763C15.3434 22.4482 15.6401 22.2385 15.946 22.0222L16.0918 21.9192C16.6299 21.539 16.7735 21.4474 16.9218 21.3998C17.0679 21.3529 17.2307 21.3447 17.8778 21.3447H18.9184C19.4115 21.3447 19.8255 21.3447 20.165 21.3175C20.5202 21.2889 20.8564 21.2271 21.1775 21.0685C21.768 20.7766 22.2324 20.279 22.4991 19.6728C22.6421 19.3478 22.6984 19.0073 22.7247 18.6397C22.75 18.285 22.75 17.8506 22.75 17.3244V17.2703C22.75 16.7441 22.75 16.3097 22.7247 15.955C22.6984 15.5874 22.6421 15.2469 22.4991 14.9219C22.2324 14.3157 21.768 13.818 21.1775 13.5262C20.8564 13.3675 20.5202 13.3057 20.165 13.2772C19.8255 13.25 19.4115 13.25 18.9184 13.25L17.9455 13.25ZM15.1313 15.1356C15.2638 14.9952 15.4581 14.8847 15.9113 14.8201C16.3907 14.7518 17.0348 14.75 18 14.75H18.8889C19.4192 14.75 19.7726 14.7506 20.045 14.7724C20.3084 14.7936 20.4322 14.8311 20.513 14.871C20.7748 15.0004 20.9954 15.2288 21.1261 15.5259C21.1705 15.6268 21.2079 15.7738 21.2285 16.0619C21.2496 16.3568 21.25 16.7374 21.25 17.2973C21.25 17.8573 21.2496 18.2379 21.2285 18.5328C21.2079 18.8209 21.1705 18.9679 21.1261 19.0688C20.9954 19.3659 20.7748 19.5943 20.513 19.7237C20.4322 19.7636 20.3084 19.8011 20.045 19.8223C19.7726 19.8441 19.4192 19.8447 18.8889 19.8447L17.7874 19.8446C17.2746 19.8442 16.8612 19.8439 16.4635 19.9715C16.068 20.0984 15.7277 20.3392 15.3013 20.641L15.1219 20.7678C14.9796 20.8684 14.8594 20.9533 14.7533 21.0256C14.7504 20.8857 14.75 20.7136 14.75 20.4985L14.75 18.2394C14.75 17.2202 14.7514 16.5269 14.8173 16.0079C14.8809 15.5062 14.9931 15.2821 15.1313 15.1356Z" fill="#2E3039"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.30035 1.33511C8.9364 1.42574 9.50638 1.62567 9.95973 2.10615C10.4073 2.58048 10.588 3.1664 10.6708 3.81915C10.75 4.44372 10.75 5.23274 10.75 6.18939L10.75 8.54675C10.7501 8.94071 10.7501 9.31238 10.7098 9.60156C10.6691 9.89334 10.5568 10.3526 10.106 10.6083C9.63692 10.8743 9.18013 10.7103 8.91251 10.5763C8.65662 10.4482 8.3599 10.2385 8.05396 10.0222L7.90824 9.91922C7.37012 9.539 7.22655 9.44738 7.07819 9.39977C6.93214 9.3529 6.76931 9.34468 6.12223 9.34468H5.0816C4.58857 9.34469 4.17451 9.3447 3.835 9.31745C3.47977 9.28894 3.14356 9.22714 2.82247 9.06845C2.23202 8.77664 1.7676 8.27902 1.50089 7.67284C1.35789 7.3478 1.30159 7.00727 1.27533 6.6397C1.24999 6.28499 1.24999 5.85059 1.25 5.32437V5.27033C1.24999 4.74411 1.24999 4.3097 1.27533 3.95499C1.30159 3.58742 1.35789 3.24688 1.50089 2.92185C1.7676 2.31566 2.23202 1.81805 2.82247 1.52624C3.14356 1.36754 3.47977 1.30574 3.835 1.27723C4.17452 1.24998 4.58856 1.24999 5.0816 1.25L6.05449 1.25C6.95079 1.24997 7.70264 1.24994 8.30035 1.33511ZM8.08874 2.82011C7.60928 2.75179 6.96524 2.75 6 2.75H5.11111C4.58084 2.75 4.22737 2.75057 3.95501 2.77243C3.69161 2.79357 3.56781 2.83106 3.48706 2.87097C3.22521 3.00039 3.00461 3.2288 2.87388 3.52593C2.8295 3.6268 2.7921 3.77381 2.77152 4.06189C2.75045 4.35679 2.75 4.73737 2.75 5.29734C2.75 5.85732 2.75045 6.2379 2.77152 6.5328C2.7921 6.82088 2.8295 6.96789 2.87388 7.06876C3.00461 7.36589 3.22521 7.5943 3.48706 7.72371C3.56781 7.76362 3.69161 7.80112 3.95501 7.82226C4.22737 7.84412 4.58084 7.84468 5.11111 7.84468L6.21256 7.84463C6.72544 7.84421 7.13878 7.84387 7.53652 7.97151C7.93206 8.09843 8.27231 8.33925 8.6987 8.64103L8.87809 8.76784C9.02044 8.86842 9.14066 8.95331 9.24674 9.02558C9.24961 8.88565 9.25 8.71355 9.25 8.49851V6.23944C9.25 5.22016 9.24858 4.52694 9.18274 4.00792C9.1191 3.50621 9.00696 3.28209 8.8687 3.13556C8.73626 2.99519 8.54195 2.88469 8.08874 2.82011Z" stroke="#2E3039" stroke-width="0.5"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M12.2637 3C12.2637 2.58579 12.5994 2.25 13.0137 2.25C17.26 2.25 20.8706 4.9642 22.2087 8.75007C22.5109 9.60517 22.6972 10.5146 22.7489 11.459C22.7715 11.8726 22.4546 12.2262 22.041 12.2489C21.6274 12.2715 21.2738 11.9546 21.2511 11.541C21.2173 10.923 21.1155 10.3237 20.9533 9.75L16.6718 9.75C16.7186 10.3123 16.7481 10.8928 16.759 11.4863C16.7665 11.9005 16.4369 12.2423 16.0228 12.2499C15.6086 12.2574 15.2668 11.9278 15.2592 11.5137C15.2481 10.905 15.2163 10.315 15.1663 9.75H13.0137C12.5994 9.75 12.2637 9.41421 12.2637 9C12.2637 8.58579 12.5994 8.25 13.0137 8.25H14.9826C14.8295 7.28681 14.6205 6.43072 14.3716 5.72162C14.1181 4.99929 13.8374 4.47039 13.5644 4.13676C13.2867 3.79728 13.0967 3.75 13.0137 3.75C12.5994 3.75 12.2637 3.41421 12.2637 3ZM15.2948 4.06943C15.4772 4.41983 15.641 4.80883 15.787 5.22488C16.09 6.08816 16.3325 7.11463 16.5001 8.25H20.3643C19.3356 6.23768 17.5051 4.70403 15.2948 4.06943Z" stroke="#2E3039" stroke-width="0.5"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M2 11.25C2.41421 11.25 2.75 11.5858 2.75 12C2.75 12.7809 2.85829 13.5355 3.06035 14.25L7.34184 14.25C7.30863 13.851 7.28412 13.4429 7.26882 13.0276C7.25357 12.6137 7.57676 12.2658 7.99069 12.2505C8.40463 12.2353 8.75255 12.5585 8.7678 12.9724C8.78393 13.4102 8.81078 13.8368 8.84735 14.25H11C11.4142 14.25 11.75 14.5858 11.75 15C11.75 15.4142 11.4142 15.75 11 15.75H9.03108C9.19518 16.7828 9.42353 17.6915 9.69569 18.4273C9.94508 19.1016 10.2166 19.5905 10.4772 19.8968C10.7409 20.2067 10.9198 20.25 11 20.25C11.4142 20.25 11.75 20.5858 11.75 21C11.75 21.4142 11.4142 21.75 11 21.75C6.75362 21.75 3.1431 19.0358 1.80499 15.25C1.44535 14.2325 1.25 13.1382 1.25 12C1.25 11.5858 1.58579 11.25 2 11.25ZM8.71887 19.9306C8.56158 19.6284 8.41846 19.2981 8.28884 18.9477C7.95639 18.0488 7.69231 16.9607 7.5136 15.75L3.64934 15.75C4.67802 17.7623 6.5086 19.296 8.71887 19.9306Z" stroke="#2E3039" stroke-width="0.5"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9455 13.25C17.0492 13.25 16.2974 13.2499 15.6997 13.3351C15.0636 13.4257 14.4936 13.6257 14.0403 14.1062C13.5928 14.5805 13.412 15.1664 13.3292 15.8191C13.25 16.4437 13.25 17.2328 13.25 18.1894L13.25 20.5468C13.2499 20.9407 13.2499 21.3124 13.2902 21.6016C13.3309 21.8933 13.4432 22.3526 13.894 22.6083C14.3631 22.8743 14.8199 22.7103 15.0875 22.5763C15.3434 22.4482 15.6401 22.2385 15.946 22.0222L16.0918 21.9192C16.6299 21.539 16.7735 21.4474 16.9218 21.3998C17.0679 21.3529 17.2307 21.3447 17.8778 21.3447H18.9184C19.4115 21.3447 19.8255 21.3447 20.165 21.3175C20.5202 21.2889 20.8564 21.2271 21.1775 21.0685C21.768 20.7766 22.2324 20.279 22.4991 19.6728C22.6421 19.3478 22.6984 19.0073 22.7247 18.6397C22.75 18.285 22.75 17.8506 22.75 17.3244V17.2703C22.75 16.7441 22.75 16.3097 22.7247 15.955C22.6984 15.5874 22.6421 15.2469 22.4991 14.9219C22.2324 14.3157 21.768 13.818 21.1775 13.5262C20.8564 13.3675 20.5202 13.3057 20.165 13.2772C19.8255 13.25 19.4115 13.25 18.9184 13.25L17.9455 13.25ZM15.1313 15.1356C15.2638 14.9952 15.4581 14.8847 15.9113 14.8201C16.3907 14.7518 17.0348 14.75 18 14.75H18.8889C19.4192 14.75 19.7726 14.7506 20.045 14.7724C20.3084 14.7936 20.4322 14.8311 20.513 14.871C20.7748 15.0004 20.9954 15.2288 21.1261 15.5259C21.1705 15.6268 21.2079 15.7738 21.2285 16.0619C21.2496 16.3568 21.25 16.7374 21.25 17.2973C21.25 17.8573 21.2496 18.2379 21.2285 18.5328C21.2079 18.8209 21.1705 18.9679 21.1261 19.0688C20.9954 19.3659 20.7748 19.5943 20.513 19.7237C20.4322 19.7636 20.3084 19.8011 20.045 19.8223C19.7726 19.8441 19.4192 19.8447 18.8889 19.8447L17.7874 19.8446C17.2746 19.8442 16.8612 19.8439 16.4635 19.9715C16.068 20.0984 15.7277 20.3392 15.3013 20.641L15.1219 20.7678C14.9796 20.8684 14.8594 20.9533 14.7533 21.0256C14.7504 20.8857 14.75 20.7136 14.75 20.4985L14.75 18.2394C14.75 17.2202 14.7514 16.5269 14.8173 16.0079C14.8809 15.5062 14.9931 15.2821 15.1313 15.1356Z" stroke="#2E3039" stroke-width="0.5"/>
</svg>

After

Width:  |  Height:  |  Size: 12 KiB

@ -1385,7 +1385,7 @@
"seekMedicalAdviceDescription": "ليست حالة طوارئ ولكن من الأفضل مراقبة الأعراض.",
"emergencyDescription": "تحتاج إلى استشارة الطبيب في أقرب وقت ممكن قبل فوات الأوان.",
"colorScience": "دلالات الألوان",
"noNeedToVisitDoctor": "لا حاجة لزي<EFBFBD><EFBFBD>رة الطبيب",
"noNeedToVisitDoctor": "لا حاجة لزيرة الطبيب",
"commonSymptom": "الأعراض الشائعة",
"bookAppointment": "احجز موعد",
"notApplicable": "لا ينطبق",

@ -310,6 +310,7 @@ class AppAssets {
static const String enLangIcon = '$svgBasePath/en_lang_icon.svg';
static const String doctorResponseIcon = '$svgBasePath/doctor_response_icon.svg';
static const String changeLanguageHomePageIcon = '$svgBasePath/change_language_home_page.svg';
// PNGS //
static const String hmgLogo = '$pngBasePath/hmg_logo.png';

@ -456,9 +456,10 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
SizedBox(width: 16.w),
CustomButton(
height: 40.h,
width: 40.w,
text: "",
onPressed: () => context.navigateWithName(AppRoutes.userInfoSelection),
icon: AppAssets.arrow_forward,
icon: getIt.get<AppState>().isArabic() ? AppAssets.arrow_back : AppAssets.arrow_forward,
)
],
).paddingAll(24.w),

@ -32,9 +32,9 @@ class ClinicCard extends StatelessWidget {
child: Column(
children: [
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Utils.buildSvgWithAssets(icon: "assets/images/clinicIcons/${clinicsListResponseModel.clinicID ?? 1}.svg", width: 24.h, height: 24.h, fit: BoxFit.contain).toShimmer2(isShow: isLoading),
Utils.buildSvgWithAssets(icon: "assets/images/clinicIcons/${clinicsListResponseModel.clinicID ?? 1}.svg", width: 24.w, height: 24.h, fit: BoxFit.contain).toShimmer2(isShow: isLoading),
(clinicsListResponseModel.isLiveCareClinicAndOnline ?? true)
? Utils.buildSvgWithAssets(icon: AppAssets.livecare_clinic_icon, width: 32.h, height: 32.h, fit: BoxFit.contain).toShimmer2(isShow: isLoading)
? Utils.buildSvgWithAssets(icon: AppAssets.livecare_clinic_icon, width: 32.w, height: 32.h, fit: BoxFit.contain).toShimmer2(isShow: isLoading)
: SizedBox.shrink(),
],
),

@ -249,7 +249,7 @@ class _LandingPageState extends State<LandingPage> {
);
}),
!appState.isAuthenticated
? Utils.buildSvgWithAssets(icon: appState.isArabic() ? AppAssets.enLangIcon : AppAssets.arLangIcon, height: 18.h, width: 18.h).onPress(() {
? Utils.buildSvgWithAssets(icon: AppAssets.changeLanguageHomePageIcon, height: 18.h, width: 18.h).onPress(() {
context.setLocale(appState.isArabic() ? Locale('en', 'US') : Locale('ar', 'SA'));
})
: SizedBox.shrink()

@ -99,11 +99,11 @@ class _OrganSelectorPageState extends State<OrganSelectorPage> {
flipX: _appState.isArabic(),
child: IconButton(
icon: Utils.buildSvgWithAssets(
icon: AppAssets.arrow_back,
width: 32.h,
height: 32.h,
icon: AppAssets.forward_top_nav_icon,
width: 24.w,
height: 24.h,
),
padding: EdgeInsetsDirectional.only(start: 12),
padding: EdgeInsetsDirectional.only(start: 12, end: 12),
onPressed: () => Navigator.pop(context),
highlightColor: Colors.transparent,
),

@ -125,6 +125,7 @@ class _RiskFactorsScreenState extends State<RiskFactorsScreen> {
fontSize: 13.f,
fontWeight: FontWeight.w500,
color: AppColors.greyInfoTextColor,
fontFamily: isArabic ? 'GESSTwo' : 'Poppins'
),
children: [
TextSpan(

@ -467,18 +467,14 @@ class _TriagePageState extends State<TriagePage> {
text: TextSpan(
text: LocaleKeys.possibleSymptom.tr(context: context),
style: TextStyle(
color: AppColors.greyTextColor,
fontWeight: FontWeight.w600,
fontSize: 14.f,
),
color: AppColors.greyTextColor, fontWeight: FontWeight.w600, fontSize: 14.f, fontFamily: isArabic ? 'GESSTwo' : 'Poppins'),
children: [
TextSpan(
text: suggestedCondition,
style: TextStyle(
color: AppColors.textColor,
fontWeight: FontWeight.w600,
fontSize: 14.f,
),
fontSize: 14.f, fontFamily: isArabic ? 'GESSTwo' : 'Poppins'),
),
],
),
@ -494,6 +490,7 @@ class _TriagePageState extends State<TriagePage> {
text: TextSpan(
text: "${probability.toStringAsFixed(1)}% ",
style: TextStyle(
fontFamily: isArabic ? 'GESSTwo' : 'Poppins',
color: AppColors.primaryRedColor,
fontWeight: FontWeight.w600,
fontSize: 14.f,
@ -505,6 +502,7 @@ class _TriagePageState extends State<TriagePage> {
color: AppColors.textColor,
fontWeight: FontWeight.w500,
fontSize: 13.f,
fontFamily: isArabic ? 'GESSTwo' : 'Poppins',
),
),
],

Loading…
Cancel
Save