Merge branch 'development' into patients-new-design

lib/screens/prescription/prescriptions_page.dart

@@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/screens/prescription/add_prescription_form.da
 import 'package:doctor_app_flutter/screens/prescription/prescription_items_page.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
+import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/patient-profile-header-new-design.dart';
 import 'package:doctor_app_flutter/widgets/shared/Text.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_expandable_notifier_new.dart';
@@ -30,14 +31,13 @@ class PrescriptionsPage extends StatelessWidget {
         onModelReady: (model) => model.getPrescriptions(patient),
         builder: (_, model, w) => AppScaffold(
               baseViewModel: model,
-              isShowAppBar: false,
+              isShowAppBar: true,
+              appBar:  PatientProfileHeaderNewDesignAppBar(patient, arrivalType ?? '0', patientType),
               body: FractionallySizedBox(
                 widthFactor: 1.0,
                 child: ListView(
                   physics: BouncingScrollPhysics(),
                   children: <Widget>[
-                    PatientProfileHeaderNewDesign(
-                        patient, arrivalType ?? '0', patientType),
                     SizedBox(
                       height: 12,
                     ),

lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart

@@ -365,7 +365,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 children: <Widget>[
                                   Texts(
-                                    '${TranslationBase.of(context).dr}.$doctorName',
+                                    '${TranslationBase.of(context).dr}$doctorName',
                                     color: Colors.black,
                                     fontWeight: FontWeight.w600,
                                     fontSize: 14,
@@ -374,11 +374,12 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                                     Row(
                                       children: <Widget>[
                                         Texts(
-                                          'Order No:',
+                                          'Order No: ',
                                           color: Colors.grey[800],
+                                            fontSize: 14
                                         ),
                                         Texts(
-                                          orderNo ?? '',
+                                          orderNo ?? '',fontSize: 14
                                         )
                                       ],
                                     ),
@@ -386,11 +387,13 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                                     Row(
                                       children: <Widget>[
                                         Texts(
-                                          'Invoice:',
+                                          'Invoice: ',
                                           color: Colors.grey[800],
+                                            fontSize: 14
                                         ),
                                         Texts(
                                           invoiceNO,
+                                            fontSize: 14
                                         )
                                       ],
                                     ),
@@ -398,11 +401,13 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                                     Row(
                                       children: [
                                         Texts(
-                                          'Branch:',
+                                          'Branch: ',
                                           color: Colors.grey[800],
+                                            fontSize: 14
                                         ),
                                         Texts(
                                           branch?? '',
+                                            fontSize: 14
                                         )
                                       ],
                                     ),
@@ -410,23 +415,26 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                                     Row(
                                       children: [
                                         Texts(
-                                          'Clinic:',
+                                          'Clinic: ',
                                           color: Colors.grey[800],
+                                            fontSize: 14
                                         ),
                                         Texts(
                                           clinic?? '',
+                                            fontSize: 14
                                         )
                                       ],
                                     ),
                                   Row(
                                     children: <Widget>[
                                       Texts(
-                                        !isPrescriptions? 'Result Date:': 'Prescriptions Date',
+                                        !isPrescriptions? 'Result Date: ': 'Prescriptions Date ',
                                         color: Colors.grey[800],
+                                        fontSize: 14,
                                       ),
                                       Expanded(
                                         child: Texts(
-                                            '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',
+                                            '${DateUtils.getDayMonthYearDateFormatted(appointmentDate, isArabic: projectViewModel.isArabic)}',fontSize: 14,
                                         ),
                                       )
                                     ],
@@ -486,5 +494,5 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
   }
 
   @override
-  Size get preferredSize => Size(double.maxFinite,500);
+  Size get preferredSize => Size(double.maxFinite,270);
 }