App directionality changes

lib/presentation/appointments/appointment_details_page.dart

@@ -5,6 +5,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -34,6 +35,7 @@ import 'package:hmg_patient_app_new/widgets/transitions/fade_page.dart';
 import 'package:maps_launcher/maps_launcher.dart';
 import 'package:provider/provider.dart';
 
+import '../../core/dependencies.dart';
 import '../medical_file/widgets/medical_file_card.dart';
 
 class AppointmentDetailsPage extends StatefulWidget {
@@ -63,6 +65,7 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context, listen: false);
     prescriptionsViewModel = Provider.of<PrescriptionsViewModel>(context, listen: false);
     bookAppointmentsViewModel = Provider.of<BookAppointmentsViewModel>(context, listen: false);
@@ -313,13 +316,16 @@ class _AppointmentDetailsPageState extends State<AppointmentDetailsPage> {
                                                                   ],
                                                                 ),
                                                                 SizedBox(width: 68.h),
-                                                                Utils.buildSvgWithAssets(
+                                                                Transform.flip(
+                                                                  flipX: appState.isArabic() ? true : false,
+                                                                  child: Utils.buildSvgWithAssets(
                                                                     icon: AppAssets.forward_arrow_icon,
                                                                     iconColor: AppColors.blackColor,
                                                                     width: 18.h,
                                                                     height: 13.h,
                                                                     fit: BoxFit.contain,
                                                                   ),
+                                                                ),
                                                               ],
                                                             ),
                                                           ],

lib/presentation/appointments/appointment_payment_page.dart

@@ -103,13 +103,16 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                             ),
                             SizedBox(width: 8.h),
                             const Spacer(),
-                            Utils.buildSvgWithAssets(
+                            Transform.flip(
+                              flipX: appState.isArabic() ? true : false,
+                              child: Utils.buildSvgWithAssets(
                                 icon: AppAssets.forward_arrow_icon,
                                 iconColor: AppColors.blackColor,
                                 width: 18.h,
                                 height: 13.h,
                                 fit: BoxFit.contain,
                               ).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
+                            ),
                           ],
                         ).paddingSymmetrical(16.h, 16.h),
                       ).paddingSymmetrical(24.h, 0.h).onPress(() {
@@ -142,13 +145,16 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                             ),
                             SizedBox(width: 8.h),
                             const Spacer(),
-                            Utils.buildSvgWithAssets(
+                            Transform.flip(
+                              flipX: appState.isArabic() ? true : false,
+                              child: Utils.buildSvgWithAssets(
                                 icon: AppAssets.forward_arrow_icon,
                                 iconColor: AppColors.blackColor,
                                 width: 18.h,
                                 height: 13.h,
                                 fit: BoxFit.contain,
                               ).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
+                            ),
                           ],
                         ).paddingSymmetrical(16.h, 16.h),
                       ).paddingSymmetrical(24.h, 0.h).onPress(() {
@@ -175,13 +181,16 @@ class _AppointmentPaymentPageState extends State<AppointmentPaymentPage> {
                             ),
                             SizedBox(width: 8.h),
                             const Spacer(),
-                            Utils.buildSvgWithAssets(
+                            Transform.flip(
+                              flipX: appState.isArabic() ? true : false,
+                              child: Utils.buildSvgWithAssets(
                                 icon: AppAssets.forward_arrow_icon,
                                 iconColor: AppColors.blackColor,
                                 width: 18.h,
                                 height: 13.h,
                                 fit: BoxFit.contain,
                               ).toShimmer2(isShow: myAppointmentsVM.isAppointmentPatientShareLoading),
+                            ),
                           ],
                         ).paddingSymmetrical(16.h, 16.h),
                       ).paddingSymmetrical(24.h, 0.h).onPress(() {

lib/presentation/appointments/my_doctors_page.dart

@@ -2,6 +2,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -21,6 +23,7 @@ class MyDoctorsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     myAppointmentsViewModel = Provider.of<MyAppointmentsViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
@@ -136,7 +139,9 @@ class MyDoctorsPage extends StatelessWidget {
                                           mainAxisAlignment: MainAxisAlignment.spaceBetween,
                                           children: [
                                             "".toText16(),
-                                            Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor),
+                                            Transform.flip(
+                                                flipX: appState.isArabic() ? true : false,
+                                                child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)),
                                           ],
                                         ),
                                       ],

