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/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart
@@ -1,5 +1,4 @@
 import 'dart:convert';
-
 import 'package:mzansi_innovation_hub/main.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart';
@@ -219,9 +218,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        windowBody: Column(
          children: [
            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: idController,
              multiLineInput: false,
              requiredText: true,
@@ -233,9 +233,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
            ),
            const SizedBox(height: 10.0),
            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: fnameController,
              multiLineInput: false,
              requiredText: true,
@@ -247,9 +248,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
            ),
            const SizedBox(height: 10.0),
            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: lnameController,
              multiLineInput: false,
              requiredText: true,
@@ -261,9 +263,10 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
            ),
            const SizedBox(height: 10.0),
            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: accessStatusController,
              multiLineInput: false,
              requiredText: true,
@@ -284,14 +287,18 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                    "Important Notice: Requesting Patient Profile Access",
                    style: TextStyle(
                      fontWeight: FontWeight.bold,
-                      color: MihColors.getRedColor(context),
+                      color: MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                    ),
                  ),
                  Text(
                    "You are about to request access to a patient's profile. Please be aware of the following important points:",
                    style: TextStyle(
                      fontWeight: FontWeight.normal,
-                      color: MihColors.getRedColor(context),
+                      color: MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                    ),
                  ),
                  SizedBox(
@@ -300,7 +307,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                      "1. Permanent Access: Once the patient accepts your access request, it will become permanent.",
                      style: TextStyle(
                        fontWeight: FontWeight.normal,
-                        color: MihColors.getRedColor(context),
+                        color: MihColors.getRedColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                  ),
@@ -310,7 +319,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                      "2. Shared Information: Any updates you make to the patient's profile will be visible to others who have access to the profile.",
                      style: TextStyle(
                        fontWeight: FontWeight.normal,
-                        color: MihColors.getRedColor(context),
+                        color: MihColors.getRedColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                  ),
@@ -320,7 +331,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                      "3. Irreversible Access: Once granted, you cannot revoke your access to the patient's profile.",
                      style: TextStyle(
                        fontWeight: FontWeight.normal,
-                        color: MihColors.getRedColor(context),
+                        color: MihColors.getRedColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                  ),
@@ -328,7 +341,9 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                    "By pressing the \"Request Access\" button you accept the above terms.\n",
                    style: TextStyle(
                      fontWeight: FontWeight.bold,
-                      color: MihColors.getRedColor(context),
+                      color: MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                    ),
                  ),
                ],
@@ -361,14 +376,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                            noAccessWarning();
                          }
                        },
-                        buttonColor: MihColors.getGreenColor(context),
+                        buttonColor: MihColors.getGreenColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        width: 300,
                        child: Text(
                          "View Profile",
                          style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
-                                .theme
-                                .primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                            fontSize: 20,
                            fontWeight: FontWeight.bold,
                          ),
@@ -395,14 +412,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                            context,
                          );
                        },
-                        buttonColor: MihColors.getGreenColor(context),
+                        buttonColor: MihColors.getGreenColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        width: 300,
                        child: Text(
                          "Request Access",
                          style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
-                                .theme
-                                .primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                            fontSize: 20,
                            fontWeight: FontWeight.bold,
                          ),
@@ -427,14 +446,16 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                            context,
                          );
                        },
-                        buttonColor: MihColors.getGreenColor(context),
+                        buttonColor: MihColors.getGreenColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                        width: 300,
                        child: Text(
                          "Re-apply",
                          style: TextStyle(
-                            color: MzansiInnovationHub.of(context)!
-                                .theme
-                                .primaryColor(),
+                            color: MihColors.getPrimaryColor(
+                                MzansiInnovationHub.of(context)!.theme.mode ==
+                                    "Dark"),
                            fontSize: 20,
                            fontWeight: FontWeight.bold,
                          ),
@@ -475,7 +496,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
            // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
            "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
            style: TextStyle(
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
          ),
          const SizedBox(
@@ -483,7 +505,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
          ),
          Icon(
            Icons.star_border_rounded,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
        ],
      );
@@ -492,7 +515,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
        "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      );
    }
