From 2d7b2003bd89fc0acfc663a268ae77af0fa20c55 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <Mohammad.Al-Jammal@cloudsolutions.com.sa>
Date: Fri, 16 Apr 2021 14:30:40 +0300
Subject: [PATCH] hot fixes

---
 lib/UpdatePage.dart              |  5 ++++-
 lib/client/base_app_client.dart  | 18 ++++--------------
 lib/util/helpers.dart            | 14 ++++++++++++++
 lib/widgets/auth/login_form.dart |  6 ++++--
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/lib/UpdatePage.dart b/lib/UpdatePage.dart
index 2094d749..dc94b6e6 100644
--- a/lib/UpdatePage.dart
+++ b/lib/UpdatePage.dart
@@ -37,7 +37,10 @@ class UpdatePage extends StatelessWidget {
                 fontWeight: FontWeight.w600,
               ),
               SizedBox(height: 12,),
-              Texts(message??"Update the app",fontSize: 12,)
+              Padding(
+                padding: const EdgeInsets.all(8.0),
+                child: Texts(message??"Update the app",fontSize: 12,),
+              )
             ],
           ),
         ),
diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart
index e68aa27b..0ba19289 100644
--- a/lib/client/base_app_client.dart
+++ b/lib/client/base_app_client.dart
@@ -88,6 +88,8 @@ class BaseAppClient {
 
       print("URL : $url");
       print("Body : ${json.encode(body)}");
+      String req = json.encode(body);
+      var asd="";
 
       if (await Helpers.checkConnection()) {
         final response = await http.post(url,
@@ -103,7 +105,7 @@ class BaseAppClient {
           var parsed = json.decode(response.body.toString());
 
           if (parsed['ErrorType'] == 4) {
-            navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
+            helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
           }
 
           if (!parsed['IsAuthenticated']) {
@@ -223,7 +225,7 @@ class BaseAppClient {
             onSuccess(parsed, statusCode);
           } else {
             if (parsed['ErrorType'] == 4) {
-              navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
+              helpers.navigateToUpdatePage(parsed['ErrorEndUserMessage'],parsed['AndroidLink'],parsed['IOSLink']);
             }
             if (parsed['IsAuthenticated'] == null) {
               if (parsed['isSMSSent'] == true) {
@@ -287,18 +289,6 @@ class BaseAppClient {
     }
   }
 
-  navigateToUpdatePage(String message, String androidLink, iosLink) {
-    Navigator.pushAndRemoveUntil(
-        AppGlobal.CONTEX,
-        FadePage(
-          page: UpdatePage(
-            message: message,
-            androidLink: androidLink,
-            iosLink: iosLink,
-          ),
-        ),
-        (r) => false);
-  }
 
   String getError(parsed) {
     //TODO change this fun
diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart
index 88539838..6a57bcfa 100644
--- a/lib/util/helpers.dart
+++ b/lib/util/helpers.dart
@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 import 'package:doctor_app_flutter/config/config.dart';
 import 'package:html/parser.dart';
 
+import '../UpdatePage.dart';
 import '../config/size_config.dart';
 import '../util/dr_app_toast_msg.dart';
 
@@ -364,6 +365,19 @@ class Helpers {
 
   }
 
+  navigateToUpdatePage(String message, String androidLink, iosLink) {
+    Navigator.pushAndRemoveUntil(
+        AppGlobal.CONTEX,
+        FadePage(
+          page: UpdatePage(
+            message: message,
+            androidLink: androidLink,
+            iosLink: iosLink,
+          ),
+        ),
+            (r) => false);
+  }
+
   String parseHtmlString(String htmlString) {
     final document = parse(htmlString);
     final String parsedString = parse(document.body.text).documentElement.text;
diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart
index 487f6be9..9fc50008 100644
--- a/lib/widgets/auth/login_form.dart
+++ b/lib/widgets/auth/login_form.dart
@@ -35,7 +35,7 @@ class LoginForm extends StatefulWidget with DrAppToastMsg {
   @override
   _LoginFormState createState() => _LoginFormState();
 }
-
+//TODO recreate the all page and apply the MVVM here
 class _LoginFormState extends State<LoginForm> {
   final loginFormKey = GlobalKey<FormState>();
   var projectIdController = TextEditingController();
@@ -360,9 +360,11 @@ class _LoginFormState extends State<LoginForm> {
           helpers.showErrorToast(res['ErrorEndUserMessage']);
         }
       }).catchError((err) {
+        //TODO change the logic here
+        if(!err.contains('eservices.hmg@drsulaimanalhabib.com') ){
         hideLoading();
         changeLoadingStata(false);
-        helpers.showErrorToast(err);
+        helpers.showErrorToast(err);}
       });
     } else {
       changeLoadingStata(false);