Migration to mih_package_toolkit

2026-03-18 16:42:12 +02:00
parent 84cb6b2e83
commit c67529dbac
180 changed files with 2112 additions and 8147 deletions
--- a/mih_ui/lib/mih_packages/calendar/builder/build_access_request_list.dart
+++ b/mih_ui/lib/mih_packages/calendar/builder/build_access_request_list.dart
@@ -1,12 +1,10 @@
 import 'dart:convert';

 import 'package:flutter/material.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_objects/access_request.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:supertokens_flutter/http.dart' as http;
@@ -103,30 +101,20 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
    TextSpan accessWithColour;
    if (access == "APPROVED") {
      accessWithColour = TextSpan(
-          text: "$access\n",
-          style: TextStyle(
-              color: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
+          text: "$access\n", style: TextStyle(color: MihColors.green()));
    } else if (access == "PENDING") {
      accessWithColour = TextSpan(
-          text: "$access\n",
-          style: TextStyle(
-              color: MihColors.getGreyColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
+          text: "$access\n", style: TextStyle(color: MihColors.grey()));
    } else {
-      accessWithColour = TextSpan(
-          text: "$access\n",
-          style: TextStyle(
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
+      accessWithColour =
+          TextSpan(text: "$access\n", style: TextStyle(color: MihColors.red()));
    }

    return ListTile(
      title: Text(
        line1,
        style: TextStyle(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
        ),
      ),
      subtitle: RichText(
@@ -142,7 +130,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      // Text(
      //   subtitle,
      //   style: TextStyle(
-      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      //     color: MihColors.secondary(),
      //   ),
      // ),
      onTap: () {
@@ -158,7 +146,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      },
      // trailing: Icon(
      //   Icons.arrow_forward,
-      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      //   color: MihColors.secondary(),
      // ),
    );
  }
@@ -213,8 +201,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                  subtitle,
                  textAlign: TextAlign.left,
                  style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                    fontSize: popUpBodySize,
                    //fontWeight: FontWeight.bold,
                  ),
@@ -231,15 +218,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                    onPressed: () {
                      updateAccessAPICall(index, "declined");
                    },
-                    buttonColor: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.red(),
                    width: 300,
                    child: Text(
                      "Decline",
                      style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                        fontSize: 20,
                        fontWeight: FontWeight.bold,
                      ),
@@ -249,15 +233,12 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                    onPressed: () {
                      updateAccessAPICall(index, "approved");
                    },
-                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.green(),
                    width: 300,
                    child: Text(
                      "Approve",
                      style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                        fontSize: 20,
                        fontWeight: FontWeight.bold,
                      ),
@@ -294,8 +275,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      physics: const NeverScrollableScrollPhysics(),
      separatorBuilder: (BuildContext context, index) {
        return Divider(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
        );
      },
      itemCount: widget.accessRequests.length,
--- a/mih_ui/lib/mih_packages/calendar/builder/build_appointment_list.dart
+++ b/mih_ui/lib/mih_packages/calendar/builder/build_appointment_list.dart
@@ -1,20 +1,14 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:go_router/go_router.dart';
 import 'package:ken_logger/ken_logger.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_objects/appointment.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -106,20 +100,16 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {

    int appointHour = int.parse(timePart.split(':')[0]);

-    Color appointmentColor = MihColors.getSecondaryColor(
-        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+    Color appointmentColor = MihColors.secondary();

    if (currentDate == datePart) {
      if (appointHour < hourNow) {
-        appointmentColor = MihColors.getGreyColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        appointmentColor = MihColors.grey();
      } else if (appointHour == hourNow) {
-        appointmentColor = MihColors.getGreenColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        appointmentColor = MihColors.green();
      }
    } else if (DateTime.parse(datePart).isBefore(DateTime.parse(currentDate))) {
-      appointmentColor = MihColors.getGreyColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      appointmentColor = MihColors.grey();
    }

    return Container(
@@ -179,19 +169,15 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.edit,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
              ),
              label: "Edit Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              labelBackgroundColor: MihColors.green(),
              labelStyle: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              backgroundColor: MihColors.green(),
              onTap: () {
                appointmentUpdateWindow(mzansiProfileProvider,
                    mihCalendarProvider, index, bodyWidth);
@@ -200,19 +186,15 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.delete,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
              ),
              label: "Delete Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              labelBackgroundColor: MihColors.green(),
              labelStyle: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              backgroundColor: MihColors.green(),
              onTap: () {
                deleteAppointmentConfirmationWindow(
                    mzansiProfileProvider, mihCalendarProvider, index);
@@ -232,10 +214,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
              children: [
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.titleController,
                  multiLineInput: false,
                  requiredText: true,
@@ -244,10 +224,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.dateController,
                  multiLineInput: false,
                  requiredText: true,
@@ -256,10 +234,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.timeController,
                  multiLineInput: false,
                  requiredText: true,
@@ -268,10 +244,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.descriptionIDController,
                  multiLineInput: true,
                  height: 250,
@@ -304,19 +278,15 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.edit,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
              ),
              label: "Edit Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              labelBackgroundColor: MihColors.green(),
              labelStyle: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              backgroundColor: MihColors.green(),
              onTap: () {
                appointmentUpdateWindow(mzansiProfileProvider,
                    mihCalendarProvider, index, bodyWidth);
@@ -325,19 +295,15 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.delete,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
              ),
              label: "Delete Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              labelBackgroundColor: MihColors.green(),
              labelStyle: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              backgroundColor: MihColors.green(),
              onTap: () {
                deleteAppointmentConfirmationWindow(
                    mzansiProfileProvider, mihCalendarProvider, index);
@@ -357,10 +323,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
              children: [
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.titleController,
                  multiLineInput: false,
                  requiredText: true,
@@ -369,10 +333,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.dateController,
                  multiLineInput: false,
                  requiredText: true,
@@ -381,10 +343,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.timeController,
                  multiLineInput: false,
                  requiredText: true,
@@ -393,10 +353,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  inputColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  inputColor: MihColors.primary(),
                  controller: widget.descriptionIDController,
                  multiLineInput: true,
                  height: 250,
@@ -460,12 +418,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                  formKey: _formKey,
                  formFields: [
                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      fillColor: MihColors.secondary(),
+                      inputColor: MihColors.primary(),
                      controller: widget.titleController,
                      multiLineInput: false,
                      requiredText: true,
@@ -494,12 +448,8 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                    ),
                    const SizedBox(height: 10),
                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      fillColor: MihColors.secondary(),
+                      inputColor: MihColors.primary(),
                      controller: widget.descriptionIDController,
                      multiLineInput: true,
                      height: 250,
@@ -527,18 +477,12 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                                MihAlertServices().inputErrorAlert(context);
                              }
                            },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                            width: 300,
                            child: Text(
                              "Update",
                              style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                fontSize: 20,
                                fontWeight: FontWeight.bold,
                              ),
@@ -681,15 +625,13 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            clearControllers();
            Navigator.of(context).pop();
          },
-          buttonColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.primary(),
          elevation: 10,
          width: 300,
          child: Text(
            "Dismiss",
            style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
              fontSize: 20,
              fontWeight: FontWeight.bold,
            ),
--- a/mih_ui/lib/mih_packages/calendar/builder/build_queue_list.dart
+++ b/mih_ui/lib/mih_packages/calendar/builder/build_queue_list.dart
@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_objects/patient_queue.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';

 class BuildQueueList extends StatefulWidget {
@@ -43,8 +42,7 @@ class _BuildQueueListState extends State<BuildQueueList> {
      title: Text(
        title,
        style: TextStyle(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
        ),
      ),
      subtitle: RichText(
@@ -85,8 +83,7 @@ class _BuildQueueListState extends State<BuildQueueList> {
      shrinkWrap: true,
      separatorBuilder: (BuildContext context, index) {
        return Divider(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
        );
      },
      itemCount: widget.patientQueue.length,
--- a/mih_ui/lib/mih_packages/calendar/mzansi_calendar.dart
+++ b/mih_ui/lib/mih_packages/calendar/mzansi_calendar.dart
@@ -1,8 +1,5 @@
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tools/appointments.dart';
@@ -59,11 +56,11 @@ class _MzansiCalendarState extends State<MzansiCalendar> {
          );
        }
        return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: calendarProvider.toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: calendarProvider.toolIndex,
          onIndexChange: (newIndex) {
            calendarProvider.setToolIndex(newIndex);
          },
@@ -94,7 +91,7 @@ class _MzansiCalendarState extends State<MzansiCalendar> {

    return MihPackageTools(
      tools: temp,
-      selcetedIndex: context.watch<MihCalendarProvider>().toolIndex,
+      selectedIndex: context.watch<MihCalendarProvider>().toolIndex,
    );
  }

--- a/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart
+++ b/mih_ui/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart
@@ -1,9 +1,6 @@
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';

 class MzansiCalendarTile extends StatefulWidget {
  final double packageSize;
@@ -30,16 +27,14 @@ class _MzansiCalendarTileState extends State<MzansiCalendarTile> {
        //   arguments: widget.arguments,
        // );
      },
-      appName: "Calendar",
-      appIcon: Icon(
+      packageName: "Calendar",
+      packageIcon: Icon(
        MihIcons.calendar,
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        color: MihColors.secondary(),
        // size: widget.packageSize,
      ),
      iconSize: widget.packageSize,
-      textColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      textColor: MihColors.secondary(),
    );
  }
 }
--- a/mih_ui/lib/mih_packages/calendar/package_tools/appointments.dart
+++ b/mih_ui/lib/mih_packages/calendar/package_tools/appointments.dart
@@ -1,24 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:go_router/go_router.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_calendar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_calendar_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_date_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_time_field.dart';
 import 'package:mzansi_innovation_hub/mih_objects/appointment.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calendar/builder/build_appointment_list.dart';
 import 'package:provider/provider.dart';
@@ -75,8 +65,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                  Icon(
                    MihIcons.calendar,
                    size: 165,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                  ),
                  const SizedBox(height: 10),
                  Text(
@@ -86,9 +75,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                    style: TextStyle(
                      fontSize: 25,
                      fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                    ),
                  ),
                  const SizedBox(height: 25),
@@ -99,9 +86,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                        style: TextStyle(
                          fontSize: 20,
                          fontWeight: FontWeight.normal,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                        ),
                        children: [
                          TextSpan(text: "Press "),
@@ -110,9 +95,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                            child: Icon(
                              Icons.menu,
                              size: 20,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                            ),
                          ),
                          TextSpan(
@@ -155,12 +138,8 @@ class _PatientAccessRequestState extends State<Appointments> {
                  formKey: _formKey,
                  formFields: [
                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      fillColor: MihColors.secondary(),
+                      inputColor: MihColors.primary(),
                      controller: _appointmentTitleController,
                      multiLineInput: false,
                      requiredText: true,
@@ -189,12 +168,8 @@ class _PatientAccessRequestState extends State<Appointments> {
                    ),
                    const SizedBox(height: 10),
                    MihTextFormField(
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      inputColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      fillColor: MihColors.secondary(),
+                      inputColor: MihColors.primary(),
                      controller: _appointmentDescriptionIDController,
                      multiLineInput: true,
                      height: 250,
@@ -215,16 +190,12 @@ class _PatientAccessRequestState extends State<Appointments> {
                            MihAlertServices().inputErrorAlert(context);
                          }
                        },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                        width: 300,
                        child: Text(
                          "Add",
                          style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                            fontSize: 20,
                            fontWeight: FontWeight.bold,
                          ),
@@ -324,15 +295,13 @@ class _PatientAccessRequestState extends State<Appointments> {
              _appointmentDescriptionIDController.clear();
            });
          },
-          buttonColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.primary(),
          elevation: 10,
          width: 300,
          child: Text(
            "Dismiss",
            style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
              fontSize: 20,
              fontWeight: FontWeight.bold,
            ),
@@ -383,7 +352,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                      });
                    }),
                // Divider(
-                //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                //   color: MihColors.secondary(),
                // ),
                displayAppointmentList(
                  mzansiProfileProvider,
@@ -401,21 +370,15 @@ class _PatientAccessRequestState extends State<Appointments> {
                  SpeedDialChild(
                    child: Icon(
                      Icons.add,
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                    ),
                    label: "Add Appointment",
-                    labelBackgroundColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    labelBackgroundColor: MihColors.green(),
                    labelStyle: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                      fontWeight: FontWeight.bold,
                    ),
-                    backgroundColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    backgroundColor: MihColors.green(),
                    onTap: () {
                      addAppointmentWindow(
                          mzansiProfileProvider, mihCalendarProvider, width);
@@ -477,6 +440,7 @@ class _PatientAccessRequestState extends State<Appointments> {
  Widget build(BuildContext context) {
    double screenWidth = MediaQuery.of(context).size.width;
    return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
      borderOn: false,
      bodyItem: getBody(screenWidth),
    );