lib/presentation/appointments/widgets/appointment_card.dart

@@ -219,13 +219,17 @@ class _AppointmentCardState extends State<AppointmentCard> {
                     ),
                     child: Padding(
                       padding: EdgeInsets.all(10.h),
+                      child: Transform.flip(
+                        flipX: appState.isArabic() ? true : false,
                         child: Utils.buildSvgWithAssets(
                           icon: AppAssets.forward_arrow_icon,
+                          iconColor: AppColors.whiteColor,
                           width: 10.h,
                           height: 10.h,
                           fit: BoxFit.contain,
                         ),
                       ),
+                    ),
                   ).toShimmer2(isShow: widget.isLoading).onPress(() {
                     Navigator.of(context)
                         .push(

lib/presentation/appointments/widgets/appointment_checkin_bottom_sheet.dart

@@ -31,11 +31,12 @@ class AppointmentCheckinBottomSheet extends StatelessWidget {
   bool _supportsNFC = false;
 
   late LocationUtils locationUtils;
+  late AppState appState;
   ProjectDetailListModel projectDetailListModel = ProjectDetailListModel();
 
   @override
   Widget build(BuildContext context) {
-    AppState _appState = getIt.get<AppState>();
+    appState = getIt.get<AppState>();
     FlutterNfcKit.nfcAvailability.then((value) {
       _supportsNFC = (value == NFCAvailability.available);
     });
@@ -53,7 +54,7 @@ class AppointmentCheckinBottomSheet extends StatelessWidget {
           //   appState: myAppointmentsViewModel.appState,
           // );
           locationUtils.getCurrentLocation(onSuccess: (value) {
-            projectDetailListModel = Utils.getProjectDetailObj(_appState, patientAppointmentHistoryResponseModel.projectID);
+            projectDetailListModel = Utils.getProjectDetailObj(appState, patientAppointmentHistoryResponseModel.projectID);
             double dist = Utils.distance(value.latitude, value.longitude, double.parse(projectDetailListModel.latitude!), double.parse(projectDetailListModel.longitude!)).ceilToDouble() * 1000;
             print(dist);
             if (dist <= projectDetailListModel.geofenceRadius!) {
@@ -120,13 +121,16 @@ class AppointmentCheckinBottomSheet extends StatelessWidget {
                   ],
                 ),
               ),
-              Utils.buildSvgWithAssets(
+              Transform.flip(
+                flipX: appState.isArabic() ? true : false,
+                child: Utils.buildSvgWithAssets(
                   icon: AppAssets.forward_arrow_icon,
                   iconColor: AppColors.blackColor,
                   width: 18.h,
                   height: 13.h,
                   fit: BoxFit.contain,
                 ),
+              ),
             ],
           ),
         ],

lib/presentation/appointments/widgets/faculity_selection/facility_selection_item.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -21,6 +23,7 @@ class FacilitySelectionItem extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Container(
       decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
         color: AppColors.whiteColor,
@@ -42,13 +45,16 @@ class FacilitySelectionItem extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               info,
-              Utils.buildSvgWithAssets(
+              Transform.flip(
+                flipX: appState.isArabic() ? true : false,
+                child: Utils.buildSvgWithAssets(
                   icon: AppAssets.forward_arrow_icon,
                   iconColor: AppColors.blackColor,
                   width: 18,
                   height: 13,
                   fit: BoxFit.contain,
                 ),
+              ),
             ],
           )
         ],

lib/presentation/appointments/widgets/hospital_bottom_sheet/hospital_list_items.dart

@@ -38,13 +38,16 @@ class HospitalListItem extends StatelessWidget {
               children: [hospitalName, distanceInfo],
             ),
           ),
-          Utils.buildSvgWithAssets(
+          Transform.flip(
+            flipX: appState.isArabic() ? true : false,
+            child: Utils.buildSvgWithAssets(
               icon: AppAssets.forward_arrow_icon,
               iconColor: AppColors.blackColor,
               width: 18,
               height: 13,
               fit: BoxFit.contain,
             ),
+          ),
         ],
       ).paddingSymmetrical(16.h, 16.h),
     );

lib/presentation/appointments/widgets/region_bottomsheet/region_list_item.dart

@@ -1,6 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -15,15 +17,11 @@ class RegionListItem extends StatelessWidget {
   final String hmgCount;
   final String subTitle;
 
-  const RegionListItem(
+  const RegionListItem({super.key, required this.title, required this.subTitle, required this.hmcCount, required this.hmgCount});
-      {super.key,
-      required this.title,
-      required this.subTitle,
-      required this.hmcCount,
-      required this.hmgCount});
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Container(
       decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
         color: AppColors.whiteColor,
@@ -40,19 +38,20 @@ class RegionListItem extends StatelessWidget {
               Row(
                 spacing: 8.h,
                 children: [
-                  placesCountItem(
+                  placesCountItem(AppAssets.hmg, hmgCount, " ${LocaleKeys.hospital.tr()}"),
-                      AppAssets.hmg, hmgCount, " ${LocaleKeys.hospital.tr()}"),
+                  placesCountItem(AppAssets.hmc, hmcCount, " ${LocaleKeys.medicalCenters.tr()}"),
-                  placesCountItem(AppAssets.hmc, hmcCount,
-                      " ${LocaleKeys.medicalCenters.tr()}"),
                 ],
               ),
-              Utils.buildSvgWithAssets(
+              Transform.flip(
+                flipX: appState.isArabic() ? true : false,
+                child: Utils.buildSvgWithAssets(
                   icon: AppAssets.forward_arrow_icon,
                   iconColor: AppColors.blackColor,
                   width: 18,
                   height: 13,
                   fit: BoxFit.contain,
                 ),
+              ),
             ],
           )
         ],
@@ -68,18 +67,8 @@ class RegionListItem extends StatelessWidget {
       richText: RichText(
           text: TextSpan(
               text: count,
-                      style: TextStyle(
+              style: TextStyle(fontSize: 12.h, fontWeight: FontWeight.w700, color: AppColors.blackColor),
-                          fontSize: 12.h,
+              children: [TextSpan(text: title, style: TextStyle(fontSize: 12.h, fontWeight: FontWeight.w500, color: AppColors.blackColor))])),
-                          fontWeight: FontWeight.w700,
-                          color: AppColors.blackColor),
-                      children: [
-                    TextSpan(
-                        text: title,
-                        style: TextStyle(
-                            fontSize: 12.h,
-                            fontWeight: FontWeight.w500,
-                            color: AppColors.blackColor))
-                  ])),
     );
   }
 

