Merge branch 'new_design_sikander' into development_new_design_2.0

merge-update-with-lab-changes
Sikander Saleem 4 years ago
commit e3758cfbba

@ -36,7 +36,6 @@ class _LiveChatPageState extends State<LiveChatPage>
_tabController.dispose();
}
@override
@override
Widget build(BuildContext context) {
return AppScaffold(

@ -58,49 +58,6 @@ class _ContactUsPageState extends State<ContactUsPage> {
),
],
),
// Container(
// margin: EdgeInsets.fromLTRB(10.0, 20.0, 10.0, 10.0),
// child: Column(
// crossAxisAlignment: CrossAxisAlignment.start,
// children: <Widget>[
// Row(
// mainAxisSize: MainAxisSize.max,
// mainAxisAlignment: MainAxisAlignment.start,
// children: <Widget>[
// 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: <Widget>[
// 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(),
// ),
// ],
// ),
// ],
// ),
// ),
);
}
}

@ -113,9 +113,13 @@ class AppScaffold extends StatelessWidget {
@override
Widget build(BuildContext context) {
AppGlobal.context = context;
bool isUserNotLogin = (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && isShowDecPage);
return Scaffold(
backgroundColor: backgroundColor ?? Theme.of(context).scaffoldBackgroundColor,
appBar: showNewAppBar
appBar: isUserNotLogin
? null
: (showNewAppBar
? NewAppBarWidget(
title: appBarTitle,
showTitle: showNewAppBarTitle,
@ -135,12 +139,12 @@ class AppScaffold extends StatelessWidget {
showOfferPackagesCart: showOfferPackagesCart,
isShowDecPage: isShowDecPage,
)
: null),
: null)),
bottomSheet: bottomSheet,
body: SafeArea(
top: true,
bottom: true,
child: (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && isShowDecPage)
child: isUserNotLogin
? NotAutPage(
title: title ?? appBarTitle,
description: description,

Loading…
Cancel
Save