Merge branch 'sultan' into 'diplomatic-quarter-live'

Sultan

See merge request Cloud_Solution/diplomatic-quarter!195

lib/pages/landing/landing_page.dart

@@ -151,16 +151,16 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
 
     _firebaseMessaging.getToken().then((String token) async {
       sharedPref.setString(PUSH_TOKEN, token);
-      if (token != null && await sharedPref.getObject(USER_PROFILE) == null) {
+      Future.delayed(Duration.zero, () async {
-        DEVICE_TOKEN = token;
+        if (token != null && await sharedPref.getObject(USER_PROFILE) == null) {
-        checkUserStatus(token);
+          DEVICE_TOKEN = token;
-      } else {
+          checkUserStatus(token);
-        getNotificationCount(token);
+        } else if (await sharedPref.getObject(USER_PROFILE) != null) {
-      }
+          getNotificationCount(token);
-
+        }
-      requestPermissions();
+      }).catchError((err) {
-    }).catchError((err) {
+        print(err);
-      print(err);
+      });
     });
     //
     // //_firebase Background message handler
@@ -516,12 +516,12 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
     // themeNotifier.setTheme(defaultTheme);
   }
   void checkUserStatus(token) async {
-    GifLoaderDialogUtils.showMyDialog(context);
+    //GifLoaderDialogUtils.showMyDialog(context);
     authService
         .selectDeviceImei(token)
         .then((SelectDeviceIMEIRES value) => setUserValues(value))
         .catchError((err) {
-      GifLoaderDialogUtils.hideDialog(context);
+      //GifLoaderDialogUtils.hideDialog(context);
     });
   }
 
@@ -543,6 +543,7 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
 
   void setUserValues(value) async {
     GifLoaderDialogUtils.hideDialog(context);
+    requestPermissions();
     sharedPref.setObject(IMEI_USER_DATA, value);
   }
 

lib/services/authentication/auth_provider.dart

@@ -160,8 +160,7 @@ class AuthProvider with ChangeNotifier {
       }, body: request);
       return Future.value(localRes);
     } catch (error) {
-      print(error);
+      return Future.value(null);
-      //throw error;
     }
   }
 

lib/widgets/drawer/app_drawer_widget.dart

@@ -70,7 +70,7 @@ class _AppDrawerState extends State<AppDrawer> {
                   padding: EdgeInsets.zero,
                   children: <Widget>[
                     Container(
-                      height: SizeConfig.screenHeight * .28,
+                      height: SizeConfig.screenHeight * .30,
                       padding: EdgeInsets.all(15),
                       child: InkWell(
                         child: Column(