@@ -509,7 +533,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        subtitle: Text(
          "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar",
          style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
        ),
        onTap: () {
@@ -524,7 +549,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        },
        trailing: Icon(
          Icons.arrow_forward,
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      );
    } else {
@@ -533,7 +559,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        subtitle: Text(
          "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar",
          style: TextStyle(
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
        ),
        onTap: () {
@@ -547,7 +574,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
        },
        trailing: Icon(
          Icons.add,
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      );
    }
@@ -571,7 +599,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
      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.patients.length,
--- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart
@@ -109,10 +109,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                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: idController,
                    multiLineInput: false,
                    requiredText: true,
@@ -124,10 +124,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                  ),
                  const SizedBox(height: 10.0),
                  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: fnameController,
                    multiLineInput: false,
                    requiredText: true,
@@ -139,10 +139,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                  ),
                  const SizedBox(height: 10.0),
                  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: lnameController,
                    multiLineInput: false,
                    requiredText: true,
@@ -191,14 +191,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                          MihAlertServices().formNotFilledCompletely(context);
                        }
                      },
-                      buttonColor: MihColors.getGreenColor(context),
+                      buttonColor: MihColors.getGreenColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      width: 300,
                      child: Text(
                        "Book Appointment",
                        style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
-                              .theme
-                              .primaryColor(),
+                          color: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                          fontSize: 20,
                          fontWeight: FontWeight.bold,
                        ),
@@ -269,10 +271,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
          child: Column(
            children: [
              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: idController,
                multiLineInput: false,
                requiredText: true,
@@ -284,10 +286,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
              ),
              const SizedBox(height: 10.0),
              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: fnameController,
                multiLineInput: false,
                requiredText: true,
@@ -299,10 +301,10 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
              ),
              const SizedBox(height: 10.0),
              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: lnameController,
                multiLineInput: false,
                requiredText: true,
@@ -322,14 +324,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                      onPressed: () {
                        appointmentPopUp(index, width);
                      },
-                      buttonColor: MihColors.getGreenColor(context),
+                      buttonColor: MihColors.getGreenColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      width: 300,
                      child: Text(
                        "Book Appointment",
                        style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
-                              .theme
-                              .primaryColor(),
+                          color: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                          fontSize: 20,
                          fontWeight: FontWeight.bold,
                        ),
@@ -347,16 +351,16 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                                  "business",
                                ));
                      },
