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

Sultan

See merge request Cloud_Solution/diplomatic-quarter!173

lib/pages/landing/landing_page.dart

@@ -407,13 +407,11 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
             IconButton(
               //iconSize: 70,
               icon: Icon(
-                projectViewModel.isLogin && projectViewModel.user != null
-                    ? Icons.settings
-                    : Icons.login,
+                projectViewModel.isLogin ? Icons.settings : Icons.login,
                 color: Colors.white,
               ),
               onPressed: () {
-                if (projectViewModel.isLogin && projectViewModel.user != null)
+                if (projectViewModel.isLogin)
                   Navigator.of(context).pushNamed(
                     SETTINGS,
                   );

lib/widgets/drawer/app_drawer_widget.dart

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