Use MihColor Across MIH

2025-08-14 15:26:26 +02:00
parent 726c6f5213
commit 96d913629a
119 changed files with 4018 additions and 2968 deletions
--- a/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart
+++ b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart
@@ -134,24 +134,29 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
    if (access == "APPROVED") {
      accessWithColour = TextSpan(
          text: "$access\n",
-          style: TextStyle(color: MihColors.getGreenColor(context)));
+          style: TextStyle(
+              color: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
    } else if (access == "PENDING") {
      accessWithColour = TextSpan(
          text: "$access\n",
          style: TextStyle(
-              color:
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+              color: MihColors.getGreyColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
    } else {
      accessWithColour = TextSpan(
          text: "$access\n",
-          style: TextStyle(color: MihColors.getRedColor(context)));
+          style: TextStyle(
+              color: MihColors.getRedColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
    }

    return ListTile(
      title: Text(
        line1,
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      subtitle: RichText(
@@ -167,7 +172,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      // Text(
      //   subtitle,
      //   style: TextStyle(
-      //     color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
      //   ),
      // ),
      onTap: () {
@@ -179,7 +184,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      },
      // trailing: Icon(
      //   Icons.arrow_forward,
-      //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
      // ),
    );
  }
@@ -234,8 +239,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                  subtitle,
                  textAlign: TextAlign.left,
                  style: TextStyle(
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    fontSize: popUpBodySize,
                    //fontWeight: FontWeight.bold,
                  ),
@@ -249,14 +254,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                    onPressed: () {
                      updateAccessAPICall(index, "declined");
                    },
-                    buttonColor: MihColors.getRedColor(context),
+                    buttonColor: MihColors.getRedColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    width: 300,
                    child: Text(
                      "Decline",
                      style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .primaryColor(),
+                        color: MihColors.getPrimaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        fontSize: 20,
                        fontWeight: FontWeight.bold,
                      ),
@@ -266,14 +272,15 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                    onPressed: () {
                      updateAccessAPICall(index, "approved");
                    },
-                    buttonColor: MihColors.getGreenColor(context),
+                    buttonColor: MihColors.getGreenColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    width: 300,
                    child: Text(
                      "Approve",
                      style: TextStyle(
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .primaryColor(),
+                        color: MihColors.getPrimaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        fontSize: 20,
                        fontWeight: FontWeight.bold,
                      ),
@@ -310,7 +317,8 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
      physics: const NeverScrollableScrollPhysics(),
      separatorBuilder: (BuildContext context, index) {
        return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        );
      },
      itemCount: widget.accessRequests.length,
--- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart
+++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart
@@ -89,18 +89,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
    // print("Date: $date");
    // print("Appointment Date: $appointDate");
    // print("Appointment Hour: $appointHour");
-    Color appointmentColor =
-        MzansiInnovationHub.of(context)!.theme.secondaryColor();
+    Color appointmentColor = MihColors.getSecondaryColor(
+        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
    if (date == appointDate) {
      if (appointHour < hourNow) {
-        appointmentColor =
-            MzansiInnovationHub.of(context)!.theme.messageTextColor();
+        appointmentColor = MihColors.getGreyColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
      } else if (appointHour == hourNow) {
-        appointmentColor = MihColors.getGreenColor(context);
+        appointmentColor = MihColors.getGreenColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
      }
    } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) {
-      appointmentColor =
-          MzansiInnovationHub.of(context)!.theme.messageTextColor();
+      appointmentColor = MihColors.getGreyColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
    }

    return Container(
@@ -158,15 +159,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.edit,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
              label: "Edit Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(context),
+              labelBackgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(context),
+              backgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              onTap: () {
                appointmentUpdateWindow(index, bodyWidth);
              },
@@ -174,15 +179,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.delete,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
              label: "Delete Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(context),
+              labelBackgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(context),
+              backgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              onTap: () {
                deleteAppointmentConfirmationWindow(index);
              },
@@ -204,10 +213,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
              children: [
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.titleController,
                  multiLineInput: false,
                  requiredText: true,
@@ -216,10 +225,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.dateController,
                  multiLineInput: false,
                  requiredText: true,
@@ -228,10 +237,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.timeController,
                  multiLineInput: false,
                  requiredText: true,
@@ -240,10 +249,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.descriptionIDController,
                  multiLineInput: true,
                  height: 250,
@@ -272,15 +281,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.edit,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
              label: "Edit Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(context),
+              labelBackgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(context),
+              backgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              onTap: () {
                appointmentUpdateWindow(index, bodyWidth);
              },
@@ -288,15 +301,19 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
            SpeedDialChild(
              child: Icon(
                Icons.delete,
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
              label: "Delete Appointment",
-              labelBackgroundColor: MihColors.getGreenColor(context),
+              labelBackgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              labelStyle: TextStyle(
-                color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                color: MihColors.getPrimaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                fontWeight: FontWeight.bold,
              ),
-              backgroundColor: MihColors.getGreenColor(context),
+              backgroundColor: MihColors.getGreenColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              onTap: () {
                deleteAppointmentConfirmationWindow(index);
              },
@@ -318,10 +335,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
              children: [
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.titleController,
                  multiLineInput: false,
                  requiredText: true,
@@ -330,10 +347,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.dateController,
                  multiLineInput: false,
                  requiredText: true,
@@ -342,10 +359,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.timeController,
                  multiLineInput: false,
                  requiredText: true,
@@ -354,10 +371,10 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                ),
                const SizedBox(height: 10),
                MihTextFormField(
-                  fillColor:
-                      MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-                  inputColor:
-                      MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  fillColor: MihColors.getSecondaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  inputColor: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  controller: widget.descriptionIDController,
                  multiLineInput: true,
                  height: 250,
@@ -417,11 +434,12 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                  formKey: _formKey,
                  formFields: [
                    MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
-                          .theme
-                          .secondaryColor(),
-                      inputColor:
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      fillColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
+                      inputColor: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      controller: widget.titleController,
                      multiLineInput: false,
                      requiredText: true,
@@ -450,11 +468,12 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                    ),
                    const SizedBox(height: 10),
                    MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
-                          .theme
-                          .secondaryColor(),
-                      inputColor:
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      fillColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
+                      inputColor: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      controller: widget.descriptionIDController,
                      multiLineInput: true,
                      height: 250,
@@ -480,16 +499,18 @@ class _BuildAppointmentListState extends State<BuildAppointmentList> {
                                    .formNotFilledCompletely(context);
                              }
                            },
-                            buttonColor: MzansiInnovationHub.of(context)!
-                                .theme
-                                .successColor(),
+                            buttonColor: MihColors.getGreenColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                            width: 300,
                            child: Text(
                              "Update",
                              style: TextStyle(
-                                color: MzansiInnovationHub.of(context)!
-                                    .theme
-                                    .primaryColor(),
+                                color: MihColors.getPrimaryColor(
+                                    MzansiInnovationHub.of(context)!
+                                            .theme
+                                            .mode ==
+                                        "Dark"),
                                fontSize: 20,
                                fontWeight: FontWeight.bold,
                              ),
--- a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart
+++ b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_queue.dart';
-
-import '../../../main.dart';
-import '../../../mih_components/mih_pop_up_messages/mih_warning_message.dart';
-import '../../../mih_config/mih_env.dart';
+import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.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 {
  final List<PatientQueue> patientQueue;
@@ -44,7 +44,8 @@ class _BuildQueueListState extends State<BuildQueueList> {
      title: Text(
        title,
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      subtitle: RichText(
@@ -121,7 +122,8 @@ class _BuildQueueListState extends State<BuildQueueList> {
      shrinkWrap: true,
      separatorBuilder: (BuildContext context, index) {
        return Divider(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        );
      },
      itemCount: widget.patientQueue.length,
--- a/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart
+++ b/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart
@@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_
 import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
+import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';

 class MzansiCalendarTile extends StatefulWidget {
  final CalendarArguments arguments;
@@ -31,12 +32,15 @@ class _MzansiCalendarTileState extends State<MzansiCalendarTile> {
      appName: "Calendar",
      appIcon: Icon(
        MihIcons.calendar,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        // size: widget.packageSize,
      ),
      iconSize: widget.packageSize,
-      primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-      secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+      primaryColor: MihColors.getSecondaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      secondaryColor: MihColors.getPrimaryColor(
+          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
    );
  }
 }
--- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart
+++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart
@@ -94,7 +94,8 @@ class _PatientAccessRequestState extends State<Appointments> {
            Icon(
              MihIcons.calendar,
              size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
            const SizedBox(height: 10),
            Text(
@@ -104,7 +105,8 @@ class _PatientAccessRequestState extends State<Appointments> {
              style: TextStyle(
                fontSize: 25,
                fontWeight: FontWeight.bold,
-                color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                color: MihColors.getSecondaryColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              ),
            ),
            const SizedBox(height: 25),
@@ -115,8 +117,8 @@ class _PatientAccessRequestState extends State<Appointments> {
                  style: TextStyle(
                    fontSize: 20,
                    fontWeight: FontWeight.normal,
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  ),
                  children: [
                    TextSpan(text: "Press "),
@@ -125,9 +127,9 @@ class _PatientAccessRequestState extends State<Appointments> {
                      child: Icon(
                        Icons.menu,
                        size: 20,
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .secondaryColor(),
+                        color: MihColors.getSecondaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                    TextSpan(
@@ -150,7 +152,7 @@ class _PatientAccessRequestState extends State<Appointments> {
    //         "No Appointments for $selectedDay",
    //         style: TextStyle(
    //           fontSize: 25,
-    //           color: MzansiInnovationHub.of(context)!.theme.messageTextColor(),
+    //           color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
    //         ),
    //         textAlign: TextAlign.center,
    //         softWrap: true,
@@ -186,11 +188,12 @@ class _PatientAccessRequestState extends State<Appointments> {
                  formKey: _formKey,
                  formFields: [
                    MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
-                          .theme
-                          .secondaryColor(),
-                      inputColor:
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      fillColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
+                      inputColor: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      controller: _appointmentTitleController,
                      multiLineInput: false,
                      requiredText: true,
@@ -219,11 +222,12 @@ class _PatientAccessRequestState extends State<Appointments> {
                    ),
                    const SizedBox(height: 10),
                    MihTextFormField(
-                      fillColor: MzansiInnovationHub.of(context)!
-                          .theme
-                          .secondaryColor(),
-                      inputColor:
-                          MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                      fillColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
+                      inputColor: MihColors.getPrimaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      controller: _appointmentDescriptionIDController,
                      multiLineInput: true,
                      height: 250,
@@ -243,14 +247,16 @@ class _PatientAccessRequestState extends State<Appointments> {
                            MihAlertServices().formNotFilledCompletely(context);
                          }
                        },
-                        buttonColor: MihColors.getGreenColor(context),
+                        buttonColor: MihColors.getGreenColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        width: 300,
                        child: Text(
                          "Add",
                          style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
-                                .theme
-                                .primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                            fontSize: 20,
                            fontWeight: FontWeight.bold,
                          ),
@@ -354,7 +360,7 @@ class _PatientAccessRequestState extends State<Appointments> {
                    });
                  }),
              // Divider(
-              //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              // ),
              Row(
                mainAxisSize: MainAxisSize.max,
@@ -376,9 +382,11 @@ class _PatientAccessRequestState extends State<Appointments> {
                              "Error pulling appointments",
                              style: TextStyle(
                                  fontSize: 25,
-                                  color: MzansiInnovationHub.of(context)!
-                                      .theme
-                                      .errorColor()),
+                                  color: MihColors.getRedColor(
+                                      MzansiInnovationHub.of(context)!
+                                              .theme
+                                              .mode ==
+                                          "Dark")),
                              textAlign: TextAlign.center,
                            ),
                          );
@@ -399,15 +407,19 @@ class _PatientAccessRequestState extends State<Appointments> {
              SpeedDialChild(
                child: Icon(
                  Icons.add,
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                ),
                label: "Add Appointment",
-                labelBackgroundColor: MihColors.getGreenColor(context),
+                labelBackgroundColor: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                labelStyle: TextStyle(
-                  color: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                  color: MihColors.getPrimaryColor(
+                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  fontWeight: FontWeight.bold,
                ),
-                backgroundColor: MihColors.getGreenColor(context),
+                backgroundColor: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                onTap: () {
                  addAppointmentWindow(width);
                },