diff --git a/assets/images/svg/change_language_home_page.svg b/assets/images/svg/change_language_home_page.svg
new file mode 100644
index 0000000..716a3b0
--- /dev/null
+++ b/assets/images/svg/change_language_home_page.svg
@@ -0,0 +1,10 @@
+
diff --git a/assets/langs/ar-SA.json b/assets/langs/ar-SA.json
index 3ceb2e9..90103c0 100644
--- a/assets/langs/ar-SA.json
+++ b/assets/langs/ar-SA.json
@@ -1385,7 +1385,7 @@
"seekMedicalAdviceDescription": "ليست حالة طوارئ ولكن من الأفضل مراقبة الأعراض.",
"emergencyDescription": "تحتاج إلى استشارة الطبيب في أقرب وقت ممكن قبل فوات الأوان.",
"colorScience": "دلالات الألوان",
- "noNeedToVisitDoctor": "لا حاجة لزي��رة الطبيب",
+ "noNeedToVisitDoctor": "لا حاجة لزيرة الطبيب",
"commonSymptom": "الأعراض الشائعة",
"bookAppointment": "احجز موعد",
"notApplicable": "لا ينطبق",
diff --git a/lib/core/app_assets.dart b/lib/core/app_assets.dart
index c3a24f7..1920ff2 100644
--- a/lib/core/app_assets.dart
+++ b/lib/core/app_assets.dart
@@ -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';
diff --git a/lib/presentation/book_appointment/book_appointment_page.dart b/lib/presentation/book_appointment/book_appointment_page.dart
index 4142dbe..b95e0c2 100644
--- a/lib/presentation/book_appointment/book_appointment_page.dart
+++ b/lib/presentation/book_appointment/book_appointment_page.dart
@@ -456,9 +456,10 @@ class _BookAppointmentPageState extends State {
SizedBox(width: 16.w),
CustomButton(
height: 40.h,
+ width: 40.w,
text: "",
onPressed: () => context.navigateWithName(AppRoutes.userInfoSelection),
- icon: AppAssets.arrow_forward,
+ icon: getIt.get().isArabic() ? AppAssets.arrow_back : AppAssets.arrow_forward,
)
],
).paddingAll(24.w),
diff --git a/lib/presentation/book_appointment/widgets/clinic_card.dart b/lib/presentation/book_appointment/widgets/clinic_card.dart
index c563c16..7e3c8df 100644
--- a/lib/presentation/book_appointment/widgets/clinic_card.dart
+++ b/lib/presentation/book_appointment/widgets/clinic_card.dart
@@ -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(),
],
),
diff --git a/lib/presentation/home/landing_page.dart b/lib/presentation/home/landing_page.dart
index b633404..770e953 100644
--- a/lib/presentation/home/landing_page.dart
+++ b/lib/presentation/home/landing_page.dart
@@ -249,7 +249,7 @@ class _LandingPageState extends State {
);
}),
!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()
diff --git a/lib/presentation/symptoms_checker/organ_selector_screen.dart b/lib/presentation/symptoms_checker/organ_selector_screen.dart
index e3944c2..9a4a1d9 100644
--- a/lib/presentation/symptoms_checker/organ_selector_screen.dart
+++ b/lib/presentation/symptoms_checker/organ_selector_screen.dart
@@ -99,11 +99,11 @@ class _OrganSelectorPageState extends State {
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,
),
diff --git a/lib/presentation/symptoms_checker/risk_factors_screen.dart b/lib/presentation/symptoms_checker/risk_factors_screen.dart
index 8264b8b..484ad2d 100644
--- a/lib/presentation/symptoms_checker/risk_factors_screen.dart
+++ b/lib/presentation/symptoms_checker/risk_factors_screen.dart
@@ -125,6 +125,7 @@ class _RiskFactorsScreenState extends State {
fontSize: 13.f,
fontWeight: FontWeight.w500,
color: AppColors.greyInfoTextColor,
+ fontFamily: isArabic ? 'GESSTwo' : 'Poppins'
),
children: [
TextSpan(
diff --git a/lib/presentation/symptoms_checker/triage_screen.dart b/lib/presentation/symptoms_checker/triage_screen.dart
index a7975e2..0811833 100644
--- a/lib/presentation/symptoms_checker/triage_screen.dart
+++ b/lib/presentation/symptoms_checker/triage_screen.dart
@@ -467,18 +467,14 @@ class _TriagePageState extends State {
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 {
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 {
color: AppColors.textColor,
fontWeight: FontWeight.w500,
fontSize: 13.f,
+ fontFamily: isArabic ? 'GESSTwo' : 'Poppins',
),
),
],