fix general issue

lib/config/localized_values.dart

@@ -29,7 +29,7 @@ const Map<String, Map<String, String>> localizedValues = {
     'en': 'Answer/Suggestions',
     'ar': 'ملاحضات وتفاصيل العيادة'
   },
-  'outPatients': {'en': 'Out-Patients', 'ar': 'ةالمريض الخارجي'},
+  'outPatients': {'en': 'Out-Patients', 'ar': 'المريض الخارجي'},
   'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'},
   'searchAbout': {'en': 'Search', 'ar': 'البحث عن'},
   'patient': {'en': 'Patient', 'ar': ' مريض'},
@@ -44,7 +44,7 @@ const Map<String, Map<String, String>> localizedValues = {
   'radiology': {'en': 'Radiology', 'ar': 'الأشعة'},
   'service': {'en': 'Service', 'ar': 'خدمة'},
   'referral': {'en': 'Referral', 'ar': 'االإحالة'},
-  'inPatient': {'en': 'In-Patient', 'ar': 'االمريض الداخلي'},
+  'inPatient': {'en': 'In-Patient', 'ar': 'المريض الداخلي'},
   'operations': {'en': 'Operations', 'ar': 'عمليات'},
   'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'},
   'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'},

lib/screens/dashboard_screen.dart

@@ -141,16 +141,6 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 crossAxisAlignment: CrossAxisAlignment.start,
                                 mainAxisAlignment: MainAxisAlignment.start,
                                 children: <Widget>[
-                                  Row(
-                                    children: <Widget>[
-                                      AppText(
-                                        TranslationBase.of(context).welcome,
-                                        fontSize:
-                                            SizeConfig.textMultiplier * 1.7,
-                                        color: Colors.white,
-                                      )
-                                    ],
-                                  ),
                                   SizedBox(
                                     height: 4,
                                   ),
@@ -1201,8 +1191,8 @@ class DashboardItem extends StatelessWidget {
         height: height != null
             ? height
             : MediaQuery.of(context).orientation == Orientation.portrait
-                ? MediaQuery.of(context).size.height * 0.19
+                ? MediaQuery.of(context).size.height * 0.20
-                : MediaQuery.of(context).size.height * 0.35,
+                : MediaQuery.of(context).size.height * 0.36,
         decoration: BoxDecoration(
           color: !hasBorder
               ? color != null

lib/screens/settings/settings_screen.dart

@@ -1,3 +1,4 @@
+import 'package:doctor_app_flutter/config/config.dart';
 import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
 import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
@@ -34,7 +35,7 @@ class SettingsScreen extends StatelessWidget {
                       child: AnimatedContainer(
                           duration: Duration(milliseconds: 350),
                           decoration: BoxDecoration(
-                              color: !projectsProvider.isArabic ? HexColor('#58434F') : Colors.transparent,
+                              color: !projectsProvider.isArabic ? AppGlobal.appPrimaryColor : Colors.transparent,
                               border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0))
                           ),
                           child: Center(child: AppText(TranslationBase.of(context).lanEnglish, color: !projectsProvider.isArabic ? Colors.white : Colors.grey[500]))
@@ -47,7 +48,7 @@ class SettingsScreen extends StatelessWidget {
                       child: AnimatedContainer(
                           duration: Duration(milliseconds: 350),
                           decoration: BoxDecoration(
-                              color: projectsProvider.isArabic ?  HexColor('#58434F') : Colors.transparent,
+                              color: projectsProvider.isArabic ?  AppGlobal.appPrimaryColor : Colors.transparent,
                               border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0))
                           ),
                           child: Center(child: AppText(TranslationBase.of(context).lanArabic, color: projectsProvider.isArabic ? Colors.white : Colors.grey[500],))

lib/widgets/patients/profile/profile-welcome-widget.dart

@@ -43,7 +43,8 @@ final double height;
                   mainAxisAlignment: MainAxisAlignment.start,
                   children: <Widget>[
                     AppText(
-                      'Dr. ${authProvider.doctorProfile.doctorName}',
+                       TranslationBase.of(context).dr +
+                          ' ${authProvider.doctorProfile.doctorName}',
                       fontWeight: FontWeight.bold,
                       fontSize: SizeConfig.textMultiplier * 2.5,
                       color: Colors.white,

lib/widgets/patients/profile/soap_update/subjective/update_allergies_widget.dart

@@ -83,7 +83,6 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Container(
-                          child: Expanded(
                           child: Texts(
                               projectViewModel.isArabic
                                   ? selectedAllergy.selectedAllergy.nameAr
@@ -95,7 +94,6 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidget> {
                                   : TextDecoration.lineThrough,
                               bold: true,
                               color: Colors.black),
-                          ),
                           width: MediaQuery.of(context).size.width * 0.5,
                         ),
                         Texts(

lib/widgets/patients/profile/soap_update/subjective/update_history_widget.dart

@@ -83,7 +83,6 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Container(
-                        child: Expanded(
                         child: Texts(
                             projectViewModel.isArabic
                                 ? myHistory.selectedHistory.nameAr
@@ -94,7 +93,6 @@ class _UpdateHistoryWidgetState extends State<UpdateHistoryWidget>
                                 : TextDecoration.lineThrough,
                             bold: true,
                             color: Colors.black),
-                        ),
                         width: MediaQuery.of(context).size.width * 0.7,
                       ),
                       if (myHistory.isChecked)
@@ -212,7 +210,9 @@ class _PriorityBarState extends State<PriorityBar> {
         crossAxisAlignment: CrossAxisAlignment.center,
         children: _priorities.map((item,) {
           bool _isActive = _priorities[_activePriority] == item ? true : false;
+          if(index <2){
             index++;
+          }
           return Expanded(
             child: InkWell(
                 child: Center(