diff --git a/lib/pages/ContactUs/LiveChat/livechat_page.dart b/lib/pages/ContactUs/LiveChat/livechat_page.dart index a747db3d..e3826396 100644 --- a/lib/pages/ContactUs/LiveChat/livechat_page.dart +++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart @@ -36,7 +36,6 @@ class _LiveChatPageState extends State _tabController.dispose(); } - @override @override Widget build(BuildContext context) { return AppScaffold( diff --git a/lib/pages/ContactUs/contact_us_page.dart b/lib/pages/ContactUs/contact_us_page.dart index cbd95e9b..4ad2f70f 100644 --- a/lib/pages/ContactUs/contact_us_page.dart +++ b/lib/pages/ContactUs/contact_us_page.dart @@ -58,49 +58,6 @@ class _ContactUsPageState extends State { ), ], ), - - // Container( - // margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0), - // child: Column( - // crossAxisAlignment: CrossAxisAlignment.start, - // children: [ - // Row( - // mainAxisSize: MainAxisSize.max, - // mainAxisAlignment: MainAxisAlignment.start, - // children: [ - // Expanded( - // child: CardCommonContact( - // image: 'assets/images/new-design/find_us_icon.png', - // text: TranslationBase.of(context).findUs, - // subText: "", - // type: 0, - // ), - // ), - // Expanded( - // child: CardCommonContact(image: 'assets/images/new-design/feedback_icon.png', text: TranslationBase.of(context).feedback, subText: "", type: 1), - // ), - // ], - // ), - // Row( - // mainAxisSize: MainAxisSize.max, - // mainAxisAlignment: MainAxisAlignment.start, - // children: [ - // Expanded( - // child: CardCommonContact( - // image: 'assets/images/new-design/live_chat_icon.png', - // text: TranslationBase.of(context).liveChat, - // subText: TranslationBase.of(context).service, - // type: 2, - // ), - // ), - // Expanded( - // child: Container(), - // ), - // ], - // ), - // ], - // ), - // ), ); } } diff --git a/lib/widgets/others/app_scaffold_widget.dart b/lib/widgets/others/app_scaffold_widget.dart index 911025b5..9582ab8a 100644 --- a/lib/widgets/others/app_scaffold_widget.dart +++ b/lib/widgets/others/app_scaffold_widget.dart @@ -113,34 +113,38 @@ class AppScaffold extends StatelessWidget { @override Widget build(BuildContext context) { AppGlobal.context = context; + + bool isUserNotLogin = (!Provider.of(context, listen: false).isLogin && isShowDecPage); return Scaffold( backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor, - appBar: showNewAppBar - ? NewAppBarWidget( - title: appBarTitle, - showTitle: showNewAppBarTitle, - showDropDown: showDropDown, - dropdownIndexValue: dropdownIndexValue, - dropDownList: dropDownList ?? [], - dropDownIndexChange: dropDownIndexChange, - ) - : (isShowAppBar - ? appBar = AppBarWidget( - appBarTitle: appBarTitle, - appBarIcons: appBarIcons, - showHomeAppBarIcon: showHomeAppBarIcon, - isPharmacy: isPharmacy, - showPharmacyCart: showPharmacyCart, - isOfferPackages: isOfferPackages, - showOfferPackagesCart: showOfferPackagesCart, - isShowDecPage: isShowDecPage, + appBar: isUserNotLogin + ? null + : (showNewAppBar + ? NewAppBarWidget( + title: appBarTitle, + showTitle: showNewAppBarTitle, + showDropDown: showDropDown, + dropdownIndexValue: dropdownIndexValue, + dropDownList: dropDownList ?? [], + dropDownIndexChange: dropDownIndexChange, ) - : null), + : (isShowAppBar + ? appBar = AppBarWidget( + appBarTitle: appBarTitle, + appBarIcons: appBarIcons, + showHomeAppBarIcon: showHomeAppBarIcon, + isPharmacy: isPharmacy, + showPharmacyCart: showPharmacyCart, + isOfferPackages: isOfferPackages, + showOfferPackagesCart: showOfferPackagesCart, + isShowDecPage: isShowDecPage, + ) + : null)), bottomSheet: bottomSheet, body: SafeArea( top: true, bottom: true, - child: (!Provider.of(context, listen: false).isLogin && isShowDecPage) + child: isUserNotLogin ? NotAutPage( title: title ?? appBarTitle, description: description,