From 473315f8a18da7fb11e62c4e1d8e1b045e467229 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Sun, 8 Aug 2021 14:55:35 +0300 Subject: [PATCH] improvements --- lib/pages/DrawerPages/family/my-family.dart | 13 ------------- lib/pages/landing/landing_page.dart | 20 +++++++++++++++++++- lib/pages/login/forgot-password.dart | 1 - lib/pages/login/login.dart | 1 - 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/lib/pages/DrawerPages/family/my-family.dart b/lib/pages/DrawerPages/family/my-family.dart index 7c1e9e5a..baac5c63 100644 --- a/lib/pages/DrawerPages/family/my-family.dart +++ b/lib/pages/DrawerPages/family/my-family.dart @@ -79,19 +79,6 @@ class _MyFamily extends State 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, diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index cf91aabb..6228fab3 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -32,6 +32,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'; @@ -81,7 +82,24 @@ class _LandingPageState extends State 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) diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index 39f04f57..3a86cd93 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -30,7 +30,6 @@ class _ForgotPassword extends State { return Scaffold( backgroundColor: Color(0xfff8f8f8), - resizeToAvoidBottomPadding: false, appBar: AppBar( backgroundColor: Colors.transparent, leading: IconButton( diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 41b3d91e..117a3d1f 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -78,7 +78,6 @@ class _Login extends State { return Scaffold( backgroundColor: Color(0xfff8f8f8), - resizeToAvoidBottomPadding: false, appBar: AppBar( backgroundColor: Colors.transparent, leading: IconButton(