fix issues related to footer

3 years ago · ab2fc6aa2c
parent f85c359cf4
commit ab2fc6aa2c
35 changed files with 101 additions and 54 deletions
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_one_page.dart
@ -40,6 +40,7 @@ class _NewCMCStepOnePageState extends State<NewCMCStepOnePage> {

    return AppScaffold(
      isShowAppBar: false,
+      isShowBottomNavBar: false,
      baseViewModel: widget.model,
      body: SingleChildScrollView(
        physics: ScrollPhysics(),
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_three_page.dart
@ -65,6 +65,7 @@ class _NewCMCStepThreePageState extends State<NewCMCStepThreePage> {
    return AppScaffold(
      isShowDecPage: false,
      baseViewModel: widget.model,
+      isShowBottomNavBar: false,
      body: SingleChildScrollView(
        physics: BouncingScrollPhysics(),
        child: Container(
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/NewCMC/new_cmc_step_tow_page.dart
@ -71,6 +71,7 @@ class _NewCMCStepTowPageState extends State<NewCMCStepTowPage> {
    ProjectViewModel projectViewModel = Provider.of(context);
    return AppScaffold(
      isShowDecPage: false,
+      isShowBottomNavBar: false,
      body: Stack(
        children: [
          PlacePicker(
--- a/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
+++ b/lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/orders_log_details_page.dart
@ -51,6 +51,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
    return AppScaffold(
        isShowAppBar: false,
        baseViewModel: model,
+        isShowBottomNavBar: false,
        body: SingleChildScrollView(
          physics: ScrollPhysics(),
          child: Container(
--- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_one_page.dart
@ -93,6 +93,7 @@ class _NewEReferralStepOnePageState extends State<NewEReferralStepOnePage> {
        onModelReady: (model) => model.getRelationTypes(),
        builder: (_, model, widget) => AppScaffold(
            isShowAppBar: false,
+            isShowBottomNavBar: false,
            body: SingleChildScrollView(
              physics: ScrollPhysics(),
              child: Container(
--- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_three_page.dart
@ -52,6 +52,7 @@ class _NewEReferralStepThreePageState extends State<NewEReferralStepThreePage> {
    return BaseView<EReferralViewModel>(
        builder: (_, model, widget) => AppScaffold(
            isShowAppBar: false,
+            isShowBottomNavBar: false,
            body: SingleChildScrollView(
              physics: ScrollPhysics(),
              child: Container(
--- a/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/New_E_Referral/new_e_referral_step_two_page.dart
@ -60,6 +60,7 @@ class _NewEReferralStepTowPageState extends State<NewEReferralStepTowPage> {
        onModelReady: (model) => model.getAllCities(),
        builder: (_, model, widget) => AppScaffold(
            isShowAppBar: false,
+            isShowBottomNavBar: false,
            body: SingleChildScrollView(
              physics: ScrollPhysics(),
              child: Container(
--- a/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart
@ -38,6 +38,7 @@ class _EReferralPageState extends State<EReferralPage>
    return BaseView<EReferralViewModel>(
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: true,
+
        appBarTitle: TranslationBase.of(context).ereferral,
        description: TranslationBase.of(context).eReferralInfo,
        imagesInfo: [
--- a/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
+++ b/lib/pages/AlHabibMedicalService/E-Referral/search_for_referrals_page.dart
@ -47,6 +47,7 @@ class _SearchForReferralsPageState extends State<SearchForReferralsPage> {
        onModelReady: (model) => model.getAllCities(),
        builder: (_, model, widget) => AppScaffold(
            isShowAppBar: false,
+            isShowBottomNavBar: false,
            body: SingleChildScrollView(
              physics: ScrollPhysics(),
              child: Container(
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
@ -52,6 +52,7 @@ class _NewHomeHealthCareStepOnePageState
    return AppScaffold(
      isShowAppBar: false,
      baseViewModel: widget.model,
+      isShowBottomNavBar: false,
      body: SingleChildScrollView(
        physics: ScrollPhysics(),
        child: Container(
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart
@ -71,6 +71,7 @@ class _NewHomeHealthCareStepThreePageState
    return AppScaffold(
      isShowDecPage: false,
      baseViewModel: widget.model,
+      isShowBottomNavBar: false,
      body: SingleChildScrollView(
        physics: BouncingScrollPhysics(),
        child: Container(
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_tow_page.dart
@ -74,6 +74,7 @@ class _NewHomeHealthCareStepTowPageState
    ProjectViewModel projectViewModel = Provider.of(context);
    return AppScaffold(
      isShowDecPage: false,
+      isShowBottomNavBar: false,
      body: Stack(
        children: [
          PlacePicker(
--- a/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
+++ b/lib/pages/AlHabibMedicalService/HomeHealthCare/orders_log_details_page.dart
@ -51,6 +51,7 @@ class OrdersLogDetailsPage extends StatelessWidget {
    return AppScaffold(
      isShowAppBar: false,
      baseViewModel: model,
+      isShowBottomNavBar: false,
      body: SingleChildScrollView(
        physics: ScrollPhysics(),
        child: Container(
--- a/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
+++ b/lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
@ -169,7 +169,7 @@ class _AllHabibMedicalServiceState extends State<AllHabibMedicalService> {
                    Navigator.push(
                      context,
                      FadePage(
-                        page: MedicalProfilePage(),
+                        page: MedicalProfilePage(isFromAllServicePage: true),
                      ),
                    );
                  },
--- a/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
@ -13,6 +13,7 @@ class H2OPageIndexPage extends StatelessWidget {
  Widget build(BuildContext context) {
    return AppScaffold(
        isShowAppBar: true,
+        //isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).serviceInformation,
        body: SingleChildScrollView(
            padding: EdgeInsets.all(12),
--- a/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/h2o_page.dart
@ -48,6 +48,7 @@ class _H2OPageState extends State<H2OPage> with SingleTickerProviderStateMixin {
      onModelReady: (model) => model.getUserDetail(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: true,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).waterTracker,
        showHomeAppBarIcon: false,
        baseViewModel: model,
--- a/lib/pages/AlHabibMedicalService/h2o/month_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/month_page.dart
@ -19,6 +19,8 @@ class MonthPage extends StatelessWidget {
      onModelReady: (model) => model.getUserProgressForMonthData(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: false,
+        isShowBottomNavBar: false,
+
        appBarTitle: TranslationBase.of(context).h2o,
        baseViewModel: model,
        body: Padding(
--- a/lib/pages/AlHabibMedicalService/h2o/today_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/today_page.dart
@ -22,6 +22,7 @@ class TodayPage extends StatelessWidget {
      onModelReady: (model) => model.getUserProgressForTodayData(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: false,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).h2o,
        baseViewModel: model,
        body: SingleChildScrollView(
--- a/lib/pages/AlHabibMedicalService/h2o/week_page.dart
+++ b/lib/pages/AlHabibMedicalService/h2o/week_page.dart
@ -19,6 +19,7 @@ class WeekPage extends StatelessWidget {
      onModelReady: (model) => model.getUserProgressForWeekData(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: false,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).h2o,
        baseViewModel: model,
        body: Padding(
--- a/lib/pages/BookAppointment/DoctorProfile.dart
+++ b/lib/pages/BookAppointment/DoctorProfile.dart
@ -68,6 +68,7 @@ class _DoctorProfileState extends State<DoctorProfile>
    return AppScaffold(
      appBarTitle: TranslationBase.of(context).bookAppo,
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      isShowDecPage: false,
      bottomSheet: showFooterButton
          ? Container(
--- a/lib/pages/ContactUs/LiveChat/livechat_page.dart
+++ b/lib/pages/ContactUs/LiveChat/livechat_page.dart
@ -41,11 +41,11 @@ class _LiveChatPageState extends State<LiveChatPage>
  Widget build(BuildContext context) {
    return AppScaffold(
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      imagesInfo: imagesInfo,
      title: TranslationBase.of(context).liveChat,
      description: TranslationBase.of(context).infoChat,
      appBarTitle: TranslationBase.of(context).service,
-      isShowBottomNavBar: false,
      body: Scaffold(
        extendBodyBehindAppBar: true,
        appBar: PreferredSize(
--- a/lib/pages/DrawerPages/family/my-family.dart
+++ b/lib/pages/DrawerPages/family/my-family.dart
@ -38,7 +38,10 @@ import 'package:provider/provider.dart';

 class MyFamily extends StatefulWidget {
  final bool isAppbarVisible;
-  MyFamily({this.isAppbarVisible = true});
+
+  final bool isFromAllServicePage;
+
+  MyFamily({this.isAppbarVisible = true, this.isFromAllServicePage = false});
  @override
  _MyFamily createState() => _MyFamily();
 }
@ -92,7 +95,7 @@ class _MyFamily extends State<MyFamily> with TickerProviderStateMixin {
      isShowAppBar: widget.isAppbarVisible,
      imagesInfo: imagesInfo,
      description: TranslationBase.of(context).familyInfo,
-      isShowBottomNavBar: false,
+      isShowBottomNavBar: widget.isFromAllServicePage,

      body: Scaffold(
        extendBodyBehindAppBar: true,
--- a/lib/pages/ErService/AmbulanceReq.dart
+++ b/lib/pages/ErService/AmbulanceReq.dart
@ -51,6 +51,7 @@ class _AmbulanceReqState extends State<AmbulanceReq>
      onModelReady: (model) => model.getAmRequestOrders(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: true,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).transportationService,
        description: TranslationBase.of(context).infoAmbulance,
        imagesInfo: imagesInfo,
--- a/lib/pages/MyAppointments/AppointmentDetails.dart
+++ b/lib/pages/MyAppointments/AppointmentDetails.dart
@ -56,6 +56,7 @@ class _AppointmentDetailsState extends State<AppointmentDetails>
    return AppScaffold(
      appBarTitle: widget.appo.doctorNameObj,
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      bottomSheet: AppointmentDetails.showFooterButton
          ? Container(
              width: MediaQuery.of(context).size.width,
--- a/lib/pages/MyAppointments/MyAppointments.dart
+++ b/lib/pages/MyAppointments/MyAppointments.dart
@ -76,6 +76,7 @@ class _MyAppointmentsState extends State<MyAppointments>
    return AppScaffold(
      appBarTitle: TranslationBase.of(context).myAppointments,
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      imagesInfo: imagesInfo,
      description: TranslationBase.of(context).infoMyAppointments,
      body: Container(
--- a/lib/pages/livecare/livecare_home.dart
+++ b/lib/pages/livecare/livecare_home.dart
@ -51,6 +51,7 @@ class _LiveCareHomeState extends State<LiveCareHome>
    return AppScaffold(
      appBarTitle: "LiveCare",
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      imagesInfo: imagesInfo,
      description: TranslationBase.of(context).erConsultation,
      body: Container(
--- a/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
+++ b/lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
@ -39,6 +39,7 @@ class _AskDoctorHomPageState extends State<AskDoctorHomPage>
  Widget build(BuildContext context) {
    return AppScaffold(
      isShowAppBar: true,
+      isShowBottomNavBar: false,
      appBarTitle: TranslationBase.of(context).askDoctor,
      body: Scaffold(
        extendBodyBehindAppBar: true,
--- a/lib/pages/medical/eye/EyeHomePage.dart
+++ b/lib/pages/medical/eye/EyeHomePage.dart
@ -44,6 +44,7 @@ class _EyeHomePageState extends State<EyeHomePage>
    return AppScaffold(
      isShowAppBar: true,
      isShowDecPage: false,
+      isShowBottomNavBar: false,
      appBarTitle: TranslationBase.of(context).measurements,
      body: Scaffold(
        extendBodyBehindAppBar: true,
--- a/lib/pages/medical/medical_profile_page.dart
+++ b/lib/pages/medical/medical_profile_page.dart
@ -48,6 +48,10 @@ import 'labs/labs_home_page.dart';
 import 'my_trackers/my_trackers.dart';

 class MedicalProfilePage extends StatefulWidget {
+
+  final bool isFromAllServicePage;
+
+  const MedicalProfilePage({ this.isFromAllServicePage = false}) ;
  @override
  _MedicalProfilePageState createState() => _MedicalProfilePageState();
 }
@ -60,6 +64,7 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
  @override
  Widget build(BuildContext context) {
    projectViewModel = Provider.of(context);
+
    var appoCountProvider = Provider.of<ToDoCountProviderModel>(context);
    List<Widget> myMedicalList = Utils.myMedicalList(
        projectViewModel: projectViewModel,
@ -68,11 +73,11 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
        isLogin: projectViewModel.isLogin);
    return BaseView<MedicalViewModel>(
      onModelReady: (model) => model.getAppointmentHistory(),
-      builder: (_, model, widget) => AppScaffold(
+      builder: (_, model, x) => AppScaffold(
        isShowDecPage: false,
        baseViewModel: model,
        isHelp: true,
-        isShowBottomNavBar: false,
+        isShowBottomNavBar: widget.isFromAllServicePage,

        body: Container(
          child: SingleChildScrollView(
--- a/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart
+++ b/lib/pages/medical/my_trackers/Weight/WeightHomePage.dart
@ -42,6 +42,7 @@ class _WeightHomePageState extends State<WeightHomePage> with SingleTickerProvid
      builder: (_, model, w) => AppScaffold(
        isShowAppBar: true,
        isShowDecPage: false,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).weight,
        appBarIcons: [
          IconButton(
@ -100,26 +101,29 @@ class _WeightHomePageState extends State<WeightHomePage> with SingleTickerProvid
              )
            ],
          ),
-          floatingActionButton: InkWell(
-            onTap: () {
-              Navigator.push(
-                  context,
-                  FadePage(
-                      page: AddWeightPage(
-                    model: model,
-                  )));
-            },
-            child: Container(
-              width: 55,
-              height: 55,
-              decoration: BoxDecoration(
-                shape: BoxShape.circle,
-                color: Theme.of(context).primaryColor,
-              ),
-              child: Center(
-                child: Icon(
-                  Icons.add,
-                  color: Colors.white,
+          floatingActionButton: Container(
+            margin: EdgeInsets.only(bottom: 70),
+            child: InkWell(
+              onTap: () {
+                Navigator.push(
+                    context,
+                    FadePage(
+                        page: AddWeightPage(
+                      model: model,
+                    )));
+              },
+              child: Container(
+                width: 55,
+                height: 55,
+                decoration: BoxDecoration(
+                  shape: BoxShape.circle,
+                  color: Theme.of(context).primaryColor,
+                ),
+                child: Center(
+                  child: Icon(
+                    Icons.add,
+                    color: Colors.white,
+                  ),
                ),
              ),
            ),
--- a/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart
+++ b/lib/pages/medical/my_trackers/blood_pressure/BloodPressureHomePage.dart
@ -42,6 +42,7 @@ class _BloodPressureHomePageState extends State<BloodPressureHomePage>
      onModelReady: (model) => model.getBloodPressure(),
      builder: (_, model, w) => AppScaffold(
        isShowAppBar: true,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).bloodPressure,
        baseViewModel: model,
        appBarIcons: [IconButton(
@ -94,19 +95,22 @@ class _BloodPressureHomePageState extends State<BloodPressureHomePage>
              )
            ],
          ),
-          floatingActionButton: InkWell(
-            onTap: () {
-              Navigator.push(context, FadePage(page: AddBloodPressurePage(model: model,)));
-            },
-            child: Container(
-              width: 55,
-              height: 55,
-              decoration: BoxDecoration(
-                  shape: BoxShape.circle, color: Theme.of(context).primaryColor),
-              child: Center(
-                child: Icon(
-                  Icons.add,
-                  color: Colors.white,
+          floatingActionButton: Container(
+            margin: EdgeInsets.only(bottom: 70),
+            child: InkWell(
+              onTap: () {
+                Navigator.push(context, FadePage(page: AddBloodPressurePage(model: model,)));
+              },
+              child: Container(
+                width: 55,
+                height: 55,
+                decoration: BoxDecoration(
+                    shape: BoxShape.circle, color: Theme.of(context).primaryColor),
+                child: Center(
+                  child: Icon(
+                    Icons.add,
+                    color: Colors.white,
+                  ),
                ),
              ),
            ),
--- a/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart
+++ b/lib/pages/medical/my_trackers/blood_suger/blood_sugar_home_page.dart
@ -47,6 +47,7 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage>
    return BaseView<BloodSugarViewMode>(
      onModelReady: (model) => model.getBloodSugar(),
      builder: (_, model, w) => AppScaffold(
+        isShowBottomNavBar: false,
        appBarIcons: [IconButton(
          icon: Icon(Icons.email),
          color: Colors.white,
@ -105,19 +106,22 @@ class _BloodSugarHomePageState extends State<BloodSugarHomePage>
              )
            ],
          ),
-          floatingActionButton: InkWell(
-            onTap: () {
-              Navigator.push(context, FadePage(page: AddBloodSugarPage(bloodSugarViewMode: model,)));
-            },
-            child: Container(
-              width: 55,
-              height: 55,
-              decoration: BoxDecoration(
-                  shape: BoxShape.circle, color:Theme.of(context).primaryColor),
-              child: Center(
-                child: Icon(
-                  Icons.add,
-                  color: Colors.white,
+          floatingActionButton: Container(
+            margin: EdgeInsets.only(bottom: 70),
+            child: InkWell(
+              onTap: () {
+                Navigator.push(context, FadePage(page: AddBloodSugarPage(bloodSugarViewMode: model,)));
+              },
+              child: Container(
+                width: 55,
+                height: 55,
+                decoration: BoxDecoration(
+                    shape: BoxShape.circle, color:Theme.of(context).primaryColor),
+                child: Center(
+                  child: Icon(
+                    Icons.add,
+                    color: Colors.white,
+                  ),
                ),
              ),
            ),
--- a/lib/pages/medical/reports/report_home_page.dart
+++ b/lib/pages/medical/reports/report_home_page.dart
@ -59,6 +59,7 @@ class _HomeReportPageState extends State<HomeReportPage>
      onModelReady: (model) => model.getReports(), //model.getPrescriptions(),
      builder: (_, model, widget) => AppScaffold(
        isShowAppBar: true,
+        isShowBottomNavBar: false,
        appBarTitle: TranslationBase.of(context).newMedReport,
        title: TranslationBase.of(context).medReport,
        description: TranslationBase.of(context).infoMonthReport,
--- a/lib/pages/medical/smart_watch_health_data/stepsTracker.dart
+++ b/lib/pages/medical/smart_watch_health_data/stepsTracker.dart
@ -44,6 +44,7 @@ class _StepsTrackerState extends State<StepsTracker>
      isShowAppBar: true,
      appBarTitle: "Steps",
      isShowDecPage: false,
+      isShowBottomNavBar: false,
      body: Container(
        child: Column(
          mainAxisSize: MainAxisSize.min,
--- a/lib/widgets/others/app_scaffold_widget.dart
+++ b/lib/widgets/others/app_scaffold_widget.dart
@ -178,9 +178,7 @@ class AppScaffold extends StatelessWidget {
  void changeCurrentTab(int value) {
    if (isFromLandingPage) {
      changeTab(value);
-      // call the nav funcion
    } else {
-      // navigate to langing page with index
      Navigator.pushAndRemoveUntil(
          AppGlobal.context,
          MaterialPageRoute(
@ -407,6 +405,7 @@ class _RobotIcon extends State<RobotIcon> {
                            )))
                    : Container(),
                FloatingSearchButton()
+
              ],
            )
          ],