From cd7845b1a49afa20de2e166ec56770f6b8b10e01 Mon Sep 17 00:00:00 2001
From: Sultan Khan <sultan.khan@hmg.local>
Date: Wed, 31 Mar 2021 20:43:01 +0300
Subject: [PATCH] bug fix

---
 assets/images/lang.png                     | Bin 0 -> 3939 bytes
 lib/config/config.dart                     |  13 +++++++-----
 lib/pages/landing/home_page.dart           |   5 +++--
 lib/pages/login/confirm-login.dart         |  21 ++++++++++++++++----
 lib/pages/login/login.dart                 |   1 +
 lib/widgets/drawer/app_drawer_widget.dart  |  11 ++++++++---
 lib/widgets/drawer/drawer_item_widget.dart |  22 ++++++++++++---------
 lib/widgets/mobile-no/mobile_no.dart       |  17 +++-------------
 8 files changed, 53 insertions(+), 37 deletions(-)
 create mode 100644 assets/images/lang.png

diff --git a/assets/images/lang.png b/assets/images/lang.png
new file mode 100644
index 0000000000000000000000000000000000000000..34af3d9a98d87d1c109fe0afbc328b8ba94bcdc5
GIT binary patch
literal 3939
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

literal 0
HcmV?d00001

diff --git a/lib/config/config.dart b/lib/config/config.dart
index 1ea16a37..f87b7628 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -14,7 +14,7 @@ const PACKAGES_SHOPPING_CART = '/api/shopping_cart_items';
 const PACKAGES_ORDERS = '/api/orders';
 
 const BASE_URL = 'https://uat.hmgwebservices.com/';
-// const BASE_URL = 'https://hmgwebservices.com/';
+//const BASE_URL = 'https://hmgwebservices.com/';
 
 // Pharmacy UAT URLs
 const BASE_PHARMACY_URL = 'https://uat.hmgwebservices.com/epharmacy/api/';
@@ -33,7 +33,8 @@ const GET_GEO_ZONES = 'Services/Patients.svc/REST/GeoF_GetAllPoints';
 const LOG_GEO_ZONES = 'Services/Patients.svc/REST/GeoF_InsertPatientFileInfo';
 
 // Delivery Driver
-const DRIVER_LOCATION = 'Services/Patients.svc/REST/PatientER_GetDriverLocation';
+const DRIVER_LOCATION =
+    'Services/Patients.svc/REST/PatientER_GetDriverLocation';
 
 //weather
 const WEATHER_INDICATOR = 'Services/Weather.svc/REST/GetCityInfo';
@@ -220,9 +221,11 @@ const GET_PATIENT_SHARE =
 const GET_PATIENT_APPOINTMENT_HISTORY =
     "Services/Doctors.svc/REST/PateintHasAppoimentHistory";
 
-const SEND_REPORT_EYE_EMAIL = "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
+const SEND_REPORT_EYE_EMAIL =
+    "Services/Notifications.svc/REST/SendGlassesPrescriptionEmail";
 
-const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL = "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
+const SEND_CONTACT_LENS_PRESCRIPTION_EMAIL =
+    "Services/Notifications.svc/REST/SendContactLensPrescriptionEmail";
 
 //URL to get patient appointment curfew history
 const GET_PATIENT_APPOINTMENT_CURFEW_HISTORY =
@@ -509,7 +512,7 @@ const LAKUM_GET_USER_TERMS_AND_CONDITIONS =
     "Services/ERP.svc/REST/GetUserTermsAndConditionsForEPharmcy";
 const PRESCRIPTION = 'Services/Patients.svc/REST/GetPrescriptionApptList';
 const GET_RECOMMENDED_PRODUCT = 'alsoProduct/';
-const GET_MOST_VIEWED_PRODUCTS ="mostview?";
+const GET_MOST_VIEWED_PRODUCTS = "mostview?";
 const GET_NEW_PRODUCTS = "newproducts?";
 
 // Home Health Care
diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart
index 2b3f591d..d1b8d4f3 100644
--- a/lib/pages/landing/home_page.dart
+++ b/lib/pages/landing/home_page.dart
@@ -358,7 +358,7 @@ class _HomePageState extends State<HomePage> {
                                                   height: 5,
                                                 ),
                                                 Texts(
-                                                  '${DateUtil.getMonthDayYearDateFormatted(model.user.dateofBirthDataTime)} ,${model.user.genderDescription} ${model.user.ageDesc}',
+                                                  '${DateUtil.getMonthDayYearDateFormatted(model.user.dateofBirthDataTime)} ,${model.user.gender == 1 ? TranslationBase.of(context).male : TranslationBase.of(context).female} ${model.user.age.toString() + "y"}',
                                                   color: Colors.grey[100],
                                                   fontWeight: FontWeight.normal,
                                                   fontSize: 14,
@@ -387,9 +387,10 @@ class _HomePageState extends State<HomePage> {
                                             child: Center(
                                               child: Texts(
                                                 TranslationBase.of(context)
-                                                    .viewMore,
+                                                    .myMedicalFile,
                                                 color: Colors.white,
                                                 fontSize: 12,
+                                                textAlign: TextAlign.center,
                                               ),
                                             ),
                                           ),
diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart
index 1952de64..2ef8d0a2 100644
--- a/lib/pages/login/confirm-login.dart
+++ b/lib/pages/login/confirm-login.dart
@@ -31,6 +31,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:intl/intl.dart';
+import 'package:local_auth/auth_strings.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:provider/provider.dart';
 // import 'package:smart_progress_bar/smart_progress_bar.dart';
@@ -383,10 +384,21 @@ class _ConfirmLogin extends State<ConfirmLogin> {
   loginWithFingurePrintFace(type, isActive) async {
     if (isActive == 1) {
       // this.startBiometricLoginIfAvailable();
-      authenticated = await auth.authenticateWithBiometrics(
-          localizedReason: 'Scan your fingerprint to authenticate',
-          useErrorDialogs: true,
-          stickyAuth: true);
+      const iosStrings = const IOSAuthMessages(
+          cancelButton: 'cancel',
+          goToSettingsButton: 'settings',
+          goToSettingsDescription: 'Please set up your Touch ID.',
+          lockOut: 'Please reenable your Touch ID');
+
+      try {
+        authenticated = await auth.authenticateWithBiometrics(
+            localizedReason: 'Scan your fingerprint to authenticate',
+            useErrorDialogs: true,
+            stickyAuth: true,
+            iOSAuthStrings: iosStrings);
+      } on PlatformException catch (e) {
+        AppToast.showErrorToast(message: e.toString());
+      }
 
       if (authenticated == true) {
         if (user != null && (user.logInType == 2 || user.logInType == 3)) {
@@ -530,6 +542,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                       userData = result.list,
                       // sharedPref.setString(
                       //  BLOOD_TYPE, result['PatientBloodType']),
+                      authenticatedUserObject.user = result.list,
                       sharedPref.setObject(MAIN_USER, result.list),
                       sharedPref.setObject(USER_PROFILE, result.list),
                       loginTokenID = result.logInTokenID,
diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart
index 8d655f76..927e98de 100644
--- a/lib/pages/login/login.dart
+++ b/lib/pages/login/login.dart
@@ -265,6 +265,7 @@ class _Login extends State<Login> {
       authenticatedUserObject.isLogin = true;
       appointmentRateViewModel.isLogin = true;
       projectViewModel.isLogin = true;
+      authenticatedUserObject.user = result.list;
       projectViewModel.user = authenticatedUserObject.user;
 
       await pharmacyModuleViewModel.generatePharmacyToken().then((value) async {
diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart
index c4a7d8d0..5192e0f0 100644
--- a/lib/widgets/drawer/app_drawer_widget.dart
+++ b/lib/widgets/drawer/app_drawer_widget.dart
@@ -160,8 +160,13 @@ class _AppDrawerState extends State<AppDrawer> {
                           children: <Widget>[
                             InkWell(
                               child: DrawerItem(
-                                  TranslationBase.of(context).arabicChange,
-                                  Icons.translate),
+                                TranslationBase.of(context).arabicChange,
+                                Padding(
+                                    child:
+                                        Image.asset('assets/images/lang.png'),
+                                    padding: EdgeInsets.all(3)),
+                                isImageIcon: true,
+                              ),
                               onTap: () {
                                 sharedPref.setBool(IS_ROBOT_INIT, null);
                                 if (projectProvider.isArabic) {
@@ -304,7 +309,7 @@ class _AppDrawerState extends State<AppDrawer> {
                                                                                       padding: EdgeInsets.only(left: 5, right: 5),
                                                                                       child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
                                                                                         AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
-                                                                                        AppText(TranslationBase.of(context).fileno + ": " + result.iD.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
+                                                                                        AppText(TranslationBase.of(context).fileno + ": " + result.patientID.toString(), color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black),
                                                                                       ]))),
                                                                             ],
                                                                           )))
diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart
index bca885b0..beb6ef4a 100644
--- a/lib/widgets/drawer/drawer_item_widget.dart
+++ b/lib/widgets/drawer/drawer_item_widget.dart
@@ -9,19 +9,21 @@ import 'package:flutter/material.dart';
 class DrawerItem extends StatefulWidget {
   final String title;
   final String subTitle;
-  final IconData icon;
+  final icon;
   final Color textColor;
   final Color iconColor;
   final bool bottomLine;
   final bool sideArrow;
   final Widget count;
+  final bool isImageIcon;
   DrawerItem(this.title, this.icon,
       {this.textColor,
       this.iconColor,
       this.subTitle = '',
       this.bottomLine = true,
       this.count,
-      this.sideArrow = false});
+      this.sideArrow = false,
+      this.isImageIcon = false});
 
   @override
   _DrawerItemState createState() => _DrawerItemState();
@@ -47,13 +49,15 @@ class _DrawerItemState extends State<DrawerItem> {
             children: <Widget>[
               Expanded(
                   flex: 1,
-                  child: Icon(
-                    widget.icon,
-                    color: widget.iconColor == null
-                        ? Theme.of(context).textTheme.bodyText1.color
-                        : widget.iconColor,
-                    size: SizeConfig.imageSizeMultiplier * 5,
-                  )),
+                  child: widget.isImageIcon == true
+                      ? widget.icon
+                      : Icon(
+                          widget.icon,
+                          color: widget.iconColor == null
+                              ? Theme.of(context).textTheme.bodyText1.color
+                              : widget.iconColor,
+                          size: SizeConfig.imageSizeMultiplier * 5,
+                        )),
               Expanded(
                   flex: 7,
                   child: Column(
diff --git a/lib/widgets/mobile-no/mobile_no.dart b/lib/widgets/mobile-no/mobile_no.dart
index 5ed1f28e..6e89f529 100644
--- a/lib/widgets/mobile-no/mobile_no.dart
+++ b/lib/widgets/mobile-no/mobile_no.dart
@@ -6,21 +6,9 @@ import 'package:provider/provider.dart';
 
 import '../../Constants.dart';
 
-// OWNER : Ibrahim albitar
-// DATE : 12-04-2020
-// DESCRIPTION : Customization for Texts in app
-
 class MobileNo extends StatefulWidget {
   final bool disabled;
 
-  // final String data;
-  // final List<Countries> countries = [
-  //   new Countries( name: "Saudi Arabia",
-  //                 name_ar:"المملكة العربية السعودية", code: '966' ),
-  //   new Countries(name: "United Arab Emirates",
-  //               name_ar:"الإمارات العربية المتحدة",  code: '971'),
-  // ];
-
   final double margin;
   final double marginTop;
   final double marginRight;
@@ -99,7 +87,7 @@ class _MobileNo extends State<MobileNo> {
                               return DropdownMenuItem<String>(
                                 value: value.code,
                                 child: Text(projectProvider.isArabic == true
-                                    ? value
+                                    ? value.nameAr
                                     : value.name),
                               );
                             }).toList())))),
@@ -137,7 +125,7 @@ class _MobileNo extends State<MobileNo> {
                       left: widget.marginLeft),
               child: TextField(
                 controller: widget.controller,
-                keyboardType: TextInputType.phone,
+                keyboardType: TextInputType.number,
                 maxLength: 10,
 
                 // maxLengthEnforced: true,
@@ -145,6 +133,7 @@ class _MobileNo extends State<MobileNo> {
                 //   widget.controller.text = countryCode;
                 // },
                 onChanged: (value) => widget.onNumberChange(value),
+
                 decoration: InputDecoration(
                     counterText: "",
                     border: InputBorder.none,