lib/presentation/book_appointment/book_appointment_page.dart

@@ -117,7 +117,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
                             ),
                           ],
                         ),
-                        Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h),
+                        Transform.flip(
+                            flipX: appState.isArabic() ? true : false, child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h)),
                       ],
                     ).onPress(() {
                       bookAppointmentsViewModel.setIsClinicsListLoading(true);
@@ -148,7 +149,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
                             ),
                           ],
                         ),
-                        Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h),
+                        Transform.flip(
+                            flipX: appState.isArabic() ? true : false, child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h)),
                       ],
                     ).onPress(() {
                       bookAppointmentsViewModel.setIsDoctorSearchByNameStarted(false);
@@ -177,7 +179,8 @@ class _BookAppointmentPageState extends State<BookAppointmentPage> {
                             ),
                           ],
                         ),
-                        Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h),
+                        Transform.flip(
+                            flipX: appState.isArabic() ? true : false, child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, iconColor: AppColors.textColor, width: 15.h, height: 15.h)),
                       ],
                     ).onPress(() {
                       openRegionListBottomSheet(context);

lib/presentation/book_appointment/widgets/clinic_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -15,6 +17,7 @@ class ClinicCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Container(
       padding: EdgeInsets.all(16.h),
       decoration: RoundedRectangleBorder().toSmoothCornerDecoration(
@@ -33,7 +36,9 @@ class ClinicCard extends StatelessWidget {
           SizedBox(height: 16.h),
           Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
             Expanded(child: (isLoading ? "Cardiology" : clinicsListResponseModel.clinicDescription!).toText16(isBold: true).toShimmer2(isShow: isLoading)),
-            Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor).toShimmer2(isShow: isLoading),
+            Transform.flip(
+                flipX: appState.isArabic() ? true : false,
+                child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor).toShimmer2(isShow: isLoading)),
           ]),
         ],
       ),