-                      buttonColor: MzansiInnovationHub.of(context)!
-                          .theme
-                          .secondaryColor(),
+                      buttonColor: MihColors.getSecondaryColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark"),
                      width: 300,
                      child: Text(
                        "View Medical Records",
                        style: TextStyle(
-                          color: MzansiInnovationHub.of(context)!
-                              .theme
-                              .primaryColor(),
+                          color: MihColors.getPrimaryColor(
+                              MzansiInnovationHub.of(context)!.theme.mode ==
+                                  "Dark"),
                          fontSize: 20,
                          fontWeight: FontWeight.bold,
                        ),
@@ -385,28 +389,33 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
      lastName = widget.patientAccesses[index].lname;
      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") {
      firstName = "${widget.patientAccesses[index].fname[0]}********";
      lastName = "${widget.patientAccesses[index].lname[0]}********";
      accessWithColour = TextSpan(
          text: "$access\n",
          style: TextStyle(
-              color:
-                  MzansiInnovationHub.of(context)!.theme.messageTextColor()));
+              color: MihColors.getGreyColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")));
    } else {
      firstName = "${widget.patientAccesses[index].fname[0]}********";
      lastName = "${widget.patientAccesses[index].lname[0]}********";
      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(
        "$firstName $lastName",
        style: TextStyle(
-          color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+          color: MihColors.getSecondaryColor(
+              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
        ),
      ),
      subtitle: RichText(
@@ -435,7 +444,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
      },
      trailing: Icon(
        Icons.arrow_forward,
-        color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+        color: MihColors.getSecondaryColor(
+            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
      ),
    );
  }
@@ -458,7 +468,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
      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.patientAccesses.length,
--- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_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 PatManagerTile extends StatefulWidget {
  final PatManagerArguments arguments;
@@ -30,12 +31,15 @@ class _PatManagerTileState extends State<PatManagerTile> {
      appName: "Patient Manager",
      appIcon: Icon(
        MihIcons.patientManager,
-        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/patient_profile/pat_manager/package_tools/mih_patient_search.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart
@@ -51,8 +51,10 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
            controller: _mihPatientSearchController,
            hintText: "Search Patient ID/ Aid No.",
            prefixIcon: Icons.search,
-            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            fillColor: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            hintColor: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            onPrefixIconTap: () {
              submitPatientSearch();
            },
@@ -92,7 +94,10 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
                child: Text(
                  "Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString",
                  style: TextStyle(
-                      fontSize: 25, color: MihColors.getRedColor(context)),
+                      fontSize: 25,
+                      color: MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                  textAlign: TextAlign.center,
                ),
              );
@@ -132,7 +137,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
          Icon(
            MihIcons.iDontKnow,
            size: 165,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
          const SizedBox(height: 10),
          Text(
@@ -142,7 +148,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
            style: TextStyle(
              fontSize: 25,
              fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
          ),
        ],
@@ -158,7 +165,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
            Icon(
              MihIcons.patientProfile,
              size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
            const SizedBox(height: 10),
            Text(
@@ -168,7 +176,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
              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),
@@ -179,8 +188,8 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
                  style: TextStyle(
                    fontSize: 20,
                    fontWeight: FontWeight.normal,
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                  ),
                  children: [
                    TextSpan(
@@ -212,7 +221,7 @@ class _MihPatientSearchState extends State<MihPatientSearch> {
      //       style: TextStyle(
      //           fontSize: 25,
      //           color:
-      //               MzansiInnovationHub.of(context)!.theme.messageTextColor()),
+      //               MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
      //       textAlign: TextAlign.center,
      //     ),
      //   ),
--- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart
@@ -51,8 +51,10 @@ class _MyPatientListState extends State<MyPatientList> {
            controller: _myPatientSearchController,
            hintText: "Search Patient ID",
            prefixIcon: Icons.search,
-            fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
-            hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(),
+            fillColor: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            hintColor: MihColors.getPrimaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            onPrefixIconTap: () {
              setState(() {
                _myPatientIdSearchString = _myPatientSearchController.text;
@@ -94,7 +96,10 @@ class _MyPatientListState extends State<MyPatientList> {
                child: Text(
                  "Error pulling Patient Access Data\n$baseUrl/access-requests/business/patient/${widget.business!.business_id}",
                  style: TextStyle(
-                      fontSize: 25, color: MihColors.getRedColor(context)),
+                      fontSize: 25,
+                      color: MihColors.getRedColor(
+                          MzansiInnovationHub.of(context)!.theme.mode ==
+                              "Dark")),
                  textAlign: TextAlign.center,
                ),
              );
@@ -121,7 +126,8 @@ class _MyPatientListState extends State<MyPatientList> {
          Icon(
            MihIcons.iDontKnow,
            size: 165,
-            color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+            color: MihColors.getSecondaryColor(
+                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
          ),
          const SizedBox(height: 10),
          Text(
@@ -131,7 +137,8 @@ class _MyPatientListState extends State<MyPatientList> {
            style: TextStyle(
              fontSize: 25,
              fontWeight: FontWeight.bold,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
          ),
        ],
@@ -147,7 +154,8 @@ class _MyPatientListState extends State<MyPatientList> {
            Icon(
              MihIcons.patientProfile,
              size: 165,
-              color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              color: MihColors.getSecondaryColor(
+                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
            ),
            const SizedBox(height: 10),
            Text(
@@ -157,7 +165,8 @@ class _MyPatientListState extends State<MyPatientList> {
              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),
@@ -168,8 +177,8 @@ class _MyPatientListState extends State<MyPatientList> {
                  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 "),
@@ -178,9 +187,9 @@ class _MyPatientListState extends State<MyPatientList> {
                      child: Icon(
                        Icons.search,
                        size: 20,
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .secondaryColor(),
+                        color: MihColors.getSecondaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                    TextSpan(
@@ -201,7 +210,7 @@ class _MyPatientListState extends State<MyPatientList> {
    //       "No Patients matching search",
    //       style: TextStyle(
    //           fontSize: 25,
-    //           color: MzansiInnovationHub.of(context)!.theme.messageTextColor()),
+    //           color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
    //       textAlign: TextAlign.center,
    //     ),
    //   ),
--- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart
+++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart
@@ -82,7 +82,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
                    });
                  }),
              // Divider(
-              //   color: MzansiInnovationHub.of(context)!.theme.secondaryColor(),
+              //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
              // ),
              Row(
                mainAxisSize: MainAxisSize.max,
@@ -106,9 +106,11 @@ class _WaitingRoomState extends State<WaitingRoom> {
                              "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,
                            ),
                          );
@@ -129,15 +131,19 @@ class _WaitingRoomState extends State<WaitingRoom> {
              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();
                  appointmentTypeSelection(width);
@@ -179,7 +185,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
            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(
@@ -189,7 +196,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
              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),
@@ -200,8 +208,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
                  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 "),
@@ -210,9 +218,9 @@ class _WaitingRoomState extends State<WaitingRoom> {
                      child: Icon(
                        Icons.menu,
                        size: 20,
-                        color: MzansiInnovationHub.of(context)!
-                            .theme
-                            .secondaryColor(),
+                        color: MihColors.getSecondaryColor(
+                            MzansiInnovationHub.of(context)!.theme.mode ==
+                                "Dark"),
                      ),
                    ),
                    TextSpan(
@@ -235,7 +243,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
    //         "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,
@@ -269,9 +277,8 @@ class _WaitingRoomState extends State<WaitingRoom> {
                question,
                style: TextStyle(
                    fontSize: 20,
-                    color: MzansiInnovationHub.of(context)!
-                        .theme
-                        .secondaryColor()),
+                    color: MihColors.getSecondaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
                textAlign: TextAlign.left,
              ),
              const SizedBox(height: 15),
@@ -280,13 +287,14 @@ class _WaitingRoomState extends State<WaitingRoom> {
                  widget.onIndexChange(1);
                  Navigator.of(context).pop();
                },
-                buttonColor: MihColors.getGreenColor(context),
+                buttonColor: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                width: 300,
                child: Text(
                  "Existing Patient",
                  style: TextStyle(
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    color: MihColors.getPrimaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    fontSize: 20,
                    fontWeight: FontWeight.bold,
                  ),
@@ -298,13 +306,14 @@ class _WaitingRoomState extends State<WaitingRoom> {
                  widget.onIndexChange(2);
                  Navigator.of(context).pop();
                },
-                buttonColor: MihColors.getGreenColor(context),
+                buttonColor: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                width: 300,
                child: Text(
                  "Existing MIH User",
                  style: TextStyle(
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    color: MihColors.getPrimaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    fontSize: 20,
                    fontWeight: FontWeight.bold,
                  ),
@@ -316,13 +325,14 @@ class _WaitingRoomState extends State<WaitingRoom> {
                  Navigator.pop(context);
                  addAppointmentWindow(width);
                },
-                buttonColor: MihColors.getGreenColor(context),
+                buttonColor: MihColors.getGreenColor(
+                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                width: 300,
                child: Text(
                  "Skeleton Appointment",
                  style: TextStyle(
-                    color:
-                        MzansiInnovationHub.of(context)!.theme.primaryColor(),
+                    color: MihColors.getPrimaryColor(
+                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
                    fontSize: 20,
                    fontWeight: FontWeight.bold,
                  ),
@@ -362,11 +372,12 @@ class _WaitingRoomState extends State<WaitingRoom> {
                  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,
@@ -396,11 +407,12 @@ class _WaitingRoomState extends State<WaitingRoom> {
                    const SizedBox(height: 10),
                    MihTextFormField(
                      height: 250,
-                      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,
                      requiredText: true,
@@ -419,14 +431,16 @@ class _WaitingRoomState extends State<WaitingRoom> {
                            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,
                          ),