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 66e4cab2..7e5e39bd 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 @@ -28,17 +28,11 @@ class _MIHActionState extends State { @override Widget build(BuildContext context) { - return Positioned( - top: 5, - left: 5, - width: 50, - height: 50, - child: IconButton( - iconSize: widget.iconSize, - padding: const EdgeInsets.all(0), - onPressed: widget.onTap, - icon: widget.icon, - ), + return 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_header.dart b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_header.dart index 138d22c3..e2017326 100644 --- a/Frontend/patient_manager/lib/mih_components/mih_layout/mih_header.dart +++ b/Frontend/patient_manager/lib/mih_components/mih_layout/mih_header.dart @@ -27,7 +27,7 @@ class _MIHHeaderState extends State { @override Widget build(BuildContext context) { return SizedBox( - height: 60, + height: 50, child: Row( crossAxisAlignment: CrossAxisAlignment.center, mainAxisAlignment: widget.headerAlignment, 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 dc847cd1..266d5598 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 @@ -41,6 +41,24 @@ class _MIHLayoutBuilderState extends State { // _scaffoldKey.currentState!.openEndDrawer(); // } + Widget getLayoutHeader() { + List temp = []; + temp.add(widget.actionButton); + temp.add(Flexible(child: widget.header)); + if (widget.secondaryActionButton != null) { + temp.add(widget.secondaryActionButton!); + } else { + temp.add(const SizedBox( + width: 50, + )); + } + return Row( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: temp, + ); + } + @override void dispose() { super.dispose(); @@ -62,17 +80,11 @@ class _MIHLayoutBuilderState extends State { child: SizedBox( width: screenSize.width, height: screenSize.height, - child: Stack( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, children: [ - Builder(builder: (context) { - return widget.actionButton; - }), - Column( - children: [ - widget.header, - Expanded(child: widget.body), - ], - ), + getLayoutHeader(), + Expanded(child: widget.body), ], ), ), diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart index 718a33ce..5215aad6 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/register.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/register.dart @@ -231,7 +231,13 @@ class _RegisterState extends State { MIHAction getActionButton() { return MIHAction( - icon: Image.asset('images/logo_light.png'), + icon: Padding( + padding: const EdgeInsets.all(10.0), + child: SizedBox( + height: 50, + child: Image.asset('images/logo_light.png'), + ), + ), iconSize: 35, onTap: () { Navigator.of(context).pushNamed( 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 d118897e..8165937f 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/reset_password.dart @@ -258,7 +258,13 @@ class _ResetPasswordState extends State { MIHAction getActionButton() { return MIHAction( - icon: Image.asset('images/logo_light.png'), + icon: Padding( + padding: const EdgeInsets.all(10.0), + child: SizedBox( + height: 50, + child: Image.asset('images/logo_light.png'), + ), + ), iconSize: 35, onTap: () { // Navigator.of(context).pushNamed( diff --git a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart index ac9654cd..afe6b3e4 100644 --- a/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart +++ b/Frontend/patient_manager/lib/mih_packages/authentication/signin.dart @@ -262,7 +262,13 @@ class _SignInState extends State { MIHAction getActionButton() { return MIHAction( - icon: Image.asset('images/logo_light.png'), + icon: Padding( + padding: const EdgeInsets.all(10.0), + child: SizedBox( + height: 50, + child: Image.asset('images/logo_light.png'), + ), + ), iconSize: 35, onTap: () { Navigator.of(context).pushNamed(