Add secondary action and secondary action drawer

This commit is contained in:
2024-10-01 12:07:41 +02:00
parent 0c85d560a0
commit ef78fd581f
16 changed files with 49 additions and 23 deletions

View File

@@ -5,9 +5,11 @@ import 'package:patient_manager/mih_components/mih_layout/mih_header.dart';
class MIHLayoutBuilder extends StatefulWidget {
final Widget actionButton;
final Widget? secondaryActionButton;
final MIHHeader header;
final MIHBody body;
final MIHAppDrawer? rightDrawer;
final MIHAppDrawer? actionDrawer;
final MIHAppDrawer? secondaryActionDrawer;
final Widget? bottomNavBar;
//final String type;
@@ -15,8 +17,10 @@ class MIHLayoutBuilder extends StatefulWidget {
super.key,
required this.actionButton,
required this.header,
required this.secondaryActionButton,
required this.body,
required this.rightDrawer,
required this.actionDrawer,
required this.secondaryActionDrawer,
required this.bottomNavBar,
//required this.type,
});
@@ -52,7 +56,8 @@ class _MIHLayoutBuilderState extends State<MIHLayoutBuilder> {
Size screenSize = MediaQuery.sizeOf(context);
return Scaffold(
//drawerEnableOpenDragGesture: true,
drawer: widget.rightDrawer,
drawer: widget.actionDrawer,
endDrawer: widget.secondaryActionButton,
body: SafeArea(
child: SizedBox(
width: screenSize.width,

View File

@@ -324,9 +324,11 @@ class _MIHAboutState extends State<MIHAbout> {
Widget build(BuildContext context) {
return MIHLayoutBuilder(
actionButton: getActionButton(),
secondaryActionButton: null,
header: getHeader(),
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -349,8 +349,10 @@ class _PatientAccessRequestState extends State<PatientAccessRequest> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:patient_manager/mih_packages/authentication/signin_or_register.dart';
import 'package:patient_manager/mih_packages/mih_home/home.dart';
import 'package:patient_manager/mih_packages/mih_home/MIH_Profile_Getter.dart';
import 'package:supertokens_flutter/supertokens.dart';
class AuthCheck extends StatefulWidget {
@@ -30,7 +30,7 @@ class _AuthCheckState extends State<AuthCheck> {
future: signedIn,
builder: (context, snapshot) {
if (snapshot.data == true) {
return const Home();
return const MIHProfileGetter();
} else {
return const SignInOrRegister();
}

View File

@@ -354,8 +354,10 @@ class _ForgotPasswordState extends State<ForgotPassword> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -410,8 +410,10 @@ class _RegisterState extends State<Register> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -412,8 +412,10 @@ class _ResetPasswordState extends State<ResetPassword> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -577,8 +577,10 @@ class _SignInState extends State<SignIn> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -370,9 +370,11 @@ class _ManageBusinessProfileState extends State<ManageBusinessProfile> {
Widget build(BuildContext context) {
return MIHLayoutBuilder(
actionButton: getActionButton(),
secondaryActionButton: null,
header: getHeader(),
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -435,9 +435,11 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
Widget build(BuildContext context) {
return MIHLayoutBuilder(
actionButton: getActionButton(),
secondaryActionButton: null,
header: getHeader(),
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);

View File

@@ -438,8 +438,10 @@ class _ProfileUserUpdateState extends State<ProfileUserUpdate> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
}

View File

@@ -395,8 +395,10 @@ class _AddPatientState extends State<AddPatient> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -659,8 +659,10 @@ class _EditPatientState extends State<EditPatient> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -415,8 +415,10 @@ class _PatientManagerState extends State<PatientManager> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -179,8 +179,10 @@ class _PatientViewState extends State<PatientView> {
return MIHLayoutBuilder(
actionButton: getActionButton(),
header: getHeader(),
secondaryActionButton: null,
body: getBody(),
rightDrawer: null,
actionDrawer: null,
secondaryActionDrawer: null,
bottomNavBar: null,
);
// return Scaffold(

View File

@@ -1,6 +1,5 @@
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';
@@ -45,10 +44,6 @@ 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(