diff --git a/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart b/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart index fae02e59..8b9e029d 100644 --- a/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart +++ b/Frontend/patient_manager/lib/mih_packages/about_mih/mih_about.dart @@ -330,6 +330,8 @@ class _MIHAboutState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart index 76b622d5..01b02286 100644 --- a/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart +++ b/Frontend/patient_manager/lib/mih_packages/access_review/patient_access_review.dart @@ -222,6 +222,10 @@ class _PatientAccessRequestState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); + + Navigator.of(context).popAndPushNamed( + '/', + ); }, ); } @@ -354,6 +358,8 @@ class _PatientAccessRequestState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // // appBar: const MIHAppBar( diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart b/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart index c9d0f11f..4a7466bb 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart @@ -359,6 +359,8 @@ class _ForgotPasswordState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart index 5215aad6..8dfac562 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart @@ -421,6 +421,8 @@ class _RegisterState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart index 8165937f..b5d7517b 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart @@ -423,6 +423,8 @@ class _ResetPasswordState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart index afe6b3e4..f80320aa 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart @@ -588,6 +588,8 @@ class _SignInState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart index 8d5a379c..00645fa2 100644 --- a/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart +++ b/Frontend/patient_manager/lib/mih_packages/manage_business/manage_business_profile.dart @@ -288,6 +288,10 @@ class _ManageBusinessProfileState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); + + Navigator.of(context).popAndPushNamed( + '/', + ); }, ); } @@ -376,6 +380,8 @@ class _ManageBusinessProfileState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // // appBar: const MIHAppBar( diff --git a/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart b/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart index 1991ff13..b016fa3c 100644 --- a/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart +++ b/Frontend/patient_manager/lib/mih_packages/manage_business/profile_business_add.dart @@ -441,6 +441,8 @@ class _ProfileBusinessAddState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart index 79b67af1..23234ef7 100644 --- a/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/patient_manager/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -232,6 +232,8 @@ class _MIHProfileGetterState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart b/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart index 15c28bcc..f1c4d412 100644 --- a/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart +++ b/Frontend/patient_manager/lib/mih_packages/mzansi_profile/profile_user_update.dart @@ -290,6 +290,10 @@ class _ProfileUserUpdateState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); + + Navigator.of(context).popAndPushNamed( + '/', + ); }, ); } @@ -443,6 +447,8 @@ class _ProfileUserUpdateState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/full_screen_file.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/full_screen_file.dart index 1fb2bf25..45427585 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/full_screen_file.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/full_screen_file.dart @@ -296,6 +296,8 @@ class _FullScreenFileViewerState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart index b6ac48c0..ff23d22f 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_add.dart @@ -400,6 +400,8 @@ class _AddPatientState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // // appBar: const MIHAppBar( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart index 0892bae7..ddd7eeed 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_edit.dart @@ -664,6 +664,8 @@ class _EditPatientState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // // appBar: const MIHAppBar( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart index 8dbc880b..2c025e91 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_manager.dart @@ -348,6 +348,10 @@ class _PatientManagerState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); + + Navigator.of(context).popAndPushNamed( + '/', + ); }, ); } @@ -420,6 +424,8 @@ class _PatientManagerState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // // appBar: const MIHAppBar( diff --git a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart index 2a783e3b..7c8fa308 100644 --- a/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart +++ b/Frontend/patient_manager/lib/mih_packages/patient_profile/patient_view.dart @@ -110,6 +110,10 @@ class _PatientViewState extends State { iconSize: 35, onTap: () { Navigator.of(context).pop(); + + Navigator.of(context).popAndPushNamed( + '/', + ); }, ); } @@ -184,6 +188,8 @@ class _PatientViewState extends State { actionDrawer: null, secondaryActionDrawer: null, bottomNavBar: null, + pullDownToRefresh: false, + onPullDown: () async {}, ); // return Scaffold( // body: SafeArea(