updates

lib/config/localized_values.dart

@@ -208,7 +208,7 @@ const Map localizedValues = {
   "last-name": {"en": "Last Name", "ar": "إسم العائلة"},
   "female": {"en": "Female", "ar": "أنثى"},
   "male": {"en": "Male", "ar": "ذكر"},
-  "preferred-language": {"en": "Preferred Language", "ar": "اللغة المفضلة"},
+  "preferred-language": {"en": "Preferred Language *", "ar": "اللغة المفضلة *"},
   "english": {"en": "English", "ar": "الإنجليزية"},
   "arabic": {"en": "Arabic", "ar": "العربية"},
   "locations-register": {"en": "Where do you want to create this file?", "ar": "أين تريد فتح هذا الملف؟"},
@@ -682,7 +682,7 @@ const Map localizedValues = {
     "ar":
         "توفر هذه الخدمة مجموعه من خدمات الرعايه الصحيه المنزلية و متابعه مستمره وشامله للذين لا يستطيعون الوصول للمنشات الصحيه في اماكن اقامتهم (التحاليل المخبرية – الاشعة – التطعيمات – العلاج الطبيعي) ..."
   },
-  "email": {"en": "Email", "ar": "البريد الالكتروني"},
+  "email": {"en": "Email *", "ar": "البريد الالكتروني *"},
   "Book": {"en": "Book", "ar": "حجز"},
   "AppointmentLabel": {"en": "Appointment", "ar": "موعد"},
   "BloodType": {"en": "Blood Type", "ar": "فصيلة الدم"},
@@ -1324,7 +1324,7 @@ const Map localizedValues = {
   "notif-permission-title": {"en": "Could not set the water reminders", "ar": "لا يمكن ضبط اشعار شرب الماء"},
   "notif-permission-msg": {"en": "To recieve water reminders, please turn on notifications in the system settings", "ar": "الرجاء تفعيل الاشعارات في الاعدادات"},
   "verification_message_code": {"en": "Please enter verification code", "ar": "الرجاء إدخال رمز التحقق"},
-  "select-location": {"en": "Select Location", "ar": "اختر الموقع"},
+  "select-location": {"en": "Select Location *", "ar": "اختر الموقع *"},
   "result-header": {"en": "Get the result in Few Hours", "ar": "احصل على النتيجة خلال عدة ساعات"},
   "please_select_gender": {"en": "Please select gender", "ar": "يرجى تحديد الجنس"},
   "covid-info": {

lib/pages/login/register-info.dart

@@ -26,7 +26,6 @@ import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
 import 'package:diplomaticquarterapp/widgets/text/app_texts_widget.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:hijri/hijri_calendar.dart';
 import 'package:intl/intl.dart';
@@ -278,7 +277,7 @@ class _RegisterInfo extends State<RegisterInfo> {
                 Expanded(
                   child: Padding(
                       padding: EdgeInsets.all(10),
-                      child: DefaultButton(TranslationBase.of(context).cancel, () {
+                      child: DefaultButton(page == 2 ? TranslationBase.of(context).back : TranslationBase.of(context).cancel, () {
                         Navigator.of(context).pop();
                         locator<GAnalytics>().loginRegistration.registration_cancel(step: page == 1 ? 'personal info' : 'other details');
                       }, textColor: Colors.white, color: Color(0xffD02127))),
@@ -287,7 +286,11 @@ class _RegisterInfo extends State<RegisterInfo> {
                   child: Padding(
                       padding: EdgeInsets.all(10),
                       child: DefaultButton(page == 1 ? TranslationBase.of(context).next : TranslationBase.of(context).register, () {
-                        nextPage();
+                        if (isValid() && page == 2 || page == 1) {
+                          nextPage();
+                        } else {
+                          Utils.showErrorToast(TranslationBase.of(context).validEmail);
+                        }
                         page == 1 ? locator<GAnalytics>().loginRegistration.registration_personal_info() : locator<GAnalytics>().loginRegistration.registration_patient_info();
                       }, textColor: Colors.white, color: isValid() == true && page == 2 || page == 1 ? Color(0xff359846) : Colors.grey)),
                 ),

lib/widgets/new_design/doctor_header.dart

@@ -302,7 +302,7 @@ class DoctorHeader extends StatelessWidget {
                                   ],
                                 ),
                                 Container(
-                                  margin: EdgeInsets.only(top: 10.0, left: 20.0, right: 20.0),
+                                  margin: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0),
                                   child: Text(getRatingWidth(doctorDetailsList[0].patientNumber).round().toString() + "%",
                                       style: TextStyle(fontSize: 14.0, color: Colors.black, fontWeight: FontWeight.w600)),
                                 ),
@@ -323,7 +323,7 @@ class DoctorHeader extends StatelessWidget {
                                   ],
                                 ),
                                 Container(
-                                  margin: EdgeInsets.only(top: 10.0, left: 20.0, right: 20.0),
+                                  margin: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0),
                                   child: Text(getRatingWidth(doctorDetailsList[1].patientNumber).round().toString() + "%",
                                       style: TextStyle(fontSize: 14.0, color: Colors.black, fontWeight: FontWeight.w600)),
                                 ),
@@ -344,7 +344,7 @@ class DoctorHeader extends StatelessWidget {
                                   ],
                                 ),
                                 Container(
-                                  margin: EdgeInsets.only(top: 10.0, left: 20.0, right: 20.0),
+                                  margin: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0),
                                   child: Text(getRatingWidth(doctorDetailsList[2].patientNumber).round().toString() + "%",
                                       style: TextStyle(fontSize: 14.0, color: Colors.black, fontWeight: FontWeight.w600)),
                                 ),
@@ -365,7 +365,7 @@ class DoctorHeader extends StatelessWidget {
                                   ],
                                 ),
                                 Container(
-                                  margin: EdgeInsets.only(top: 10.0, left: 20.0, right: 20.0),
+                                  margin: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0),
                                   child: Text(getRatingWidth(doctorDetailsList[3].patientNumber).round().toString() + "%",
                                       style: TextStyle(fontSize: 14.0, color: Colors.black, fontWeight: FontWeight.w600)),
                                 ),
@@ -387,7 +387,7 @@ class DoctorHeader extends StatelessWidget {
                                   ],
                                 ),
                                 Container(
-                                  margin: EdgeInsets.only(top: 10.0, left: 20.0, right: 20.0),
+                                  margin: EdgeInsets.only(top: 10.0, left: 10.0, right: 10.0),
                                   child: Text(getRatingWidth(doctorDetailsList[4].patientNumber).round().toString() + "%",
                                       style: TextStyle(fontSize: 14.0, color: Colors.black, fontWeight: FontWeight.w600)),
                                 ),