Merge branch 'Amjad_search' into 'master'

Amjad search

See merge request Cloud_Solution/doctor_app_flutter!94

lib/config/localized_values.dart

@@ -11,5 +11,14 @@ const Map<String, Map<String, String>> localizedValues = {
   'messagesScreenToolbarTitle' : {'en': 'Messages','ar': 'الرسائل' },
   'mySchedule' : {'en': 'My Schedule', 'ar' : 'جدولي'},
   'errorNoSchedule' :{'en': 'You don\'t have any Schedule' , 'ar': 'ليس لديك أي جدول زمني'},
+  'verify': {'en': 'Verify', 'ar' : 'تحقق'},
+  'referralDoctor':{'en': 'Referral Doctor', 'ar' : 'الطبيب المُحول إليه'},
+  'referringClinic':{'en': 'Referring Clinic', 'ar' : 'العيادة المُحول إليها'},
+  'frequency':{'en': 'Frequency', 'ar' : 'نوع التحويلا'},
+  'priority':{'en': 'Priority', 'ar' : 'الأولوية'},
+  'maxResponseTime':{'en': 'Max Response Time', 'ar' : 'الوقت الأقصى للرد'},
+  'clinicDetailsandRemarks':{'en': 'Clinic Details and Remarks', 'ar' : 'ملاحضات وتفاصيل العيادة'},
+  'answerSuggestions':{'en': 'Answer/Suggestions', 'ar' : 'ملاحضات وتفاصيل العيادة'},
+
 
 };

lib/screens/patients/patients_screen.dart

@@ -398,9 +398,9 @@ class _PatientsScreenState extends State<PatientsScreen> {
                                                                           url +
                                                                               avatarFemale,
                                                                               height:
-                                                                              100.0,
+                                                                              80.0,
                                                                           width:
-                                                                             100.0,
+                                                                             80.0,
                                                                           semanticsLabel:
                                                                               'Female Logo')
                                                                     ],

lib/util/translations_delegate_base.dart

@@ -40,6 +40,16 @@ class TranslationBase {
   String get errorNoSchedule => localizedValues['errorNoSchedule'][locale.languageCode];
 
 
+  String get verify => localizedValues['verify'][locale.languageCode];
+  String get referralDoctor => localizedValues['referralDoctor'][locale.languageCode];
+  String get referringClinic => localizedValues['referringClinic'][locale.languageCode];
+  String get frequency => localizedValues['frequency'][locale.languageCode];
+  String get priority => localizedValues['priority'][locale.languageCode];
+  String get maxResponseTime => localizedValues['maxResponseTime'][locale.languageCode];
+  String get clinicDetailsandRemarks=> localizedValues['clinicDetailsandRemarks'][locale.languageCode];
+  String get answerSuggestions => localizedValues['answerSuggestions'][locale.languageCode];
+
+
 }
 
 class TranslationBaseDelegate extends LocalizationsDelegate<TranslationBase> {

lib/widgets/doctor/my_referred_patient_widget.dart

@@ -1,6 +1,7 @@
 import 'package:doctor_app_flutter/models/my_referral_patient_model.dart';
 import 'package:doctor_app_flutter/models/my_referred_patient_model.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
+import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:flutter/material.dart';
 
 import 'package:doctor_app_flutter/config/size_config.dart';
@@ -96,7 +97,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                             CrossAxisAlignment.start,
                                         children: <Widget>[
                                           AppText(
-                                            'File No',
+                                            TranslationBase.of(context).fileNo,
                                             fontSize:
                                                 1.7 * SizeConfig.textMultiplier,
                                             fontWeight: FontWeight.bold,
@@ -124,7 +125,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                             CrossAxisAlignment.start,
                                         children: <Widget>[
                                           AppText(
-                                            'Referral Doctor',
+                                            TranslationBase.of(context).referralDoctor,
                                             fontSize:
                                                 1.7 * SizeConfig.textMultiplier,
                                             fontWeight: FontWeight.bold,
@@ -151,7 +152,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                               CrossAxisAlignment.start,
                                           children: <Widget>[
                                             AppText(
-                                              'Referring Clinic',
+                                              TranslationBase.of(context).referringClinic,
                                               fontSize: 1.7 *
                                                   SizeConfig.textMultiplier,
                                               fontWeight: FontWeight.bold,
@@ -179,7 +180,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                               CrossAxisAlignment.start,
                                           children: <Widget>[
                                             AppText(
-                                              'Frequency',
+                                              TranslationBase.of(context).frequency,
                                               fontSize: 1.7 *
                                                   SizeConfig.textMultiplier,
                                               fontWeight: FontWeight.bold,
@@ -207,7 +208,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                             CrossAxisAlignment.start,
                                         children: <Widget>[
                                           AppText(
-                                            'Priority',
+                                            TranslationBase.of(context).priority,
                                             fontSize:
                                                 1.7 * SizeConfig.textMultiplier,
                                             fontWeight: FontWeight.bold,
@@ -235,7 +236,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                             CrossAxisAlignment.start,
                                         children: <Widget>[
                                           AppText(
-                                            'Max Response Time',
+                                            TranslationBase.of(context).maxResponseTime,
                                             fontSize:
                                                 1.7 * SizeConfig.textMultiplier,
                                             fontWeight: FontWeight.bold,
@@ -263,7 +264,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                               height: 5,
                             ),
                             AppText(
-                              'Clinic Details and Remarks',
+                              TranslationBase.of(context).clinicDetailsandRemarks,
                               fontSize: 1.7 * SizeConfig.textMultiplier,
                               fontWeight: FontWeight.bold,
                               textAlign: TextAlign.start,
@@ -281,7 +282,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                               height: 5,
                             ),
                             AppText(
-                              'Answer/Suggestions',
+                              TranslationBase.of(context).answerSuggestions,
                               fontSize: 1.7 * SizeConfig.textMultiplier,
                               fontWeight: FontWeight.bold,
                               textAlign: TextAlign.start,
@@ -319,7 +320,7 @@ class _MyReferredPatientWidgetState extends State<MyReferredPatientWidget> {
                                     DrAppToastMsg.showErrorToast(e);
                                   }
                                 },
-                                title: 'Verify',
+                                title: TranslationBase.of(context).verify,
                                 loading: _isLoading,
                               ),
                             )

lib/widgets/shared/card_with_bgNew_widget.dart

@@ -36,11 +36,11 @@ class CardWithBgWidgetNew extends StatelessWidget {
           children: [
             Center(
               child: Container(
-                  padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10
+                 // padding:EdgeInsets.fromLTRB(0, 10,0, 10), //EdgeInsets.all(10.0),//10
                  // margin: EdgeInsets.only(left: 10),
                   child: Padding(
                     padding: const EdgeInsets.all(8.0),
-                    child: widget,
+                    child: Center(child: widget),
                   )),
             )
           ],