Merge branch 'login_design_sikander' into development_new_design_2.0

lib/pages/DrawerPages/family/my-family.dart

@@ -79,19 +79,6 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
     );
     projectViewModel = Provider.of(context);
 
-    if (!projectViewModel.isLogin) {
-      Navigator.push(
-          context,
-          MaterialPageRoute(
-              builder: (cxt) => NotAutPage(
-                title: TranslationBase.of(context).myFamilyFiles,
-                description: TranslationBase.of(context).familyInfo,
-                infoList: [],
-                imagesInfo: [],
-                icon: "assets/images/new/bottom_nav/family_files.svg",
-              )));
-      return Container();
-    }
     return AppScaffold(
       appBarTitle: TranslationBase.of(context).myFamilyFiles,
       isShowAppBar: widget.isAppbarVisible,

lib/pages/landing/landing_page.dart

@@ -33,6 +33,7 @@ import 'package:diplomaticquarterapp/widgets/buttons/floatingActionButton.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
 import 'package:diplomaticquarterapp/widgets/dialogs/confirm_dialog.dart';
 import 'package:diplomaticquarterapp/widgets/drawer/app_drawer_widget.dart';
+import 'package:diplomaticquarterapp/widgets/others/not_auh_page.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -82,7 +83,24 @@ class _LandingPageState extends State<LandingPage> with WidgetsBindingObserver {
   LocationUtils locationUtils;
 
   _changeCurrentTab(int tab) {
-    if (tab == 3) {}
+    if (tab == 3) {
+      // if (!projectViewModel.isLogin) {
+      //   Navigator.push(
+      //     context,
+      //     MaterialPageRoute(
+      //       builder: (cxt) => NotAutPage(
+      //         title: TranslationBase.of(context).myFamilyFiles,
+      //         description: TranslationBase.of(context).familyInfo,
+      //         infoList: [],
+      //         imagesInfo: [],
+      //         icon: "assets/images/new/bottom_nav/family_files.svg",
+      //       ),
+      //     ),
+      //   );
+      //   return Container();
+      // }
+      // return;
+    }
     setState(() {
       currentTab = tab;
       if (tab != 0)

lib/pages/login/forgot-password.dart

@@ -30,7 +30,6 @@ class _ForgotPassword extends State<ForgotPassword> {
 
     return Scaffold(
       backgroundColor: Color(0xfff8f8f8),
-      resizeToAvoidBottomPadding: false,
       appBar: AppBar(
         backgroundColor: Colors.transparent,
         leading: IconButton(

lib/pages/login/login.dart

@@ -78,7 +78,6 @@ class _Login extends State<Login> {
 
     return Scaffold(
       backgroundColor: Color(0xfff8f8f8),
-      resizeToAvoidBottomPadding: false,
       appBar: AppBar(
         backgroundColor: Colors.transparent,
         leading: IconButton(