From c72ef3f58569cefd27cb685a076c847c9065c82c Mon Sep 17 00:00:00 2001
From: Elham Rababah <elham.a.rababah@gmail.com>
Date: Mon, 3 May 2021 17:16:29 +0300
Subject: [PATCH] finish refactoring login

---
 lib/screens/auth/login_screen.dart | 31 ++++++++++++++++--------------
 lib/screens/home/home_screen.dart  |  2 --
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart
index b49b492f..1d27e31e 100644
--- a/lib/screens/auth/login_screen.dart
+++ b/lib/screens/auth/login_screen.dart
@@ -270,6 +270,8 @@ class _LoginsreenState extends State<Loginsreen> {
                                                               return null;
                                                             },
                                                             onSaved: (value) {
+                                                              if (value !=
+                                                                  null)
                                                               setState(() {
                                                                 userInfo
                                                                     .password =
@@ -278,6 +280,8 @@ class _LoginsreenState extends State<Loginsreen> {
 
                                                             },
                                                             onChanged: (value){
+                                                              if (value !=
+                                                                  null)
                                                               setState(() {
                                                                 userInfo
                                                                     .password =
@@ -456,19 +460,21 @@ class _LoginsreenState extends State<Loginsreen> {
       await model.login(userInfo);
       if (model.state == ViewState.ErrorLocal) {
         Helpers.showErrorToast(model.error);
+
       } else {
         if (model.loginInfo['MessageStatus'] == 1) {
           saveObjToString(LOGGED_IN_USER, model.loginInfo);
           sharedPref.remove(LAST_LOGIN_USER);
           sharedPref.setString(TOKEN, model.loginInfo['LogInTokenID']);
-          Navigator.of(AppGlobal.CONTEX).pushReplacement(MaterialPageRoute(
+          GifLoaderDialogUtils.hideDialog(context);
+
+          Navigator.of(context).pushReplacement(MaterialPageRoute(
               builder: (BuildContext context) =>
                   VerificationMethodsScreen(
                     password: userInfo.password,
                   )));
         }
       }
-      GifLoaderDialogUtils.hideDialog(context);
     }
   }
 
@@ -492,20 +498,17 @@ class _LoginsreenState extends State<Loginsreen> {
     primaryFocus.unfocus();
   }
 
-  getProjects(memberID, IMEIViewModel model) {
+  getProjects(memberID, IMEIViewModel model)async {
     if (memberID != null && memberID != '') {
       if (projectsList.length == 0) {
-        model.getHospitalsList(memberID).then((res) {
-          if (res['MessageStatus'] == 1) {
-            projectsList = res['ProjectInfo'];
-            setState(() {
-              userInfo.projectID = projectsList[0]["facilityId"];
-              projectIdController.text = projectsList[0]['facilityName'];
-            });
-          } else {
-            print(res);
-          }
-        });
+        await model.getHospitalsList(memberID);
+        if(model.state == ViewState.Idle) {
+          projectsList = model.hospitals;
+          setState(() {
+            userInfo.projectID = projectsList[0]["facilityId"];
+            projectIdController.text = projectsList[0]['facilityName'];
+          });
+        }
       }
     }
   }
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart
index 1ecbe637..1fc4c795 100644
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@@ -61,7 +61,6 @@ class HomeScreen extends StatefulWidget {
 
 class _HomeScreenState extends State<HomeScreen> {
   final FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
-  HospitalViewModel hospitalProvider;
   AuthViewModel authProvider;
   bool isLoading = false;
   ProjectViewModel projectsProvider;
@@ -108,7 +107,6 @@ class _HomeScreenState extends State<HomeScreen> {
   @override
   Widget build(BuildContext context) {
     myContext = context;
-    hospitalProvider = Provider.of(context);
     authProvider = Provider.of(context);
     projectsProvider = Provider.of(context);
     FocusScopeNode currentFocus = FocusScope.of(context);