lib/presentation/habib_wallet/wallet_payment_confirm_page.dart

@@ -87,13 +87,16 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                           ),
                           SizedBox(width: 8.h),
                           const Spacer(),
-                          Utils.buildSvgWithAssets(
+                          Transform.flip(
+                            flipX: appState.isArabic() ? true : false,
+                            child: Utils.buildSvgWithAssets(
                               icon: AppAssets.forward_arrow_icon,
                               iconColor: AppColors.blackColor,
                               width: 18.h,
                               height: 13.h,
                               fit: BoxFit.contain,
                             ).toShimmer2(isShow: false),
+                          ),
                         ],
                       ).paddingSymmetrical(16.h, 16.h),
                     ).paddingSymmetrical(24.h, 0.h).onPress(() {
@@ -126,13 +129,16 @@ class _WalletPaymentConfirmPageState extends State<WalletPaymentConfirmPage> {
                           ),
                           SizedBox(width: 8.h),
                           const Spacer(),
-                          Utils.buildSvgWithAssets(
+                          Transform.flip(
+                            flipX: appState.isArabic() ? true : false,
+                            child: Utils.buildSvgWithAssets(
                               icon: AppAssets.forward_arrow_icon,
                               iconColor: AppColors.blackColor,
                               width: 18.h,
                               height: 13.h,
                               fit: BoxFit.contain,
                             ).toShimmer2(isShow: false),
+                          ),
                         ],
                       ).paddingSymmetrical(16.h, 16.h),
                     ).paddingSymmetrical(24.h, 0.h).onPress(() {

lib/presentation/habib_wallet/widgets/hospital_list_item.dart

@@ -35,13 +35,16 @@ class HospitalListItemAdvancePayment extends StatelessWidget {
               children: [hospitalName],
             ),
           ),
-          Utils.buildSvgWithAssets(
+          Transform.flip(
+            flipX: appState.isArabic() ? true : false,
+            child: Utils.buildSvgWithAssets(
               icon: AppAssets.forward_arrow_icon,
               iconColor: AppColors.blackColor,
               width: 18,
               height: 13,
               fit: BoxFit.contain,
             ),
+          ),
         ],
       ).paddingSymmetrical(16.h, 16.h),
     );

lib/presentation/lab/collapsing_list_view.dart

@@ -5,12 +5,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
 import 'package:hmg_patient_app_new/core/app_export.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
 import 'package:hmg_patient_app_new/extensions/widget_extensions.dart';
 import 'package:hmg_patient_app_new/generated/locale_keys.g.dart';
 import 'package:hmg_patient_app_new/theme/colors.dart';
 import 'package:hmg_patient_app_new/widgets/buttons/custom_button.dart';
