diff --git a/lib/pages/ContactUs/LiveChat/livechat_page.dart b/lib/pages/ContactUs/LiveChat/livechat_page.dart index a747db3d..2b43f347 100644 --- a/lib/pages/ContactUs/LiveChat/livechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart @@ -45,6 +45,7 @@ class _LiveChatPageState extends State title: TranslationBase.of(context).liveChat, description: TranslationBase.of(context).infoChat, appBarTitle: TranslationBase.of(context).service, + isShowBottomNavBar: false, body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart index 80648292..a01e2fd5 100644 --- a/lib/pages/ContactUs/findus/findus_page.dart +++ b/lib/pages/ContactUs/findus/findus_page.dart @@ -39,6 +39,7 @@ class _FindUsPageState extends State builder: (_, model, w) => AppScaffold( isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, appBarTitle: 'Locations', baseViewModel: model, body: Scaffold( diff --git a/lib/pages/feedback/feedback_home_page.dart b/lib/pages/feedback/feedback_home_page.dart index f7f998bf..0c6fb834 100644 --- a/lib/pages/feedback/feedback_home_page.dart +++ b/lib/pages/feedback/feedback_home_page.dart @@ -36,6 +36,7 @@ class _FeedbackHomePageState extends State isShowAppBar: true, isBottomBar: false, isShowDecPage: false, + isShowBottomNavBar: false, appBarTitle: TranslationBase.of(context).feedbackTitle, body: Scaffold( extendBodyBehindAppBar: true, diff --git a/lib/pages/landing/landing_page_pharmcy.dart b/lib/pages/landing/landing_page_pharmcy.dart index 04c9bb54..e087a87e 100644 --- a/lib/pages/landing/landing_page_pharmcy.dart +++ b/lib/pages/landing/landing_page_pharmcy.dart @@ -110,35 +110,6 @@ class _LandingPagePharmacyState extends State { centerTitle: true, ) : null, - // : AppBar( - // backgroundColor: Color(0xff5AB145), - // elevation: 0, - // textTheme: TextTheme( - // headline6: TextStyle( - // color: Colors.white, fontWeight: FontWeight.bold), - // ), - // title: Text(getText(currentTab).toUpperCase()), - // leading: Builder( - // builder: (BuildContext context) { - // return IconButton( - // icon: Icon(Icons.arrow_back), - // color: Colors.white, - // onPressed: () => Scaffold.of(context).openDrawer(), - // ); - // }, - // ), - // actions: [ - // // IconButton( - // // iconSize: 70, - // // icon: SvgPicture.asset('assets/images/svg/robort_svg.svg', - // // height: 100, width: 100, fit: BoxFit.cover), - // // onPressed: () { - // // triggerRobot(); - // // } //do something, - // // ) - // ], - // centerTitle: true, - // ), extendBody: false, body: PageView( physics: NeverScrollableScrollPhysics(), diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index bcbcf6cb..d8639a6a 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -101,6 +101,7 @@ class _ConfirmLogin extends State { appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.all(20), diff --git a/lib/pages/login/forgot-password.dart b/lib/pages/login/forgot-password.dart index d6478c92..fc21b0e1 100644 --- a/lib/pages/login/forgot-password.dart +++ b/lib/pages/login/forgot-password.dart @@ -31,6 +31,7 @@ class _ForgotPassword extends State { appBarTitle: TranslationBase.of(context).forgotFileNoTitle, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20), diff --git a/lib/pages/login/login-type.dart b/lib/pages/login/login-type.dart index f8af8eac..18a3da8b 100644 --- a/lib/pages/login/login-type.dart +++ b/lib/pages/login/login-type.dart @@ -21,6 +21,7 @@ class LoginType extends StatelessWidget { appBarTitle: TranslationBase.of(context).login, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( child: Container( padding: diff --git a/lib/pages/login/login.dart b/lib/pages/login/login.dart index 1c0fd13e..295b2cf2 100644 --- a/lib/pages/login/login.dart +++ b/lib/pages/login/login.dart @@ -80,6 +80,7 @@ class _Login extends State { appBarTitle: TranslationBase.of(context).login, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30), diff --git a/lib/pages/login/register-info.dart b/lib/pages/login/register-info.dart index d28fea86..9d953161 100644 --- a/lib/pages/login/register-info.dart +++ b/lib/pages/login/register-info.dart @@ -60,6 +60,7 @@ class _RegisterInfo extends State { appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( padding: EdgeInsets.all(20), child: Column(children: [ diff --git a/lib/pages/login/register.dart b/lib/pages/login/register.dart index 1591d1d5..6fc31d4a 100644 --- a/lib/pages/login/register.dart +++ b/lib/pages/login/register.dart @@ -49,6 +49,7 @@ class _Register extends State { appBarTitle: TranslationBase.of(context).register, isShowAppBar: true, isShowDecPage: false, + isShowBottomNavBar: false, body: SingleChildScrollView( child: Container( padding: EdgeInsets.only(top: 10, left: 20, right: 20, bottom: 30), diff --git a/lib/pages/login/welcome.dart b/lib/pages/login/welcome.dart index 6a007e0a..761d4df3 100644 --- a/lib/pages/login/welcome.dart +++ b/lib/pages/login/welcome.dart @@ -30,6 +30,7 @@ class _WelcomeLogin extends State { appBarTitle: TranslationBase.of(context).welcome, isShowDecPage: false, isShowAppBar: true, + isShowBottomNavBar: false, body: Padding( padding: EdgeInsets.all(20), child: Column( diff --git a/lib/pages/medical/prescriptions/prescriptions_home_page.dart b/lib/pages/medical/prescriptions/prescriptions_home_page.dart index 380d6284..29a6e0cb 100644 --- a/lib/pages/medical/prescriptions/prescriptions_home_page.dart +++ b/lib/pages/medical/prescriptions/prescriptions_home_page.dart @@ -47,6 +47,7 @@ class _HomePrescriptionsPageState extends State description: TranslationBase.of(context).infoPrescriptions, infoList: TranslationBase.of(context).infoPrescriptionsPoints, imagesInfo: imagesInfo, + isShowBottomNavBar: false, body: Scaffold( extendBodyBehindAppBar: true, appBar: PreferredSize( diff --git a/lib/pages/pharmacies/screens/pharmacy_module_page.dart b/lib/pages/pharmacies/screens/pharmacy_module_page.dart index e4830583..bdb508bc 100644 --- a/lib/pages/pharmacies/screens/pharmacy_module_page.dart +++ b/lib/pages/pharmacies/screens/pharmacy_module_page.dart @@ -80,6 +80,7 @@ class _PharmacyPageState extends State { isShowAppBar: false, isShowDecPage: false, baseViewModel: model, + isPharmacy:true, backgroundColor: Colors.white, body: Container( width: double.infinity, diff --git a/lib/pages/pharmacy_categorise.dart b/lib/pages/pharmacy_categorise.dart index ff1920dc..64b6bf6a 100644 --- a/lib/pages/pharmacy_categorise.dart +++ b/lib/pages/pharmacy_categorise.dart @@ -35,6 +35,7 @@ class _PharmacyCategorisePageState extends State { AppScaffold( isShowDecPage: false, baseViewModel: model, + isPharmacy:true, body: Column( children: [ Expanded( diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 7f2a0f96..3d6e65e1 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -132,7 +132,7 @@ class AppScaffold extends StatelessWidget { ) : null, bottomSheet: bottomSheet, - bottomNavigationBar: isShowBottomNavBar + bottomNavigationBar: isShowBottomNavBar && !getIsShowDecPageValue(context) && !isPharmacy ? BottomNavBar( changeIndex: changeCurrentTab, index: currentTab, @@ -142,8 +142,7 @@ class AppScaffold extends StatelessWidget { top: true, bottom: true, child: - (!Provider.of(context, listen: false).isLogin && - isShowDecPage) + getIsShowDecPageValue(context) ? NotAutPage( title: title ?? appBarTitle, description: description, @@ -162,6 +161,11 @@ class AppScaffold extends StatelessWidget { ); } + + getIsShowDecPageValue(context){ + return (!Provider.of(context, listen: false).isLogin && + isShowDecPage); + } buildAppLoaderWidget(bool isLoading) { return isLoading ? AppLoaderWidget() : Container(); }