From 0c85d560a0916995ed9f0d29196719a81bffe5ac Mon Sep 17 00:00:00 2001 From: yaso Date: Tue, 1 Oct 2024 11:52:02 +0200 Subject: [PATCH] Update loyout Builder and update all widgets that call it --- .../mih_components/mih_layout/mih_action.dart | 12 +++++----- .../mih_layout/mih_layout_builder.dart | 22 ++++++++++++++++--- .../lib/mih_packages/about_mih/mih_about.dart | 2 ++ .../access_review/patient_access_review.dart | 2 ++ .../authentication/forgot_password.dart | 2 ++ .../mih_packages/authentication/register.dart | 2 ++ .../authentication/reset_password.dart | 2 ++ .../mih_packages/authentication/signin.dart | 2 ++ .../manage_business_profile.dart | 2 ++ .../manage_business/profile_business_add.dart | 2 ++ .../mih_packages/mih_home/home_tile_grid.dart | 16 ++++++++++++++ .../mzansi_profile/profile_user_update.dart | 2 ++ .../patient_profile/patient_add.dart | 2 ++ .../patient_profile/patient_edit.dart | 2 ++ .../patient_profile/patient_manager.dart | 2 ++ .../patient_profile/patient_view.dart | 2 ++ .../lib/mih_router/routeGenerator.dart | 6 ++++- 17 files changed, 71 insertions(+), 11 deletions(-) diff --git a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_action.dart b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_action.dart index c75d0eaa..66e4cab2 100644 --- a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_action.dart +++ b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_action.dart @@ -33,13 +33,11 @@ class _MIHActionState extends State { left: 5, width: 50, height: 50, - child: Builder( - builder: (context) => IconButton( - iconSize: widget.iconSize, - padding: const EdgeInsets.all(0), - onPressed: widget.onTap, - icon: widget.icon, - ), + child: IconButton( + iconSize: widget.iconSize, + padding: const EdgeInsets.all(0), + onPressed: widget.onTap, + icon: widget.icon, ), ); } diff --git a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart index 7e1a471a..3c8cbae2 100644 --- a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart +++ b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_layout_builder.dart @@ -1,17 +1,24 @@ import 'package:flutter/material.dart'; -import 'package:patient_manager/mih_components/mih_layout/mih_action.dart'; +import 'package:patient_manager/mih_components/mih_layout/mih_app_drawer.dart'; import 'package:patient_manager/mih_components/mih_layout/mih_body.dart'; import 'package:patient_manager/mih_components/mih_layout/mih_header.dart'; class MIHLayoutBuilder extends StatefulWidget { - final MIHAction actionButton; + final Widget actionButton; final MIHHeader header; final MIHBody body; + final MIHAppDrawer? rightDrawer; + final Widget? bottomNavBar; + + //final String type; const MIHLayoutBuilder({ super.key, required this.actionButton, required this.header, required this.body, + required this.rightDrawer, + required this.bottomNavBar, + //required this.type, }); @override @@ -26,6 +33,10 @@ class _MIHLayoutBuilderState extends State { return temp; } + // openTheDrawer() { + // _scaffoldKey.currentState!.openEndDrawer(); + // } + @override void dispose() { super.dispose(); @@ -40,13 +51,17 @@ class _MIHLayoutBuilderState extends State { Widget build(BuildContext context) { Size screenSize = MediaQuery.sizeOf(context); return Scaffold( + //drawerEnableOpenDragGesture: true, + drawer: widget.rightDrawer, body: SafeArea( child: SizedBox( width: screenSize.width, height: screenSize.height, child: Stack( children: [ - widget.actionButton, + Builder(builder: (context) { + return widget.actionButton; + }), Column( children: [ widget.header, @@ -57,6 +72,7 @@ class _MIHLayoutBuilderState extends State { ), ), ), + bottomNavigationBar: widget.bottomNavBar, ); } } 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 b24817c0..38b65be7 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 @@ -326,6 +326,8 @@ class _MIHAboutState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } 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 15d32978..8273c7d3 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 @@ -350,6 +350,8 @@ class _PatientAccessRequestState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // 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 30de9564..8703ba1b 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/forgot_password.dart @@ -355,6 +355,8 @@ class _ForgotPasswordState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart index b53a0d73..ce0289fe 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart @@ -411,6 +411,8 @@ class _RegisterState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } 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 d47de7ff..93d3c94f 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart @@ -413,6 +413,8 @@ class _ResetPasswordState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart index 531a77d0..928f6c17 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart @@ -578,6 +578,8 @@ class _SignInState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } 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 7c010453..7023838d 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 @@ -372,6 +372,8 @@ class _ManageBusinessProfileState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // 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 13220df5..984a0c1a 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 @@ -437,6 +437,8 @@ class _ProfileBusinessAddState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // return Scaffold( diff --git a/Frontend/patient_manager/lib/mih_packages/mih_home/home_tile_grid.dart b/Frontend/patient_manager/lib/mih_packages/mih_home/home_tile_grid.dart index 7e0c7b81..5a5e3e0d 100644 --- a/Frontend/patient_manager/lib/mih_packages/mih_home/home_tile_grid.dart +++ b/Frontend/patient_manager/lib/mih_packages/mih_home/home_tile_grid.dart @@ -416,6 +416,22 @@ class _HomeTileGridState extends State { p: getPrim(), s: getSec(), )); + tileList.add(MIHTile( + onTap: () { + Navigator.of(context).popAndPushNamed( + '/homev2', + arguments: widget.signedInUser, + ); + }, + tileName: "HomeV2 - Dev", + tileIcon: Icon( + Icons.home, + color: getSec(), + size: 200, + ), + p: getPrim(), + s: getSec(), + )); } } 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 77465453..910a1e09 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 @@ -439,6 +439,8 @@ class _ProfileUserUpdateState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); } } 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 1eb39867..010d56a0 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 @@ -396,6 +396,8 @@ class _AddPatientState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // 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 b09624c1..5a813512 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 @@ -660,6 +660,8 @@ class _EditPatientState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // 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 fd882cae..da12c082 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 @@ -416,6 +416,8 @@ class _PatientManagerState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // 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 33b15851..f55e5715 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 @@ -180,6 +180,8 @@ class _PatientViewState extends State { actionButton: getActionButton(), header: getHeader(), body: getBody(), + rightDrawer: null, + bottomNavBar: null, ); // return Scaffold( // body: SafeArea( diff --git a/Frontend/patient_manager/lib/mih_router/routeGenerator.dart b/Frontend/patient_manager/lib/mih_router/routeGenerator.dart index 7f163493..48be83b7 100644 --- a/Frontend/patient_manager/lib/mih_router/routeGenerator.dart +++ b/Frontend/patient_manager/lib/mih_router/routeGenerator.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:patient_manager/mih_packages/authentication/auth_check.dart'; +import 'package:patient_manager/mih_packages/mih_home/MIH_Profile_Getter.dart'; import 'package:patient_manager/mih_packages/patient_profile/add_or_view_patient.dart'; import 'package:patient_manager/mih_packages/patient_profile/patient_add.dart'; import 'package:patient_manager/mih_packages/patient_profile/patient_edit.dart'; @@ -44,7 +45,10 @@ class RouteGenerator { settings: settings, builder: (_) => const ForgotPassword()); //http://mzansi-innovation-hub.co.za/auth/reset-password //=============================================================== - + //Home v2 + case '/homev2': + return MaterialPageRoute( + settings: settings, builder: (_) => const MIHProfileGetter()); //About MIH case '/about': return MaterialPageRoute(