+import '../../core/dependencies.dart';
 
 class CollapsingListView extends StatelessWidget {
   final String title;
@@ -27,6 +29,7 @@ class CollapsingListView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
       body: Column(
@@ -42,11 +45,14 @@ class CollapsingListView extends StatelessWidget {
                 surfaceTintColor: Colors.transparent,
                 backgroundColor: AppColors.bgScaffoldColor,
                 leading: isLeading
-                    ? IconButton(
+                    ? Transform.flip(
+                        flipX: appState.isArabic() ? true : false,
+                        child: IconButton(
                           icon: Utils.buildSvgWithAssets(icon: isClose ? AppAssets.closeBottomNav : AppAssets.arrow_back, width: 32.h, height: 32.h),
                           padding: EdgeInsets.only(left: 12),
                           onPressed: () => Navigator.pop(context),
                           highlightColor: Colors.transparent,
+                        ),
                       )
                     : SizedBox.shrink(),
                 flexibleSpace: LayoutBuilder(
@@ -71,7 +77,7 @@ class CollapsingListView extends StatelessWidget {
                             t,
                           )!,
                           child: Padding(
-                              padding: EdgeInsets.only(left: leftPadding, bottom: bottomPadding),
+                              padding: EdgeInsets.only(left: appState.isArabic() ? 0 : leftPadding, right: appState.isArabic() ? leftPadding : 0, bottom: bottomPadding),
                               child: Row(
                                 spacing: 4.h,
                                 children: [

lib/presentation/medical_file/medical_file_page.dart

@@ -141,7 +141,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                                 children: [
                                   AppCustomChipWidget(
                                     icon: AppAssets.file_icon,
-                                    labelText: "File no: ${appState.getAuthenticatedUser()!.patientId}",
+                                    labelText: "${LocaleKeys.fileNo.tr(context: context)}: ${appState.getAuthenticatedUser()!.patientId}",
                                   ),
                                   AppCustomChipWidget(
                                     icon: AppAssets.checkmark_icon,
@@ -167,7 +167,7 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                           ),
                           AppCustomChipWidget(
                             icon: AppAssets.blood_icon,
-                            labelText: "Blood: ${appState.getUserBloodGroup}",
+                            labelText: "${LocaleKeys.bloodType.tr(context: context)}: ${appState.getUserBloodGroup}",
                             iconColor: AppColors.primaryRedColor,
                           ),
                         ],
@@ -431,7 +431,9 @@ class _MedicalFilePageState extends State<MedicalFilePage> {
                                                 ),
                                               ),
                                               // SizedBox(width: 40.h),
-                                              Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor),
+                                              Transform.flip(
+                                                  flipX: appState.isArabic() ? true : false,
+                                                  child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)),
                                             ],
                                           ).onPress(() {
                                             prescriptionVM.setPrescriptionsDetailsLoading();

lib/presentation/medical_file/widgets/lab_rad_card.dart

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
 import 'package:hmg_patient_app_new/extensions/string_extensions.dart';
@@ -15,6 +17,7 @@ class LabRadCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Container(
       decoration: RoundedRectangleBorder().toSmoothCornerDecoration(color: AppColors.whiteColor, borderRadius: 24.h, hasShadow: false),
       child: Column(
@@ -49,13 +52,11 @@ class LabRadCard extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             children: [
               SizedBox.shrink(),
-              Utils.buildSvgWithAssets(
+              Transform.flip(
-                icon: AppAssets.forward_arrow_icon,
+                flipX: appState.isArabic() ? true : false,
-                width: 15.h,
+                child: Utils.buildSvgWithAssets(icon: AppAssets.forward_arrow_icon, width: 15.h, height: 15.h, fit: BoxFit.contain, iconColor: AppColors.textColor)
-                height: 15.h,
+                    .toShimmer2(isShow: false, radius: 12.h),
-                fit: BoxFit.contain,
+              ),
-                iconColor: AppColors.textColor
-              ).toShimmer2(isShow: false, radius: 12.h),
             ],
           )
         ],

lib/presentation/medical_file/widgets/medical_file_appointment_card.dart

@@ -1,6 +1,8 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -28,11 +30,14 @@ class MedicalFileAppointmentCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
         AppCustomChipWidget(
-          richText: DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false).toText12().paddingSymmetrical(12.h, 0.h),
+          richText: DateUtil.formatDateToDate(DateUtil.convertStringToDate(patientAppointmentHistoryResponseModel.appointmentDate), false)
+              .toText12(color: AppointmentType.isArrived(patientAppointmentHistoryResponseModel) ? AppColors.textColor : AppColors.primaryRedColor, fontWeight: FontWeight.w500)
+              .paddingOnly(left: 8.h),
           icon: AppointmentType.isArrived(patientAppointmentHistoryResponseModel) ? AppAssets.appointment_calendar_icon : AppAssets.alarm_clock_icon,
           iconColor: AppointmentType.isArrived(patientAppointmentHistoryResponseModel) ? AppColors.textColor : AppColors.primaryRedColor,
           iconSize: 16.h,
@@ -115,6 +120,8 @@ class MedicalFileAppointmentCard extends StatelessWidget {
                       ),
                       child: Padding(
                         padding: EdgeInsets.all(10.h),
+                        child: Transform.flip(
+                          flipX: appState.isArabic() ? true : false,
                           child: Utils.buildSvgWithAssets(
                             icon: AppAssets.forward_arrow_icon,
                             width: 10.h,
@@ -122,6 +129,7 @@ class MedicalFileAppointmentCard extends StatelessWidget {
                             fit: BoxFit.contain,
                           ),
                         ),
+                      ),
                     ).toShimmer2(isShow: myAppointmentsViewModel.isMyAppointmentsLoading).onPress(() {
                       Navigator.of(context)
                           .push(

lib/presentation/medical_file/widgets/patient_sick_leave_card.dart

@@ -139,6 +139,8 @@ class PatientSickLeaveCard extends StatelessWidget {
                     ),
                     child: Padding(
                       padding: EdgeInsets.all(10.h),
+                      child: Transform.flip(
+                        flipX: _appState.isArabic() ? true : false,
                         child: Utils.buildSvgWithAssets(
                           icon: AppAssets.forward_arrow_icon,
                           width: 10.h,
@@ -146,6 +148,7 @@ class PatientSickLeaveCard extends StatelessWidget {
                           fit: BoxFit.contain,
                         ),
                       ),
+                    ),
                   ).toShimmer2(isShow: isLoading).onPress(() {
                     Navigator.of(context).push(
                       CustomPageRoute(

lib/presentation/prescriptions/prescriptions_list_page.dart

@@ -4,6 +4,8 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_animations/flutter_staggered_animations.dart';
 import 'package:hmg_patient_app_new/core/app_assets.dart';
+import 'package:hmg_patient_app_new/core/app_state.dart';
+import 'package:hmg_patient_app_new/core/dependencies.dart';
 import 'package:hmg_patient_app_new/core/utils/date_util.dart';
 import 'package:hmg_patient_app_new/core/utils/size_utils.dart';
 import 'package:hmg_patient_app_new/core/utils/utils.dart';
@@ -42,6 +44,7 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
 
   @override
   Widget build(BuildContext context) {
+    AppState appState = getIt.get<AppState>();
     prescriptionsViewModel = Provider.of<PrescriptionsViewModel>(context, listen: false);
     return Scaffold(
       backgroundColor: AppColors.bgScaffoldColor,
@@ -249,6 +252,8 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
                                                                     ),
                                                                     child: Padding(
                                                                       padding: EdgeInsets.all(8.h),
+                                                                      child: Transform.flip(
+                                                                        flipX: appState.isArabic() ? true : false,
                                                                         child: Utils.buildSvgWithAssets(
                                                                           icon: AppAssets.forward_arrow_icon,
                                                                           width: 10.h,
@@ -256,6 +261,7 @@ class _PrescriptionsListPageState extends State<PrescriptionsListPage> {
                                                                           fit: BoxFit.contain,
                                                                         ),
                                                                       ),
+                                                                    ),
                                                                   ).onPress(() {
                                                                     model.setPrescriptionsDetailsLoading();
                                                                     Navigator.of(context).push(