Merge pull request #108 from yaso-meth/BUG--Content-Overflow-on-MIH-App-Packages

BUG--Content-Overflow-on-MIH-App-Packages

Frontend/lib/mih_components/mih_layout/mih_single_child_scroll.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+class MihSingleChildScroll extends StatefulWidget {
+  final Widget child;
+  const MihSingleChildScroll({
+    super.key,
+    required this.child,
+  });
+
+  @override
+  State<MihSingleChildScroll> createState() => _MihSingleChildScrollState();
+}
+
+class _MihSingleChildScrollState extends State<MihSingleChildScroll> {
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: ScrollConfiguration(
+        behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
+        child: SingleChildScrollView(
+          child: widget.child,
+        ),
+      ),
+    );
+  }
+}

Frontend/lib/mih_packages/about_mih/app_tools/mih_info.dart

@@ -1,5 +1,6 @@
 import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_tile.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_window.dart';
@@ -577,7 +578,7 @@ class _MihInfoState extends State<MihInfo> {
   }
 
   Widget getBody() {
-    return SingleChildScrollView(
+    return MihSingleChildScroll(
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10.0),
         child: Column(

Frontend/lib/mih_packages/about_mih/app_tools/mih_privacy_policy.dart

@@ -1,3 +1,4 @@
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
 import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ class MihPrivacyPolicy extends StatelessWidget {
   }
 
   Widget getBody(BuildContext context) {
-    return SingleChildScrollView(
+    return MihSingleChildScroll(
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10.0),
         child: Column(

Frontend/lib/mih_packages/about_mih/app_tools/mih_terms_of_service.dart

@@ -1,3 +1,4 @@
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
 import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ class MIHTermsOfService extends StatelessWidget {
   }
 
   Widget getBody(BuildContext context) {
-    return SingleChildScrollView(
+    return MihSingleChildScroll(
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 10.0),
         child: Column(

Frontend/lib/mih_packages/access_review/app_tools/mih_access_requests.dart

@@ -1,16 +1,17 @@
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
-import '../../main.dart';
+import '../../../main.dart';
-import '../../mih_apis/mih_api_calls.dart';
+import '../../../mih_apis/mih_api_calls.dart';
-import '../../mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
+import '../../../mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
-import '../../mih_components/mih_layout/mih_action.dart';
+import '../../../mih_components/mih_layout/mih_action.dart';
-import '../../mih_components/mih_layout/mih_header.dart';
+import '../../../mih_components/mih_layout/mih_header.dart';
-import '../../mih_components/mih_pop_up_messages/mih_loading_circle.dart';
+import '../../../mih_components/mih_pop_up_messages/mih_loading_circle.dart';
-import '../../mih_env/env.dart';
+import '../../../mih_env/env.dart';
-import '../../mih_objects/app_user.dart';
+import '../../../mih_objects/app_user.dart';
-import '../../mih_objects/patient_access.dart';
+import '../../../mih_objects/patient_access.dart';
-import 'builder/build_business_access_list.dart';
+import '../builder/build_business_access_list.dart';
 
 class MihAccessRequest extends StatefulWidget {
   final AppUser signedInUser;
@@ -127,7 +128,7 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
   }
 
   Widget getBody() {
-    return SingleChildScrollView(
+    return MihSingleChildScroll(
       child: Column(
         children: [
           const Text(

Frontend/lib/mih_packages/access_review/mih_access.dart

@@ -2,7 +2,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_action.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih_app_tools.dart';
 import 'package:Mzansi_Innovation_Hub/mih_objects/app_user.dart';
-import 'package:Mzansi_Innovation_Hub/mih_packages/access_review/mih_access_requests.dart';
+import 'package:Mzansi_Innovation_Hub/mih_packages/access_review/app_tools/mih_access_requests.dart';
 import 'package:flutter/material.dart';
 
 class MihAccess extends StatefulWidget {

Frontend/lib/mih_packages/calculator/app_tools/simple_calc.dart

@@ -1,5 +1,6 @@
 import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:flutter/material.dart';
 import 'package:math_expressions/math_expressions.dart';
@@ -73,7 +74,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
         calcWidth = 300;
       }
     }
-    return Column(
+    return MihSingleChildScroll(
+      child: Column(
         mainAxisAlignment: MainAxisAlignment.start,
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
@@ -86,7 +88,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
               color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
-        Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
+          Divider(
+              color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
           const SizedBox(height: 10),
           Container(
             //color: Colors.white,
@@ -109,7 +112,8 @@ class _SimpleCalcState extends State<SimpleCalc> {
               answer,
               style: TextStyle(
                   fontSize: 30,
-                color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  color:
+                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
                   fontWeight: FontWeight.bold),
             ),
           ),
@@ -148,8 +152,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -168,8 +173,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -187,8 +193,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -206,8 +213,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonText: buttons[index],
                         buttonColor:
                             MzanziInnovationHub.of(context)!.theme.errorColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -222,10 +230,12 @@ class _SimpleCalcState extends State<SimpleCalc> {
                           });
                         },
                         buttonText: buttons[index],
-                      buttonColor:
+                        buttonColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                            .theme
-                      textColor:
+                            .successColor(),
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                        textColor: MzanziInnovationHub.of(context)!
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -257,8 +267,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
                             .messageTextColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -276,8 +287,9 @@ class _SimpleCalcState extends State<SimpleCalc> {
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
                             .secondaryColor(),
-                      textColor:
+                        textColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.primaryColor(),
+                            .theme
+                            .primaryColor(),
                       ),
                     );
                   }
@@ -286,6 +298,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
             ),
           ),
         ],
+      ),
     );
   }
 }

Frontend/lib/mih_packages/calculator/app_tools/tip_calc.dart

@@ -2,6 +2,7 @@ import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -268,7 +269,8 @@ class _TipCalcState extends State<TipCalc> {
   }
 
   Widget getBody() {
-    return Column(
+    return MihSingleChildScroll(
+      child: Column(
         mainAxisSize: MainAxisSize.max,
         children: <Widget>[
           Text(
@@ -280,7 +282,8 @@ class _TipCalcState extends State<TipCalc> {
               color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
             ),
           ),
-        Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
+          Divider(
+              color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
           const SizedBox(height: 10),
           MIHNumberField(
             controller: billAmountController,
@@ -335,7 +338,8 @@ class _TipCalcState extends State<TipCalc> {
                 validateInput();
               },
               buttonText: "Calculate",
-            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
+              buttonColor:
+                  MzanziInnovationHub.of(context)!.theme.successColor(),
               textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
             ),
           ),
@@ -353,6 +357,7 @@ class _TipCalcState extends State<TipCalc> {
             ),
           ),
         ],
+      ),
     );
   }
 }

Frontend/lib/mih_packages/calendar/app_tools/appointments.dart

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -243,7 +244,7 @@ class _PatientAccessRequestState extends State<Appointments> {
   Widget getBody() {
     return Stack(
       children: [
-        SingleChildScrollView(
+        MihSingleChildScroll(
           child: Column(
             children: [
               Text(

Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_business_profile.dart

@@ -6,6 +6,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -317,10 +318,7 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
   }
 
   Widget getBody() {
-    return ScrollConfiguration(
+    return MihSingleChildScroll(
-      behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false),
-      child: SingleChildScrollView(
-        child: SafeArea(
       child: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
@@ -345,9 +343,8 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
                     ),
                   ),
                   Divider(
-                        color: MzanziInnovationHub.of(context)
+                    color:
-                            ?.theme
+                        MzanziInnovationHub.of(context)?.theme.secondaryColor(),
-                            .secondaryColor(),
                   ),
                   const SizedBox(height: 10.0),
                   MIHTextField(
@@ -375,8 +372,8 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
                   const SizedBox(height: 10.0),
                   ValueListenableBuilder(
                     valueListenable: busType,
-                        builder: (BuildContext context, String value,
+                    builder:
-                            Widget? child) {
+                        (BuildContext context, String value, Widget? child) {
                       return Visibility(
                         visible: value == "Doctors Office",
                         child: MIHTextField(
@@ -485,9 +482,8 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
                   ),
                 ),
                 Divider(
-                      color: MzanziInnovationHub.of(context)
+                  color:
-                          ?.theme
+                      MzanziInnovationHub.of(context)?.theme.secondaryColor(),
-                          .secondaryColor(),
                 ),
                 const SizedBox(height: 10.0),
                 MIHDropdownField(
@@ -549,12 +545,10 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
                   height: 50.0,
                   child: MIHButton(
                     buttonText: "Update",
-                        buttonColor: MzanziInnovationHub.of(context)!
+                    buttonColor:
-                            .theme
+                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
-                            .secondaryColor(),
+                    textColor:
-                        textColor: MzanziInnovationHub.of(context)!
+                        MzanziInnovationHub.of(context)!.theme.primaryColor(),
-                            .theme
-                            .primaryColor(),
                     onTap: () {
                       //print(business_id);
                       submitForm(business_id);
@@ -566,8 +560,6 @@ class _MihBusinessProfileState extends State<MihBusinessProfile> {
           ],
         ),
       ),
-        ),
-      ),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_business_user_search.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -97,7 +98,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
   }
 
   Widget getBody() {
-    return KeyboardListener(
+    return MihSingleChildScroll(
+      child: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
         onKeyEvent: (event) async {
@@ -112,7 +114,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold),
           ),
           //spacer
-        Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
+          Divider(
+              color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
           const SizedBox(height: 10),
           MIHSearchField(
             controller: searchController,
@@ -147,8 +150,9 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                     "$errorCode: Error pulling Patients Data\n/patients/search/$userSearch\n$errorBody",
                     style: TextStyle(
                         fontSize: 25,
-                      color:
+                        color: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.errorColor()),
+                            .theme
+                            .errorColor()),
                     textAlign: TextAlign.center,
                   ),
                 );
@@ -156,6 +160,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             },
           ),
         ]),
+      ),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/business_profile/app_tools/mih_my_business_team.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:Mzansi_Innovation_Hub/main.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -80,7 +81,8 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
   }
 
   Widget getBody() {
-    return Column(mainAxisSize: MainAxisSize.max, children: [
+    return MihSingleChildScroll(
+      child: Column(mainAxisSize: MainAxisSize.max, children: [
         const Text(
           "Business Team",
           style: TextStyle(
@@ -112,13 +114,15 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
                   "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody",
                   style: TextStyle(
                       fontSize: 25,
-                    color: MzanziInnovationHub.of(context)!.theme.errorColor()),
+                      color:
+                          MzanziInnovationHub.of(context)!.theme.errorColor()),
                   textAlign: TextAlign.center,
                 ),
               );
             }
           },
         ),
-    ]);
+      ]),
+    );
   }
 }

Frontend/lib/mih_packages/mzansi_profile/personal_profile/app_tools/mih_personal_profile.dart

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_button.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_file_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
@@ -245,7 +246,8 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
   }
 
   Widget getBody() {
-    return Column(
+    return MihSingleChildScroll(
+      child: Column(
         children: [
           //displayProPic(),
           MIHProfilePicture(
@@ -356,6 +358,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
             ),
           ),
         ],
+      ),
     );
   }
 }

Frontend/lib/mih_packages/mzansi_wallet/app_tools/mih_cards.dart

@@ -4,6 +4,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_dropdown_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_number_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -233,7 +234,7 @@ class _MihCardsState extends State<MihCards> {
   Widget getBody() {
     return Stack(
       children: [
-        SingleChildScrollView(
+        MihSingleChildScroll(
           child: Column(
             children: [
               Row(

Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/mih_patient_search.dart

@@ -1,6 +1,7 @@
 import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -39,7 +40,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
   late Future<List<Patient>> _mihPatientSearchResults;
 
   Widget getPatientSearch() {
-    return KeyboardListener(
+    return MihSingleChildScroll(
+      child: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
         onKeyEvent: (event) async {
@@ -51,7 +53,6 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
             // print("To-Do: Implement the search function");
           }
         },
-      child: SingleChildScrollView(
         child: Column(mainAxisSize: MainAxisSize.max, children: [
           const Text(
             "MIH Patient Lookup",

Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/my_patient_list.dart

@@ -1,6 +1,7 @@
 import 'package:Mzansi_Innovation_Hub/main.dart';
 import 'package:Mzansi_Innovation_Hub/mih_apis/mih_api_calls.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_search_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart';
 import 'package:Mzansi_Innovation_Hub/mih_env/env.dart';
@@ -39,7 +40,8 @@ class _MyPatientListState extends State<MyPatientList> {
   final FocusNode _focusNode = FocusNode();
 
   Widget myPatientListTool() {
-    return KeyboardListener(
+    return MihSingleChildScroll(
+      child: KeyboardListener(
         focusNode: _focusNode,
         autofocus: true,
         onKeyEvent: (event) async {
@@ -52,7 +54,6 @@ class _MyPatientListState extends State<MyPatientList> {
             });
           }
         },
-      child: SingleChildScrollView(
         child: Column(mainAxisSize: MainAxisSize.max, children: [
           Row(
             mainAxisAlignment: MainAxisAlignment.center,

Frontend/lib/mih_packages/patient_profile/pat_manager/app_tools/waiting_room.dart

@@ -6,6 +6,7 @@ import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_multiline_text_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_text_input.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_inputs_and_buttons/mih_time_input.dart';
+import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_single_child_scroll.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_layout/mih_window.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_package/mih-app_tool_body.dart';
 import 'package:Mzansi_Innovation_Hub/mih_components/mih_pop_up_messages/mih_error_message.dart';
@@ -61,7 +62,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
   Widget getBusinessAppointmentsTool() {
     return Stack(
       children: [
-        SingleChildScrollView(
+        MihSingleChildScroll(
           child: Column(
             children: [
               const Text(