diff --git a/lib/pages/ContactUs/findus/findus_page.dart b/lib/pages/ContactUs/findus/findus_page.dart index 9b39de3a..807ac1c7 100644 --- a/lib/pages/ContactUs/findus/findus_page.dart +++ b/lib/pages/ContactUs/findus/findus_page.dart @@ -34,9 +34,11 @@ class _FindUsPageState extends State @override Widget build(BuildContext context) { return BaseView( + allowAny: true, onModelReady: (model) => model.getFindUsRequestOrders(), //model.getCOC(), builder: (_, model, w) => AppScaffold( isShowAppBar: true, + isShowDecPage: false, appBarTitle: 'Locations', baseViewModel: model, body: Scaffold( diff --git a/lib/pages/ContactUs/findus/hospitrals_page.dart b/lib/pages/ContactUs/findus/hospitrals_page.dart index d8d898e3..7aa968a5 100644 --- a/lib/pages/ContactUs/findus/hospitrals_page.dart +++ b/lib/pages/ContactUs/findus/hospitrals_page.dart @@ -23,6 +23,7 @@ class _HospitalsPageState extends State { @override Widget build(BuildContext context) { return AppScaffold( + isShowDecPage: false, body: SingleChildScrollView( child: Container( // margin: EdgeInsets.only(left: 15,right: 15,top: 70), diff --git a/lib/pages/ContactUs/findus/pharmacies_page.dart b/lib/pages/ContactUs/findus/pharmacies_page.dart index 663bd3ec..cab201e3 100644 --- a/lib/pages/ContactUs/findus/pharmacies_page.dart +++ b/lib/pages/ContactUs/findus/pharmacies_page.dart @@ -23,6 +23,7 @@ class _PharmaciesPageState extends State { @override Widget build(BuildContext context) { return AppScaffold( + isShowDecPage: false, body: SingleChildScrollView( child: Container( margin: EdgeInsets.only(left: 15, right: 15, top: 70), diff --git a/lib/pages/base/base_view.dart b/lib/pages/base/base_view.dart index 4c606fe2..5977e97e 100644 --- a/lib/pages/base/base_view.dart +++ b/lib/pages/base/base_view.dart @@ -13,10 +13,12 @@ AppSharedPreferences sharedPref = AppSharedPreferences(); class BaseView extends StatefulWidget { final Widget Function(BuildContext context, T model, Widget child) builder; final Function(T) onModelReady; + final bool allowAny; BaseView({ this.builder, this.onModelReady, + this.allowAny = false, }); @override @@ -31,9 +33,10 @@ class _BaseViewState extends State> { @override void initState() { - //TODO fix it - //Provider.of(context, listen: false).isLogin; - if (widget.onModelReady != null && Provider.of(context, listen: false).isLogin) { + if(widget.allowAny && widget.onModelReady != null){ + widget.onModelReady(model); + } + else if (widget.onModelReady != null && Provider.of(context, listen: false).isLogin) { widget.onModelReady(model); } super.initState(); diff --git a/lib/pages/feedback/feedback_home_page.dart b/lib/pages/feedback/feedback_home_page.dart index d7c7361f..5c7ba86d 100644 --- a/lib/pages/feedback/feedback_home_page.dart +++ b/lib/pages/feedback/feedback_home_page.dart @@ -34,6 +34,7 @@ class _FeedbackHomePageState extends State return AppScaffold( isShowAppBar: true, isBottomBar: false, + isShowDecPage: false, appBarTitle: 'Feedback', body: Scaffold( extendBodyBehindAppBar: true, diff --git a/lib/pages/feedback/send_feedback_page.dart b/lib/pages/feedback/send_feedback_page.dart index c5ec9757..756a421b 100644 --- a/lib/pages/feedback/send_feedback_page.dart +++ b/lib/pages/feedback/send_feedback_page.dart @@ -34,8 +34,10 @@ class _SendFeedbackPageState extends State { @override Widget build(BuildContext context) { return BaseView( + allowAny: true, builder: (_, model, widget) => AppScaffold( baseViewModel: model, + isShowDecPage: false, body: Container( height: MediaQuery.of(context).size.height * 0.8, child: SingleChildScrollView( diff --git a/lib/pages/feedback/status_feedback_page.dart b/lib/pages/feedback/status_feedback_page.dart index 01a2b4c9..b6e389cf 100644 --- a/lib/pages/feedback/status_feedback_page.dart +++ b/lib/pages/feedback/status_feedback_page.dart @@ -17,9 +17,11 @@ class _StatusFeedbackPageState extends State { @override Widget build(BuildContext context) { return BaseView( + allowAny: true, onModelReady: (model) => model.getCOC(), builder: (_, model, widget) => AppScaffold( baseViewModel: model, + isShowDecPage: false, body: Container( margin: EdgeInsets.only(top: 8.0,left: 8.0,right: 8.0 ), padding: EdgeInsets.all(15.0),