Migration to mih_package_toolkit

mih_ui/lib/mih_packages/about_mih/about_mih.dart

@@ -1,7 +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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tools/mih_%20attributes.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tools/mih_info.dart';
@@ -37,11 +35,11 @@ class _AboutMihState extends State<AboutMih> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<AboutMihProvider>().toolIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: getToolTitle(),
+      selectedBodyIndex: context.watch<AboutMihProvider>().toolIndex,
       onIndexChange: (newIndex) {
         context.read<AboutMihProvider>().setToolIndex(newIndex);
       },
@@ -77,7 +75,7 @@ class _AboutMihState extends State<AboutMih> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<AboutMihProvider>().toolIndex,
+      selectedIndex: context.watch<AboutMihProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class PolicyAndTermsText {
   List<Widget> getPrivacyPolicyText(BuildContext context, bool english) {
@@ -40,8 +38,7 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
         ),
       ),
@@ -452,8 +449,7 @@ class PolicyAndTermsText {
         child: FittedBox(
           child: Icon(
             MihIcons.mihLogo,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
         ),
       ),

mih_ui/lib/mih_packages/about_mih/package_tile/about_mih_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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class AboutMihTile extends StatefulWidget {
   final double packageSize;
@@ -29,16 +26,14 @@ class _AboutMihTileState extends State<AboutMihTile> {
         //   arguments: 0,
         // );
       },
-      appName: "About MIH",
-      appIcon: Icon(
+      packageName: "About MIH",
+      packageIcon: Icon(
         MihIcons.aboutMih,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart

@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class MihAttributes extends StatefulWidget {
@@ -33,8 +29,7 @@ class _MihAttributesState extends State<MihAttributes> {
         children: [
           Icon(
             resource,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
             size: 100,
           ),
           const SizedBox(height: 5),
@@ -50,6 +45,7 @@ class _MihAttributesState extends State<MihAttributes> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(),
     );
@@ -71,8 +67,7 @@ class _MihAttributesState extends State<MihAttributes> {
           children: [
             Icon(
               MihIcons.mihLogo,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
               size: 165,
             ),
             const SizedBox(

mih_ui/lib/mih_packages/about_mih/package_tools/mih_info.dart

@@ -1,20 +1,14 @@
 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_objects/profile_link.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_profile_links.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
 import 'package:url_launcher/url_launcher.dart';
 import 'package:redacted/redacted.dart';
@@ -52,8 +46,7 @@ class _MihInfoState extends State<MihInfo> {
               Padding(
                 padding: const EdgeInsets.only(left: 4.0),
                 child: CircleAvatar(
-                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  backgroundColor: MihColors.primary(),
                   backgroundImage: const AssetImage(
                       "lib/mih_package_components/assets/images/founder.jpg"),
                   //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'),
@@ -63,8 +56,7 @@ class _MihInfoState extends State<MihInfo> {
               Icon(
                 MihIcons.mihRing,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ],
           ),
@@ -208,15 +200,13 @@ class _MihInfoState extends State<MihInfo> {
       children: [
         FaIcon(
           platformIcon,
-          color: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.primary(),
         ),
         const SizedBox(width: 10),
         Text(
           btnText,
           style: TextStyle(
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.primary(),
             fontSize: 20,
             fontWeight: FontWeight.bold,
           ),
@@ -267,9 +257,7 @@ class _MihInfoState extends State<MihInfo> {
               redact: isLoading,
               configuration: RedactedConfiguration(
                 defaultBorderRadius: BorderRadius.circular(5),
-                redactedColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-                ),
+                redactedColor: MihColors.secondary(),
               ),
             );
           },
@@ -322,9 +310,7 @@ class _MihInfoState extends State<MihInfo> {
               redact: isLoading,
               configuration: RedactedConfiguration(
                 defaultBorderRadius: BorderRadius.circular(5),
-                redactedColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-                ),
+                redactedColor: MihColors.secondary(),
               ),
             );
           },
@@ -350,8 +336,7 @@ class _MihInfoState extends State<MihInfo> {
       ),
       child: Divider(
         thickness: 1,
-        color: MihColors.getGreyColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        color: MihColors.grey(),
       ),
     );
   }
@@ -364,8 +349,7 @@ class _MihInfoState extends State<MihInfo> {
           child: FittedBox(
             child: Icon(
               MihIcons.mihLogo,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ),
         ),
@@ -450,11 +434,7 @@ class _MihInfoState extends State<MihInfo> {
                             Text(
                               "Please select the platform you want to install/ Update MIH from",
                               style: TextStyle(
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.secondary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -468,29 +448,19 @@ class _MihInfoState extends State<MihInfo> {
                                   ),
                                 );
                               },
-                              buttonColor: MihColors.getGreenColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              buttonColor: MihColors.green(),
                               child: Row(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
                                   FaIcon(
                                     FontAwesomeIcons.googlePlay,
-                                    color: MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.primary(),
                                   ),
                                   const SizedBox(width: 10),
                                   Text(
                                     "Play Store",
                                     style: TextStyle(
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                       fontSize: 20,
                                       fontWeight: FontWeight.bold,
                                     ),
@@ -509,29 +479,19 @@ class _MihInfoState extends State<MihInfo> {
                                   ),
                                 );
                               },
-                              buttonColor: MihColors.getGreenColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              buttonColor: MihColors.green(),
                               child: Row(
                                 mainAxisAlignment: MainAxisAlignment.center,
                                 children: [
                                   FaIcon(
                                     Icons.store,
-                                    color: MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.primary(),
                                   ),
                                   const SizedBox(width: 10),
                                   Text(
                                     "App Gallery",
                                     style: TextStyle(
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                       fontSize: 20,
                                       fontWeight: FontWeight.bold,
                                     ),
@@ -548,8 +508,7 @@ class _MihInfoState extends State<MihInfo> {
                   MihInstallServices().installMihTrigger(context);
                 }
               },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.green(),
               width: 300,
               child: getInstallButtonText(),
             ),
@@ -561,24 +520,20 @@ class _MihInfoState extends State<MihInfo> {
                   ),
                 );
               },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.green(),
               width: 300,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   FaIcon(
                     FontAwesomeIcons.youtube,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
                   const SizedBox(width: 10),
                   Text(
                     "MIH Beginners Guide",
                     style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -594,24 +549,20 @@ class _MihInfoState extends State<MihInfo> {
                   ),
                 );
               },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.green(),
               width: 300,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   FaIcon(
                     FontAwesomeIcons.patreon,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
                   const SizedBox(width: 10),
                   Text(
                     "Support Our Journey",
                     style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -664,25 +615,20 @@ class _MihInfoState extends State<MihInfo> {
                       ),
                     );
                   },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  buttonColor: MihColors.green(),
                   width: 300,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       FaIcon(
                         FontAwesomeIcons.tiktok,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                       const SizedBox(width: 10),
                       Text(
                         "@womenforchange.sa",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -698,25 +644,20 @@ class _MihInfoState extends State<MihInfo> {
                       ),
                     );
                   },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  buttonColor: MihColors.green(),
                   width: 300,
                   child: Row(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: [
                       FaIcon(
                         Icons.edit,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                       const SizedBox(width: 10),
                       Text(
                         "Sign Petition",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -890,6 +831,7 @@ class _MihInfoState extends State<MihInfo> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(),
     );
@@ -925,19 +867,15 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.android,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
                 label: "Android",
-                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: () {
                   shareMIHLink(
                     context,
@@ -949,19 +887,15 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.apple,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
                 label: "iOS",
-                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: () {
                   shareMIHLink(
                     context,
@@ -973,19 +907,15 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.store,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
                 label: "Huawei",
-                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: () {
                   shareMIHLink(
                     context,
@@ -997,19 +927,15 @@ class _MihInfoState extends State<MihInfo> {
               SpeedDialChild(
                 child: Icon(
                   Icons.vpn_lock,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
                 label: "Web",
-                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: () {
                   shareMIHLink(
                     context,

mih_ui/lib/mih_packages/about_mih/package_tools/mih_privacy_policy.dart

@@ -1,8 +1,4 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
 import 'package:flutter/material.dart';
 
@@ -18,6 +14,7 @@ class _MihPrivacyPolicyState extends State<MihPrivacyPolicy> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(context),
     );
@@ -34,14 +31,12 @@ class _MihPrivacyPolicyState extends State<MihPrivacyPolicy> {
                 englishOn = !englishOn;
               });
             },
-            buttonColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            buttonColor: MihColors.green(),
             elevation: 10,
             child: Text(
               englishOn ? "Simplified Chinese" : "English",
               style: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),

mih_ui/lib/mih_packages/about_mih/package_tools/mih_terms_of_service.dart

@@ -1,8 +1,4 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart';
 import 'package:flutter/material.dart';
 
@@ -18,6 +14,7 @@ class _MIHTermsOfServiceState extends State<MIHTermsOfService> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(context),
     );
@@ -34,14 +31,12 @@ class _MIHTermsOfServiceState extends State<MIHTermsOfService> {
                 englishOn = !englishOn;
               });
             },
-            buttonColor: MihColors.getGreenColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            buttonColor: MihColors.green(),
             elevation: 10,
             child: Text(
               englishOn ? "Simplified Chinese" : "English",
               style: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),

mih_ui/lib/mih_packages/access_review/builder/build_access_request_list.dart

@@ -1,10 +1,8 @@
 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_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_objects/access_request.dart';
 import 'package:mzansi_innovation_hub/mih_objects/app_user.dart';
@@ -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,

mih_ui/lib/mih_packages/access_review/builder/build_business_access_list.dart

@@ -1,14 +1,12 @@
 import 'package:flutter/material.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/patient_access.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_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_access_controls_services.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_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:provider/provider.dart';
@@ -58,30 +56,20 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
     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(
@@ -96,7 +84,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       // Text(
       //   subtitle,
       //   style: TextStyle(
-      //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      //     color: MihColors.secondary(),
       //   ),
       // ),
       onTap: () {
@@ -104,7 +92,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
       },
       // trailing: Icon(
       //   Icons.arrow_forward,
-      //   color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      //   color: MihColors.secondary(),
       // ),
     );
   }
@@ -173,8 +161,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                   subtitle,
                   textAlign: TextAlign.left,
                   style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                     fontSize: popUpBodySize,
                     //fontWeight: FontWeight.bold,
                   ),
@@ -191,18 +178,14 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "Important Notice: Approving Profile Access",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                     Text(
                       "You are about to accept access to your patient's profile. Please be aware of the following important points:",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                     SizedBox(
@@ -211,9 +194,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: Once you accepts this access request, it will become permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -223,9 +204,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "2. Shared Information: Any updates make to youe patient profile will be visible to all who have access to the profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -235,9 +214,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "3. Irreversible Access: Once granted, you cannot revoke access to your patient's profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -245,9 +222,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "By pressing the \"Approve\" button you accept the above terms.",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                   ],
@@ -263,18 +238,14 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                       "Important Notice: Approved Profile Access",
                       style: TextStyle(
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                     Text(
                       "You have accepted access to your patient's profile. Please be aware of the following important points:",
                       style: TextStyle(
                         fontWeight: FontWeight.normal,
-                        color: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                     SizedBox(
@@ -283,9 +254,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "1. Permanent Access: This access is permanent.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -295,9 +264,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "2. Shared Information: Any updates make to youe patient profile will be visible to all who have access to the profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -307,9 +274,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                         "3. Irreversible Access: You cannot revoke this access to your patient's profile.",
                         style: TextStyle(
                           fontWeight: FontWeight.normal,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                       ),
                     ),
@@ -355,16 +320,12 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           MihAlertServices().internetConnectionAlert(context);
                         }
                       },
-                      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,
                         ),
@@ -396,16 +357,12 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           MihAlertServices().internetConnectionAlert(context);
                         }
                       },
-                      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,
                         ),
@@ -438,15 +395,13 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
               widget.onSuccessUpate!();
             }
           },
-          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,
             ),
@@ -488,8 +443,7 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: filterAccessList(accessProvider.accessList!).length,

mih_ui/lib/mih_packages/access_review/mih_access.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_access_controlls_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tools/mih_access_requests.dart';
@@ -59,11 +56,11 @@ class _MihAccessState extends State<MihAccess> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: accessProvider.toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: accessProvider.toolIndex,
           onIndexChange: (newValue) {
             accessProvider.setToolIndex(newValue);
           },
@@ -92,7 +89,7 @@ class _MihAccessState extends State<MihAccess> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MihAccessControllsProvider>().toolIndex,
+      selectedIndex: context.watch<MihAccessControllsProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/access_review/package_tile/mih_access_tile.dart

@@ -31,16 +31,14 @@ class _MihAccessTileState extends State<MihAccessTile> {
         //   arguments: widget.signedInUser,
         // );
       },
-      appName: "Access Controls",
-      appIcon: Icon(
+      packageName: "Access Controls",
+      packageIcon: Icon(
         MihIcons.accessControl,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/access_review/package_tools/mih_access_requests.dart

@@ -1,14 +1,12 @@
 import 'package:ken_logger/ken_logger.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/patient_access.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_packages/access_review/builder/build_business_access_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 
@@ -178,6 +176,7 @@ class _MihAccessRequestState extends State<MihAccessRequest> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(),

mih_ui/lib/mih_packages/calculator/mih_calculator.dart

@@ -1,7 +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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tools/currency_exchange_rate.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tools/simple_calc.dart';
@@ -42,11 +40,11 @@ class _MIHCalculatorState extends State<MIHCalculator> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MihCalculatorProvider>().toolIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: getToolTitle(),
+      selectedBodyIndex: context.watch<MihCalculatorProvider>().toolIndex,
       onIndexChange: (newIndex) {
         context.read<MihCalculatorProvider>().setToolIndex(newIndex);
       },
@@ -79,7 +77,7 @@ class _MIHCalculatorState extends State<MIHCalculator> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MihCalculatorProvider>().toolIndex,
+      selectedIndex: context.watch<MihCalculatorProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/calculator/package_tiles/mih_calculator_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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihCalculatorTile extends StatefulWidget {
   final double packageSize;
@@ -26,16 +23,14 @@ class _MihCalculatorTileState extends State<MihCalculatorTile> {
           "mihCalculator",
         );
       },
-      appName: "Calculator",
-      appIcon: Icon(
+      packageName: "Calculator",
+      packageIcon: Icon(
         MihIcons.calculator,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart

@@ -3,17 +3,10 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 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_package_components/mih_banner_ad.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_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_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_calculator_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_currency_exchange_rate_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -76,8 +69,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
             Icon(
               Icons.currency_exchange,
               size: 150,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             const SizedBox(height: 20),
             FittedBox(
@@ -87,8 +79,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
             ),
@@ -103,9 +94,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -117,9 +106,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -136,9 +123,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -150,9 +135,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                     style: TextStyle(
                       fontSize: 30,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -194,8 +177,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               textAlign: TextAlign.center,
               style: TextStyle(
                 fontSize: 25,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontWeight: FontWeight.bold,
               ),
             ),
@@ -215,8 +197,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               '$companyName makes no representations or warranties of any kind, express or implied, as to the accuracy, completeness, reliability, or suitability of the information and calculations generated by the Tool. All exchange rates and results are estimates and are subject to change without notice.',
               style: TextStyle(
                 fontSize: 15,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -227,8 +208,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               'The information provided by the Tool should not be construed as financial, investment, trading, or any other form of advice. You should not make any financial decisions based solely on the output of this Tool. We expressly recommend that you seek independent professional advice and verify all data with a qualified financial advisor and/or through alternative, reliable market data sources before executing any foreign exchange transactions.',
               style: TextStyle(
                 fontSize: 15,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -239,8 +219,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
               'By using the Tool, you agree that $companyName, its affiliates, directors, and employees shall not be held liable for any direct, indirect, incidental, special, consequential, or exemplary damages, including but not limited to, damages for loss of profits, goodwill, use, data, or other intangible losses, resulting from: (i) the use or the inability to use the Tool; (ii) any inaccuracies, errors, or omissions in the Tool\'s calculations or data; or (iii) any reliance placed by you on the information provided by the Tool.',
               style: TextStyle(
                 fontSize: 15,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontWeight: FontWeight.normal,
               ),
             ),
@@ -255,8 +234,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
       text: TextSpan(
         style: TextStyle(
           fontSize: 15,
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
           fontWeight: FontWeight.normal,
         ),
         children: <TextSpan>[
@@ -287,6 +265,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth),
@@ -309,12 +288,8 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                   formKey: _formKey,
                   formFields: <Widget>[
                     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: _fromAmountController,
                       multiLineInput: false,
                       requiredText: true,
@@ -354,9 +329,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                       text: TextSpan(
                         style: TextStyle(
                           fontSize: 15,
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.red(),
                         ),
                         children: [
                           const TextSpan(
@@ -365,9 +338,7 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                             text: "Diclaimer",
                             style: TextStyle(
                               decoration: TextDecoration.underline,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                               fontWeight: FontWeight.bold,
                             ),
                             recognizer: TapGestureRecognizer()
@@ -398,18 +369,12 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                                 MihAlertServices().inputErrorAlert(context);
                               }
                             },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                             width: 300,
                             child: Text(
                               "Calculate",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -419,18 +384,12 @@ class _CurrencyExchangeRateState extends State<CurrencyExchangeRate> {
                             onPressed: () {
                               clearInput();
                             },
-                            buttonColor: MihColors.getRedColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.red(),
                             width: 300,
                             child: Text(
                               "Clear",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),

mih_ui/lib/mih_packages/calculator/package_tools/simple_calc.dart

@@ -1,10 +1,7 @@
+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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:flutter/material.dart';
 import 'package:math_expressions/math_expressions.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class SimpleCalc extends StatefulWidget {
   const SimpleCalc({super.key});
@@ -73,6 +70,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(),
@@ -109,8 +107,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
                 userInput,
                 style: TextStyle(
                   fontSize: 40,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
             ),
@@ -124,8 +121,7 @@ class _SimpleCalcState extends State<SimpleCalc> {
               answer,
               style: TextStyle(
                   fontSize: 30,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontWeight: FontWeight.bold),
             ),
           ),
@@ -160,18 +156,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             answer = '0';
                           });
                         },
-                        buttonColor: MihColors.getPurpleColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.purple(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -190,18 +182,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MihColors.getGreyColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.grey(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -219,18 +207,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput += buttons[index];
                           });
                         },
-                        buttonColor: MihColors.getGreyColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.grey(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -259,18 +243,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             });
                           }
                         },
-                        buttonColor: MihColors.getGreyColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.grey(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -299,17 +279,13 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             equalPressed();
                           });
                         },
-                        buttonColor: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.red(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Icon(
                           Icons.backspace,
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                         ),
                       ),
                     );
@@ -325,18 +301,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             userInput = answer;
                           });
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -355,18 +327,14 @@ class _SimpleCalcState extends State<SimpleCalc> {
                             equalPressed();
                           });
                         },
-                        buttonColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.secondary(),
                         width: 50,
                         height: 50,
                         borderRadius: 5,
                         child: Text(
                           buttons[index],
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),

mih_ui/lib/mih_packages/calculator/package_tools/tip_calc.dart

@@ -1,22 +1,14 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.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_banner_ad.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_validation_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_numeric_stepper.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.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:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:math_expressions/math_expressions.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_toggle.dart';
 import 'package:provider/provider.dart';
 
 class TipCalc extends StatefulWidget {
@@ -111,8 +103,7 @@ class _TipCalcState extends State<TipCalc> {
               children: [
                 FaIcon(
                   FontAwesomeIcons.coins,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -122,8 +113,7 @@ class _TipCalcState extends State<TipCalc> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                 ),
               ],
@@ -134,8 +124,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
             const Divider(),
@@ -145,8 +134,7 @@ class _TipCalcState extends State<TipCalc> {
               children: [
                 FaIcon(
                   FontAwesomeIcons.moneyBills,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   size: 35,
                 ),
                 const SizedBox(width: 15),
@@ -156,8 +144,7 @@ class _TipCalcState extends State<TipCalc> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                 ),
               ],
@@ -168,8 +155,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
             Text(
@@ -178,8 +164,7 @@ class _TipCalcState extends State<TipCalc> {
               style: TextStyle(
                 fontSize: 30,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
             if (splitBillController.text == "Yes") const Divider(),
@@ -190,8 +175,7 @@ class _TipCalcState extends State<TipCalc> {
                 children: [
                   FaIcon(
                     FontAwesomeIcons.peopleGroup,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                     size: 35,
                   ),
                   const SizedBox(width: 15),
@@ -201,9 +185,7 @@ class _TipCalcState extends State<TipCalc> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ],
@@ -215,8 +197,7 @@ class _TipCalcState extends State<TipCalc> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
             if (splitBillController.text == "Yes")
@@ -226,8 +207,7 @@ class _TipCalcState extends State<TipCalc> {
                 style: TextStyle(
                   fontSize: 30,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
             SizedBox(height: 10),
@@ -258,6 +238,7 @@ class _TipCalcState extends State<TipCalc> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth),
@@ -278,10 +259,8 @@ class _TipCalcState extends State<TipCalc> {
               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: billAmountController,
                   multiLineInput: false,
                   requiredText: true,
@@ -293,10 +272,8 @@ class _TipCalcState extends State<TipCalc> {
                 ),
                 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: tipPercentageController,
                   multiLineInput: false,
                   requiredText: true,
@@ -310,10 +287,8 @@ class _TipCalcState extends State<TipCalc> {
                 MihToggle(
                   hintText: "Split Bill",
                   initialPostion: splitPosition,
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  secondaryFillColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  secondaryFillColor: MihColors.primary(),
                   onChange: (value) {
                     setState(() {
                       splitBillController.text = value ? "Yes" : "No";
@@ -350,12 +325,8 @@ class _TipCalcState extends State<TipCalc> {
                         children: [
                           MihNumericStepper(
                             controller: noPeopleController,
-                            fillColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            inputColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            fillColor: MihColors.secondary(),
+                            inputColor: MihColors.primary(),
                             hintText: "No. People",
                             requiredText: temp == "Yes",
                             minValue: 2,
@@ -406,16 +377,12 @@ class _TipCalcState extends State<TipCalc> {
                             MihAlertServices().inputErrorAlert(context);
                           }
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                         width: 300,
                         child: Text(
                           "Calculate",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -425,16 +392,12 @@ class _TipCalcState extends State<TipCalc> {
                         onPressed: () {
                           clearInput();
                         },
-                        buttonColor: MihColors.getRedColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.red(),
                         width: 300,
                         child: Text(
                           "Clear",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),

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,

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,
             ),

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,

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,
     );
   }
 

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(),
     );
   }
 }

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),
     );

mih_ui/lib/mih_packages/mih_authentication/mih_auth_forgot_password.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart';
 
 class MihAuthForgotPassword extends StatefulWidget {
@@ -13,7 +11,7 @@ class MihAuthForgotPassword extends StatefulWidget {
 }
 
 class _MihAuthForgotPasswordState extends State<MihAuthForgotPassword> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
   late final MihForgotPassword _forgotPassword;
 
   @override
@@ -25,14 +23,14 @@ class _MihAuthForgotPasswordState extends State<MihAuthForgotPassword> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appToolTitles: ["Forgot Password"],
-      appBody: getToolBody(),
-      selectedbodyIndex: _selcetedIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolTitles: ["Forgot Password"],
+      packageToolBodies: getToolBody(),
+      selectedBodyIndex: _selectedIndex,
       onIndexChange: (newValue) {
         setState(() {
-          _selcetedIndex = newValue;
+          _selectedIndex = newValue;
         });
       },
     );
@@ -56,12 +54,12 @@ class _MihAuthForgotPasswordState extends State<MihAuthForgotPassword> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.question_mark_rounded)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 

mih_ui/lib/mih_packages/mih_authentication/mih_auth_password_reset.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_reset_password.dart';
 
 class MihAuthPasswordReset extends StatefulWidget {
@@ -18,7 +15,7 @@ class MihAuthPasswordReset extends StatefulWidget {
 }
 
 class _MihAuthPasswordResetState extends State<MihAuthPasswordReset> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
   late final MihResetPassword _resetPassword;
 
   @override
@@ -30,14 +27,14 @@ class _MihAuthPasswordResetState extends State<MihAuthPasswordReset> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: ["Reset Password"],
-      selectedbodyIndex: _selcetedIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: ["Reset Password"],
+      selectedBodyIndex: _selectedIndex,
       onIndexChange: (newValue) {
         setState(() {
-          _selcetedIndex = newValue;
+          _selectedIndex = newValue;
         });
       },
     );
@@ -64,12 +61,12 @@ class _MihAuthPasswordResetState extends State<MihAuthPasswordReset> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.password_rounded)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 

mih_ui/lib/mih_packages/mih_authentication/mih_authentication.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_register.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_authentication/package_tools/mih_sign_in.dart';
@@ -30,11 +27,11 @@ class _MihAuthenticationState extends State<MihAuthentication> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MihAuthenticationProvider>().toolIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: getToolTitle(),
+      selectedBodyIndex: context.watch<MihAuthenticationProvider>().toolIndex,
       onIndexChange: (newIndex) {
         context.read<MihAuthenticationProvider>().setToolIndex(newIndex);
       },
@@ -66,7 +63,7 @@ class _MihAuthenticationState extends State<MihAuthentication> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MihAuthenticationProvider>().toolIndex,
+      selectedIndex: context.watch<MihAuthenticationProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_forgot_password.dart

@@ -1,14 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.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_button.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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_authentication_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -61,14 +55,12 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
             context.pop();
             validateInput();
           },
-          buttonColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.primary(),
           width: 300,
           child: Text(
             "Continue",
             style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -91,14 +83,12 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
               extra: true,
             );
           },
-          buttonColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.primary(),
           width: 300,
           child: Text(
             "Dismiss",
             style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -125,6 +115,7 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -156,8 +147,7 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
               Icon(
                 Icons.lock,
                 size: 100,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               //spacer
               const SizedBox(height: 10),
@@ -167,8 +157,7 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 25),
@@ -176,10 +165,8 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
                 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: emailController,
                     multiLineInput: false,
                     requiredText: true,
@@ -200,16 +187,12 @@ class _MihForgotPasswordState extends State<MihForgotPassword> {
                           MihAlertServices().inputErrorAlert(context);
                         }
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 300,
                       child: Text(
                         "Reset Password",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),

mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_register.dart

@@ -3,16 +3,10 @@ import 'dart:convert';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.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_button.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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
@@ -163,14 +157,12 @@ class _MihRegisterState extends State<MihRegister> {
           onPressed: () {
             Navigator.of(context).pop();
           },
-          buttonColor: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.secondary(),
           width: 200,
           child: Text(
             "Dismiss",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 18,
               fontWeight: FontWeight.bold,
             ),
@@ -185,6 +177,7 @@ class _MihRegisterState extends State<MihRegister> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -218,8 +211,7 @@ class _MihRegisterState extends State<MihRegister> {
               Icon(
                 Icons.lock,
                 size: 100,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               //spacer
               const SizedBox(height: 10),
@@ -229,8 +221,7 @@ class _MihRegisterState extends State<MihRegister> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               //spacer
@@ -240,10 +231,8 @@ class _MihRegisterState extends State<MihRegister> {
                 formFields: [
                   //email input
                   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: emailController,
                     multiLineInput: false,
                     requiredText: true,
@@ -257,10 +246,8 @@ class _MihRegisterState extends State<MihRegister> {
                   const SizedBox(height: 10),
                   //password input
                   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: passwordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -274,10 +261,8 @@ class _MihRegisterState extends State<MihRegister> {
                   //spacer
                   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: confirmPasswordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -306,16 +291,12 @@ class _MihRegisterState extends State<MihRegister> {
                               MihAlertServices().inputErrorAlert(context);
                             }
                           },
-                          buttonColor: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.green(),
                           width: 300,
                           child: Text(
                             "Create New Account",
                             style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -327,16 +308,12 @@ class _MihRegisterState extends State<MihRegister> {
                                 .read<MihAuthenticationProvider>()
                                 .setToolIndex(0);
                           },
-                          buttonColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.secondary(),
                           width: 300,
                           child: Text(
                             "I have an account",
                             style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),

mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_reset_password.dart

@@ -1,14 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.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_button.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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_authentication_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -63,15 +57,13 @@ class _MihResetPasswordState extends State<MihResetPassword> {
               extra: true,
             );
           },
-          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,
             ),
@@ -86,6 +78,7 @@ class _MihResetPasswordState extends State<MihResetPassword> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -120,8 +113,7 @@ class _MihResetPasswordState extends State<MihResetPassword> {
               Icon(
                 Icons.lock,
                 size: 100,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               //spacer
               const SizedBox(height: 10),
@@ -131,8 +123,7 @@ class _MihResetPasswordState extends State<MihResetPassword> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               //spacer
@@ -141,10 +132,8 @@ class _MihResetPasswordState extends State<MihResetPassword> {
                 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: passwordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -158,10 +147,8 @@ class _MihResetPasswordState extends State<MihResetPassword> {
                   //spacer
                   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: confirmPasswordController,
                     multiLineInput: false,
                     requiredText: true,
@@ -184,16 +171,12 @@ class _MihResetPasswordState extends State<MihResetPassword> {
                           MihAlertServices().inputErrorAlert(context);
                         }
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 300,
                       child: Text(
                         "Reset Password",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),

mih_ui/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart

@@ -1,16 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.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_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart';
@@ -80,15 +74,15 @@ class _MihSignInState extends State<MihSignIn> {
           MihAlertServices().inputErrorAlert(context);
         }
       },
-      appName: "Patient",
-      appIcon: Icon(
+      packageName: "Patient",
+      packageIcon: Icon(
         Icons.perm_identity_rounded,
         color: getPrim(),
         size: 200,
       ),
       iconSize: 200,
       textColor: getPrim(),
-      authenticateUser: false,
+      // authenticateUser: false,
     ));
     tileList.add(MihPackageTile(
       onTap: () {
@@ -102,15 +96,15 @@ class _MihSignInState extends State<MihSignIn> {
           MihAlertServices().inputErrorAlert(context);
         }
       },
-      appName: "Doctor",
-      appIcon: Icon(
+      packageName: "Doctor",
+      packageIcon: Icon(
         Icons.medical_services,
         color: getPrim(),
         size: 200,
       ),
       iconSize: 200,
       textColor: getPrim(),
-      authenticateUser: false,
+      // authenticateUser: false,
     ));
     //if (AppEnviroment.getEnv() == "Dev") {
     tileList.add(MihPackageTile(
@@ -125,15 +119,15 @@ class _MihSignInState extends State<MihSignIn> {
           MihAlertServices().inputErrorAlert(context);
         }
       },
-      appName: "Business",
-      appIcon: Icon(
+      packageName: "Business",
+      packageIcon: Icon(
         Icons.business,
         color: getPrim(),
         size: 200,
       ),
       iconSize: 200,
       textColor: getPrim(),
-      authenticateUser: false,
+      // authenticateUser: false,
     ));
     tileList.add(MihPackageTile(
       onTap: () {
@@ -147,27 +141,25 @@ class _MihSignInState extends State<MihSignIn> {
           MihAlertServices().inputErrorAlert(context);
         }
       },
-      appName: "Test",
-      appIcon: Icon(
+      packageName: "Test",
+      packageIcon: Icon(
         Icons.warning_amber_rounded,
         color: getPrim(),
         size: 200,
       ),
       iconSize: 200,
       textColor: getPrim(),
-      authenticateUser: false,
+      // authenticateUser: false,
     ));
     //}
   }
 
   Color getPrim() {
-    return MihColors.getSecondaryColor(
-        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+    return MihColors.secondary();
   }
 
   Color getSec() {
-    return MihColors.getPrimaryColor(
-        MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+    return MihColors.primary();
   }
 
   @override
@@ -182,6 +174,7 @@ class _MihSignInState extends State<MihSignIn> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -228,16 +221,12 @@ class _MihSignInState extends State<MihSignIn> {
                           onPressed: () {
                             MihInstallServices().installMihTrigger(context);
                           },
-                          buttonColor: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.green(),
                           width: 150,
                           child: Text(
                             "Install MIH",
                             style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -251,8 +240,7 @@ class _MihSignInState extends State<MihSignIn> {
                 Icon(
                   Icons.lock,
                   size: 100,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
                 //spacer
                 const SizedBox(height: 10),
@@ -262,8 +250,7 @@ class _MihSignInState extends State<MihSignIn> {
                   style: TextStyle(
                     fontSize: 25,
                     fontWeight: FontWeight.bold,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                 ),
                 //spacer
@@ -272,12 +259,8 @@ class _MihSignInState extends State<MihSignIn> {
                   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: emailController,
                       multiLineInput: false,
                       requiredText: true,
@@ -291,12 +274,8 @@ class _MihSignInState extends State<MihSignIn> {
                     const SizedBox(height: 10),
                     //password input
                     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: passwordController,
                       multiLineInput: false,
                       requiredText: true,
@@ -328,11 +307,7 @@ class _MihSignInState extends State<MihSignIn> {
                               'Forgot Password?',
                               style: TextStyle(
                                 fontSize: 15,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.secondary(),
                                 fontWeight: FontWeight.bold,
                               ),
                             ),
@@ -359,18 +334,12 @@ class _MihSignInState extends State<MihSignIn> {
                                 MihAlertServices().inputErrorAlert(context);
                               }
                             },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                             width: 300,
                             child: Text(
                               "Sign In",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -382,18 +351,12 @@ class _MihSignInState extends State<MihSignIn> {
                                   .read<MihAuthenticationProvider>()
                                   .setToolIndex(1);
                             },
-                            buttonColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.secondary(),
                             width: 300,
                             child: Text(
                               "Create New Account",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -430,11 +393,7 @@ class _MihSignInState extends State<MihSignIn> {
                                     style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         fontSize: 15,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark")),
+                                        color: MihColors.secondary()),
                                   ),
                                   onTap: () {
                                     setState(() {
@@ -481,11 +440,7 @@ class _MihSignInState extends State<MihSignIn> {
                                 "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.",
                                 textAlign: TextAlign.center,
                                 style: TextStyle(
-                                  color: MihColors.getRedColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
+                                  color: MihColors.red(),
                                   fontSize: 15.0,
                                   fontWeight: FontWeight.bold,
                                 ),

mih_ui/lib/mih_packages/mih_file_viewer/components/mih_print_prevew.dart

@@ -1,9 +1,8 @@
 import 'package:flutter/material.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/arguments.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_action.dart';
 import 'package:pdf/pdf.dart';
 import 'package:printing/printing.dart';
-import '../../../mih_package_components/mih_loading_circle.dart';
 
 class MIHPrintPreview extends StatefulWidget {
   final PrintPreviewArguments arguments;

mih_ui/lib/mih_packages/mih_file_viewer/mih_fle_viewer.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_file_viewer_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart';
 import 'package:provider/provider.dart';
@@ -21,11 +19,11 @@ class _MihFleViewerState extends State<MihFleViewer> {
       builder: (BuildContext context, MihFileViewerProvider fileViewerProvider,
           Widget? child) {
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: fileViewerProvider.toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: fileViewerProvider.toolIndex,
           onIndexChange: (newIndex) {
             fileViewerProvider.setToolIndex(newIndex);
           },
@@ -59,7 +57,7 @@ class _MihFleViewerState extends State<MihFleViewer> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MihFileViewerProvider>().toolIndex,
+      selectedIndex: context.watch<MihFileViewerProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mih_file_viewer/package_tools/mih_expanded_file_view.dart

@@ -2,11 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.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_file_viewer_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 import 'package:syncfusion_flutter_core/theme.dart';
 import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart';
@@ -56,6 +53,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
     double width = size.width;
     double height = size.height;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width, height),
     );
@@ -75,9 +73,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                     height: height - 70,
                     child: SfPdfViewerTheme(
                       data: SfPdfViewerThemeData(
-                        backgroundColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        backgroundColor: MihColors.primary(),
                       ),
                       child: SfPdfViewer.network(
                         fileViewerProvider.fileLink,
@@ -111,8 +107,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                 child: Material(
                   elevation: 10,
                   shadowColor: Colors.black,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   borderRadius: BorderRadius.circular(25.0),
                   child: Container(
                     decoration: BoxDecoration(
@@ -138,9 +133,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                             },
                             icon: Icon(
                               Icons.arrow_back,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                           ),
                         if (isPDF)
@@ -149,9 +142,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                             style: TextStyle(
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                           ),
                         if (isPDF)
@@ -169,9 +160,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                             },
                             icon: Icon(
                               Icons.arrow_forward,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                           ),
                         if (isPDF)
@@ -194,9 +183,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                             },
                             icon: Icon(
                               Icons.zoom_in,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                           ),
                         if (isPDF)
@@ -221,9 +208,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                             },
                             icon: Icon(
                               Icons.zoom_out,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                           ),
                         // IconButton(
@@ -234,7 +219,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                         //   },
                         //   icon: Icon(
                         //     Icons.print,
-                        //     color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                        //     color: MihColors.secondary(),
                         //   ),
                         // ),
                         IconButton(
@@ -252,9 +237,7 @@ class _MihExpandedFileViewState extends State<MihExpandedFileView> {
                           },
                           icon: Icon(
                             Icons.download,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                           ),
                         ),
                       ],

mih_ui/lib/mih_packages/mih_home/components/mih_app_drawer.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/about_mih_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_access_controlls_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_authentication_provider.dart';
@@ -14,9 +14,7 @@ import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.da
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
-import '../../../main.dart';
 import 'package:supertokens_flutter/supertokens.dart';
 
 class MIHAppDrawer extends StatefulWidget {
@@ -83,10 +81,8 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
         fileNameController: proPicController,
         onChange: (_) {},
         userSelectedfile: null,
-        frameColor: MihColors.getPrimaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-        backgroundColor: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        frameColor: MihColors.primary(),
+        backgroundColor: MihColors.secondary(),
       ),
     );
   }
@@ -111,7 +107,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
           MzansiProfileProvider mzansiProfileProvider, Widget? child) {
         return SafeArea(
           child: Drawer(
-            //backgroundColor:  MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            //backgroundColor:  MihColors.primary(),
             child: LayoutBuilder(
               builder: (BuildContext context, BoxConstraints constraints) {
                 return Stack(
@@ -124,9 +120,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                       children: [
                         DrawerHeader(
                           decoration: BoxDecoration(
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                           child: SizedBox(
                             // height: 300,
@@ -143,11 +137,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                         "Setup Business",
                                     style: TextStyle(
                                       fontWeight: FontWeight.bold,
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                     ),
                                   ),
                                 ),
@@ -157,11 +147,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                     "${mzansiProfileProvider.user!.fname} ${mzansiProfileProvider.user!.lname}",
                                     style: TextStyle(
                                       fontWeight: FontWeight.bold,
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                     ),
                                   ),
                                 ),
@@ -172,11 +158,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                     style: TextStyle(
                                       fontSize: 12,
                                       fontWeight: FontWeight.bold,
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                     ),
                                   ),
                                 ),
@@ -187,11 +169,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                     style: TextStyle(
                                       fontSize: 12,
                                       fontWeight: FontWeight.bold,
-                                      color: MihColors.getPrimaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.primary(),
                                     ),
                                   ),
                                 ),
@@ -201,11 +179,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   style: TextStyle(
                                     fontSize: 10,
                                     fontWeight: FontWeight.bold,
-                                    color: MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.primary(),
                                   ),
                                 ),
                               ],
@@ -219,7 +193,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                         //       Icon(
                         //         Icons.home_outlined,
                         //         color:
-                        //             MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                        //             MihColors.secondary(),
                         //       ),
                         //       const SizedBox(width: 25.0),
                         //       Text(
@@ -249,22 +223,14 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   children: [
                                     Icon(
                                       Icons.policy,
-                                      color: MihColors.getSecondaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.secondary(),
                                     ),
                                     const SizedBox(width: 25.0),
                                     Text(
                                       "Privacy Policy",
                                       style: TextStyle(
                                         //fontWeight: FontWeight.bold,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
+                                        color: MihColors.secondary(),
                                       ),
                                     ),
                                   ],
@@ -288,22 +254,14 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   children: [
                                     Icon(
                                       Icons.design_services_rounded,
-                                      color: MihColors.getSecondaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.secondary(),
                                     ),
                                     const SizedBox(width: 25.0),
                                     Text(
                                       "Terms of Service",
                                       style: TextStyle(
                                         //fontWeight: FontWeight.bold,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
+                                        color: MihColors.secondary(),
                                       ),
                                     ),
                                   ],
@@ -327,22 +285,14 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                                   children: [
                                     Icon(
                                       Icons.logout,
-                                      color: MihColors.getSecondaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.secondary(),
                                     ),
                                     const SizedBox(width: 25.0),
                                     Text(
                                       "Sign Out",
                                       style: TextStyle(
                                         //fontWeight: FontWeight.bold,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
+                                        color: MihColors.secondary(),
                                       ),
                                     ),
                                   ],
@@ -395,9 +345,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                         },
                         child: Icon(
                           MihIcons.mihLogo,
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                         ),
                       ),
                       // IconButton(
@@ -417,7 +365,7 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
                       //   },
                       //   icon: Icon(
                       //     Icons.light_mode,
-                      //     color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      //     color: MihColors.primary(),
                       //     size: 35,
                       //   ),
                       // ),

mih_ui/lib/mih_packages/mih_home/mih_home.dart

@@ -143,8 +143,8 @@ class _MihHomeState extends State<MihHome> {
                 Icon(
                   Icons.policy,
                   size: 150,
-                  color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark",
+                  color: MihColors.secondary(
+                    ,
                   ),
                 ),
                 const SizedBox(height: 10),
@@ -152,8 +152,8 @@ class _MihHomeState extends State<MihHome> {
                   "Welcome to the MIH App",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark",
+                    color: MihColors.secondary(
+                      ,
                     ),
                     fontSize: 30,
                     fontWeight: FontWeight.bold,
@@ -164,8 +164,8 @@ class _MihHomeState extends State<MihHome> {
                   "To keep using the MIH app, please take a moment to review and accept our Policies. Our agreements helps us keep things running smoothly and securely.",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark",
+                    color: MihColors.secondary(
+                      ,
                     ),
                     fontSize: 18,
                     fontWeight: FontWeight.normal,
@@ -189,17 +189,15 @@ class _MihHomeState extends State<MihHome> {
                           context.goNamed("aboutMih",
                               extra: mzansiProfileProvider.personalHome);
                         },
-                        buttonColor: MihColors.getOrangeColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.orange(
+                            ),
                         elevation: 10,
                         width: 300,
                         child: Text(
                           "Privacy Policy",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(
+                                ),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -214,17 +212,15 @@ class _MihHomeState extends State<MihHome> {
                           context.goNamed("aboutMih",
                               extra: mzansiProfileProvider.personalHome);
                         },
-                        buttonColor: MihColors.getYellowColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.yellow(
+                            ),
                         elevation: 10,
                         width: 300,
                         child: Text(
                           "Terms of Service",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(
+                                ),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -236,17 +232,15 @@ class _MihHomeState extends State<MihHome> {
                           KenLogger.success("Date Time Now: $now");
                           createOrUpdateAccpetance(mzansiProfileProvider);
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(
+                            ),
                         elevation: 10,
                         width: 300,
                         child: Text(
                           "Accept",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(
+                                ),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -308,13 +302,13 @@ class _MihHomeState extends State<MihHome> {
                 child: SizedBox(
                   height: MediaQuery.of(context).size.height,
                   child: MihPackage(
-                    appActionButton: getAction(),
-                    appTools: getTools(mzansiProfileProvider,
+                    packageActionButton: getAction(),
+                    packageTools: getTools(mzansiProfileProvider,
                         mzansiProfileProvider.user!.type != "personal"),
-                    appBody: getToolBody(mzansiProfileProvider),
-                    appToolTitles: getToolTitle(),
+                    packageToolBodies: getToolBody(mzansiProfileProvider),
+                    packageToolTitles: getToolTitle(),
                     actionDrawer: getActionDrawer(),
-                    selectedbodyIndex:
+                    selectedBodyIndex:
                         mzansiProfileProvider.personalHome ? 0 : 1,
                     onIndexChange: (newValue) {
                       mzansiProfileProvider.setPersonalHome(newValue == 0);
@@ -358,10 +352,10 @@ class _MihHomeState extends State<MihHome> {
                 fileNameController: null,
                 userSelectedfile: null,
                 // frameColor: frameColor,
-                frameColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                backgroundColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                frameColor: MihColors.secondary(
+                    ),
+                backgroundColor: MihColors.primary(
+                    ),
                 onChange: (_) {},
               ),
             ),
@@ -395,7 +389,7 @@ class _MihHomeState extends State<MihHome> {
     }
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: mzansiProfileProvider.personalHome ? 0 : 1,
+      selectedIndex: mzansiProfileProvider.personalHome ? 0 : 1,
     );
   }
 

mih_ui/lib/mih_packages/mih_home/mih_home_error.dart

@@ -1,12 +1,7 @@
 import 'package:flutter/material.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_button.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_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihHomeError extends StatefulWidget {
   final String errorMessage;
@@ -20,21 +15,21 @@ class MihHomeError extends StatefulWidget {
 }
 
 class _MihHomeErrorState extends State<MihHomeError> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
 
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getErrorAction(),
-      appTools: getErrorTools(),
-      appToolTitles: ["Connection Error"],
-      appBody: getErrorToolBody(widget.errorMessage),
-      selectedbodyIndex: _selcetedIndex,
+      packageActionButton: getErrorAction(),
+      packageTools: getErrorTools(),
+      packageToolTitles: ["Connection Error"],
+      packageToolBodies: getErrorToolBody(widget.errorMessage),
+      selectedBodyIndex: _selectedIndex,
       onIndexChange: (newValue) {
         setState(() {
-          _selcetedIndex = newValue;
+          _selectedIndex = newValue;
         });
-        //print("Index: $_selcetedIndex");
+        //print("Index: $_selectedIndex");
       },
     );
   }
@@ -56,18 +51,19 @@ class _MihHomeErrorState extends State<MihHomeError> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.power_off_outlined)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 
   List<Widget> getErrorToolBody(String error) {
     List<Widget> toolBodies = [
       MihPackageToolBody(
+        backgroundColor: MihColors.primary(),
         borderOn: true,
         bodyItem: Column(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -76,8 +72,7 @@ class _MihHomeErrorState extends State<MihHomeError> {
               "Connection Error",
               textAlign: TextAlign.center,
               style: TextStyle(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontSize: 35,
                 fontWeight: FontWeight.bold,
               ),
@@ -85,8 +80,7 @@ class _MihHomeErrorState extends State<MihHomeError> {
             Icon(
               Icons.power_off_outlined,
               size: 150,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             SizedBox(
               width: 500,
@@ -94,8 +88,7 @@ class _MihHomeErrorState extends State<MihHomeError> {
                 "Looks like we ran into an issue getting your data.\nPlease check you internet connection and try again.",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -109,14 +102,12 @@ class _MihHomeErrorState extends State<MihHomeError> {
                   extra: true,
                 );
               },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.green(),
               width: 300,
               child: Text(
                 "Refresh",
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -132,9 +123,7 @@ class _MihHomeErrorState extends State<MihHomeError> {
                     "Error: $error",
                     textAlign: TextAlign.left,
                     style: TextStyle(
-                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.red(),
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),

mih_ui/lib/mih_packages/mih_home/mih_route_error.dart

@@ -1,13 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.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_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tools.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class MihRouteError extends StatefulWidget {
   const MihRouteError({
@@ -19,21 +12,21 @@ class MihRouteError extends StatefulWidget {
 }
 
 class _MihRouteErrorState extends State<MihRouteError> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
 
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getErrorAction(),
-      appTools: getErrorTools(),
-      appToolTitles: ["Invalid Path"],
-      appBody: getErrorToolBody(),
-      selectedbodyIndex: _selcetedIndex,
+      packageActionButton: getErrorAction(),
+      packageTools: getErrorTools(),
+      packageToolTitles: ["Invalid Path"],
+      packageToolBodies: getErrorToolBody(),
+      selectedBodyIndex: _selectedIndex,
       onIndexChange: (newValue) {
         setState(() {
-          _selcetedIndex = newValue;
+          _selectedIndex = newValue;
         });
-        //print("Index: $_selcetedIndex");
+        //print("Index: $_selectedIndex");
       },
     );
   }
@@ -55,18 +48,19 @@ class _MihRouteErrorState extends State<MihRouteError> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.link_off_rounded)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 
   List<Widget> getErrorToolBody() {
     List<Widget> toolBodies = [
       MihPackageToolBody(
+        backgroundColor: MihColors.primary(),
         borderOn: true,
         bodyItem: Column(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -75,8 +69,7 @@ class _MihRouteErrorState extends State<MihRouteError> {
               "Oops! Wrong Turn.",
               textAlign: TextAlign.center,
               style: TextStyle(
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 fontSize: 35,
                 fontWeight: FontWeight.bold,
               ),
@@ -84,8 +77,7 @@ class _MihRouteErrorState extends State<MihRouteError> {
             Icon(
               Icons.link_off_rounded,
               size: 150,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             SizedBox(
               width: 700,
@@ -93,8 +85,7 @@ class _MihRouteErrorState extends State<MihRouteError> {
                 "It looks like you've taken a wrong turn and ended up on a package that doesn't exist within the MIH App.\n\nDon't worry, getting back is easy. Just click the button below or the MIH Logo to return to the correct path.",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontSize: 20,
                   fontWeight: FontWeight.w500,
                 ),
@@ -108,14 +99,12 @@ class _MihRouteErrorState extends State<MihRouteError> {
                   extra: true,
                 );
               },
-              buttonColor: MihColors.getGreenColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.green(),
               width: 300,
               child: Text(
                 "Back to MIH",
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -131,7 +120,7 @@ class _MihRouteErrorState extends State<MihRouteError> {
             //         "Error: $error",
             //         textAlign: TextAlign.left,
             //         style: TextStyle(
-            //           color: MihColors.getRedColor(
+            //           color: MihColors.red(
             //               MzansiInnovationHub.of(context)!.theme.mode ==
             //                   "Dark"),
             //           fontSize: 15,

mih_ui/lib/mih_packages/mih_home/package_tools/mih_business_home.dart

@@ -1,12 +1,9 @@
 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_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_objects/arguments.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_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_packages/about_mih/package_tile/about_mih_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart';
@@ -191,6 +188,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
     final double width = size.width;
     final double height = size.height;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width, height),
     );
@@ -213,10 +211,8 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                   hintText: "Ask Mzansi",
                   prefixIcon: Icons.search,
                   prefixAltIcon: MihIcons.mzansiAi,
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  hintColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  hintColor: MihColors.primary(),
                   onPrefixIconTap: () {
                     mzansiAiProvider.ollamaProvider.resetChat();
                     if (searchController.text.isNotEmpty) {
@@ -262,9 +258,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                         Icon(
                           MihIcons.mzansiAi,
                           size: 165,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                         const SizedBox(height: 10),
                         Text(
@@ -274,9 +268,7 @@ class _MihBusinessHomeState extends State<MihBusinessHome>
                           style: TextStyle(
                             fontSize: 25,
                             fontWeight: FontWeight.bold,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                         ),
                       ],

mih_ui/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart

@@ -1,12 +1,9 @@
 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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/Example/package_tiles/test_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/about_mih/package_tile/about_mih_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/access_review/package_tile/mih_access_tile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/calculator/package_tiles/mih_calculator_tile.dart';
@@ -213,6 +210,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
     final double height = size.height;
 
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width, height),
     );
@@ -233,10 +231,8 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                   hintText: "Ask Mzansi",
                   prefixIcon: Icons.search,
                   prefixAltIcon: MihIcons.mzansiAi,
-                  fillColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  hintColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  fillColor: MihColors.secondary(),
+                  hintColor: MihColors.primary(),
                   onPrefixIconTap: () {
                     mzansiAiProvider.ollamaProvider.resetChat();
                     if (searchController.text.isNotEmpty) {
@@ -282,9 +278,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                         Icon(
                           MihIcons.mzansiAi,
                           size: 165,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                         const SizedBox(height: 10),
                         Text(
@@ -294,9 +288,7 @@ class _MihPersonalHomeState extends State<MihPersonalHome>
                           style: TextStyle(
                             fontSize: 25,
                             fontWeight: FontWeight.bold,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                         ),
                       ],

mih_ui/lib/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart

@@ -1,11 +1,9 @@
 import 'package:cached_network_image/cached_network_image.dart';
 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_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_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:provider/provider.dart';
 
 class BuildMinesweeperLeaderboardList extends StatefulWidget {
@@ -21,17 +19,13 @@ class _BuildMinesweeperLeaderboardListState
   Color getMedalColor(int index) {
     switch (index) {
       case (0):
-        return MihColors.getGoldColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.gold();
       case (1):
-        return MihColors.getSilverColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.silver();
       case (2):
-        return MihColors.getBronze(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.bronze();
       default:
-        return MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.secondary();
     }
   }
 
@@ -44,8 +38,7 @@ class _BuildMinesweeperLeaderboardListState
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: mineSweeperProvider.leaderboard!.length,
@@ -84,21 +77,13 @@ class _BuildMinesweeperLeaderboardListState
                             ? Icon(
                                 MihIcons.mihRing,
                                 size: 80,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.secondary(),
                               )
                             : imageFile == null
                                 ? Icon(
                                     MihIcons.iDontKnow,
                                     size: 80,
-                                    color: MihColors.getSecondaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.secondary(),
                                   )
                                 : MihCircleAvatar(
                                     key: UniqueKey(),
@@ -109,11 +94,7 @@ class _BuildMinesweeperLeaderboardListState
                                     fileNameController: null,
                                     userSelectedfile: null,
                                     frameColor: getMedalColor(index),
-                                    backgroundColor: MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    backgroundColor: MihColors.primary(),
                                     onChange: () {},
                                   ),
                         const SizedBox(width: 10),

mih_ui/lib/mih_packages/mine_sweeper/builders/build_my_scoreboard_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_providers/mih_mine_sweeper_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:provider/provider.dart';
 
 class BuildMyScoreBoardList extends StatefulWidget {
@@ -18,17 +17,13 @@ class _BuildMinesweeperLeaderboardListState
   Color getMedalColor(int index) {
     switch (index) {
       case (0):
-        return MihColors.getGoldColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.gold();
       case (1):
-        return MihColors.getSilverColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.silver();
       case (2):
-        return MihColors.getBronze(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.bronze();
       default:
-        return MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+        return MihColors.secondary();
     }
   }
 
@@ -41,8 +36,7 @@ class _BuildMinesweeperLeaderboardListState
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: mineSweeperProvider.myScoreboard!.length,

mih_ui/lib/mih_packages/mine_sweeper/components/leaderboard_user_ranking.dart

@@ -1,8 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:redacted/redacted.dart';
 
 class LeaderboardUserRanking extends StatelessWidget {
@@ -54,10 +53,8 @@ class LeaderboardUserRanking extends StatelessWidget {
                 editable: false,
                 fileNameController: null,
                 userSelectedfile: null,
-                frameColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                backgroundColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                frameColor: MihColors.secondary(),
+                backgroundColor: MihColors.primary(),
                 onChange: () {},
               ),
             ],
@@ -67,16 +64,14 @@ class LeaderboardUserRanking extends StatelessWidget {
             style: TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ).redacted(context: context, redact: isLoading),
           subtitle: Text(
             "Score: $gameScore\nTime: $gameTime",
             style: TextStyle(
               fontSize: 18,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ).redacted(context: context, redact: isLoading),
         );

mih_ui/lib/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart

@@ -1,12 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 
 class MihMineSweeperStartGameWindow extends StatefulWidget {
@@ -132,9 +127,7 @@ class _MihMineSweeperStartGameWindowState
                   Text(
                     getModeConfig(),
                     style: TextStyle(
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -147,16 +140,12 @@ class _MihMineSweeperStartGameWindowState
                         context.pop();
                         widget.onPressed?.call();
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 300,
                       child: Text(
                         "Start Game",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),

mih_ui/lib/mih_packages/mine_sweeper/components/mine_tile.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/board_square.dart';
 
 class MineTile extends StatelessWidget {
@@ -21,9 +19,7 @@ class MineTile extends StatelessWidget {
     if (square.isFlagged) {
       return Icon(
         Icons.flag,
-        color: MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        ),
+        color: MihColors.red(),
       );
     }
 
@@ -56,33 +52,23 @@ class MineTile extends StatelessWidget {
     // Choose colors based on standard Minesweeper appearance
     switch (bombsAround) {
       case 1:
-        return MihColors.getBluishPurpleColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.bluishPurple();
       // return Colors.blue;
       case 2:
-        return MihColors.getGreenColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.green();
       // return Colors.green;
       case 3:
-        return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.red();
       // return Colors.red;
       case 4:
-        return MihColors.getPurpleColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.purple();
       // return Colors.purple;
       case 5:
-        return MihColors.getOrangeColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.orange();
       // return Colors.brown;
       default:
-        // return MihColors.getBluishPurpleColor(
-        //   MzansiInnovationHub.of(context)!.theme.mode == "Dark",
+        // return MihColors.bluishPurple(
+        //   ,
         // );
         return Colors.black;
     }
@@ -95,13 +81,7 @@ class MineTile extends StatelessWidget {
       child: MihButton(
         onPressed: onTap,
         onLongPressed: onLongPress,
-        buttonColor: square.isOpened
-            ? MihColors.getGreyColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-              )
-            : MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-              ),
+        buttonColor: square.isOpened ? MihColors.grey() : MihColors.secondary(),
         width: 50,
         height: 50,
         borderRadius: 3,

mih_ui/lib/mih_packages/mine_sweeper/mih_mine_sweeper.dart

@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 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_banner_ad_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
@@ -70,11 +67,11 @@ class _MihMineSweeperState extends State<MihMineSweeper> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appToolTitles: getToolTitle(),
-          appBody: getToolBody(),
-          selectedbodyIndex: context.watch<MihMineSweeperProvider>().toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolTitles: getToolTitle(),
+          packageToolBodies: getToolBody(),
+          selectedBodyIndex: context.watch<MihMineSweeperProvider>().toolIndex,
           onIndexChange: (newIndex) {
             context.read<MihMineSweeperProvider>().setToolIndex(newIndex);
           },
@@ -116,7 +113,7 @@ class _MihMineSweeperState extends State<MihMineSweeper> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MihMineSweeperProvider>().toolIndex,
+      selectedIndex: context.watch<MihMineSweeperProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mine_sweeper/package_tiles/mih_mine_sweeper_tile.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class MihMineSweeperTile extends StatefulWidget {
   final double packageSize;
@@ -25,16 +22,14 @@ class _MihMineSweeperTileState extends State<MihMineSweeperTile> {
           "mihMinesweeper",
         );
       },
-      appName: "Minesweeper",
-      appIcon: Icon(
+      packageName: "Minesweeper",
+      packageIcon: Icon(
         MihIcons.mineSweeper,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mine_sweeper/package_tools/mih_mine_sweeper_leader_board.dart

@@ -1,13 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.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_mine_sweeper_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/builders/build_minesweeper_leaderboard_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_minesweeper_services.dart';
@@ -74,6 +69,7 @@ class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
             refreshLeaderBoard(mineSweeperProvider, filterController.text);
           },
           child: MihPackageToolBody(
+            backgroundColor: MihColors.primary(),
             borderOn: false,
             bodyItem: getBody(width),
           ),
@@ -136,9 +132,7 @@ class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
                           Icon(
                             MihIcons.mineSweeper,
                             size: 165,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                           const SizedBox(height: 10),
                           Text(
@@ -148,9 +142,7 @@ class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                             ),
                           ),
                           const SizedBox(height: 25),
@@ -161,11 +153,7 @@ class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
                                 style: TextStyle(
                                   fontSize: 20,
                                   fontWeight: FontWeight.normal,
-                                  color: MihColors.getSecondaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
+                                  color: MihColors.secondary(),
                                 ),
                                 children: [
                                   TextSpan(text: "Press "),
@@ -174,11 +162,7 @@ class _MihMineSweeperLeaderBoardState extends State<MihMineSweeperLeaderBoard> {
                                     child: Icon(
                                       FontAwesomeIcons.bomb,
                                       size: 20,
-                                      color: MihColors.getSecondaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.secondary(),
                                     ),
                                   ),
                                   TextSpan(text: " and start a new game"),

mih_ui/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_game.dart

@@ -6,18 +6,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_banner_ad.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_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_packages/mine_sweeper/components/board_square.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/mih_mine_sweeper_start_game_window.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mine_sweeper/components/mine_tile.dart';
@@ -317,21 +309,13 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
     String mode = mihMineSweeperProvider.difficulty;
     switch (mode) {
       case "Very Easy":
-        return MihColors.getGreenColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-        );
+        return MihColors.green();
       case "Easy":
-        return MihColors.getGreenColor(
-          MzansiInnovationHub.of(context)!.theme.mode != "Dark",
-        );
+        return MihColors.green();
       case "Intermediate":
-        return MihColors.getOrangeColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-        );
+        return MihColors.orange();
       case "Hard":
-        return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark",
-        );
+        return MihColors.red();
       default:
         return null;
     }
@@ -346,15 +330,13 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
           fullscreen: false,
           windowTitle: null,
           onWindowTapClose: null,
-          backgroundColor: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode != "Dark"),
+          backgroundColor: MihColors.red(),
           windowBody: Column(
             children: [
               const SizedBox(height: 10),
               Icon(
                 FontAwesomeIcons.bomb,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
                 size: 125,
               ),
               const SizedBox(height: 10),
@@ -362,8 +344,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 "Better Luck Next Time",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                 ),
@@ -374,8 +355,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                   "Your lost this game of MIH Minesweeper!!!",
                   textAlign: TextAlign.center,
                   style: TextStyle(
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -387,8 +367,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 textAlign: TextAlign.center,
                 style: TextStyle(
                   fontSize: 18,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 20),
@@ -404,15 +383,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                       context.pop();
                       showStartGameWindow(mihMineSweeperProvider);
                     },
-                    buttonColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.primary(),
                     width: 300,
                     child: Text(
                       "New Game",
                       style: TextStyle(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -422,15 +398,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                     onPressed: () {
                       context.pop();
                     },
-                    buttonColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.secondary(),
                     width: 300,
                     child: Text(
                       "View Board",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -441,15 +414,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                       context.pop();
                       mihMineSweeperProvider.setToolIndex(1);
                     },
-                    buttonColor: MihColors.getGoldColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.gold(),
                     width: 300,
                     child: Text(
                       "Leader Board",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -473,15 +443,13 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
           fullscreen: false,
           windowTitle: null,
           onWindowTapClose: null,
-          backgroundColor: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          backgroundColor: MihColors.green(),
           windowBody: Column(
             children: [
               const SizedBox(height: 10),
               Icon(
                 Icons.celebration,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                 size: 150,
               ),
               const SizedBox(height: 10),
@@ -489,8 +457,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 "Congratulations",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                 ),
@@ -501,8 +468,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 textAlign: TextAlign.center,
                 style: TextStyle(
                   fontSize: 20,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
               ),
               const SizedBox(height: 10),
@@ -510,8 +476,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 "Time Taken: ${_formatTime().replaceAll("00:", "")}",
                 style: TextStyle(
                   fontSize: 20,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
               ),
               const SizedBox(height: 10),
@@ -519,8 +484,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                 "Score: ${calculateGameScore(mihMineSweeperProvider)}",
                 style: TextStyle(
                   fontSize: 20,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
               ),
               const SizedBox(height: 20),
@@ -536,15 +500,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                       context.pop();
                       showStartGameWindow(mihMineSweeperProvider);
                     },
-                    buttonColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.primary(),
                     width: 300,
                     child: Text(
                       "New Game",
                       style: TextStyle(
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -554,15 +515,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                     onPressed: () {
                       context.pop();
                     },
-                    buttonColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.secondary(),
                     width: 300,
                     child: Text(
                       "View Board",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -574,15 +532,12 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                       context.pop();
                       mihMineSweeperProvider.setToolIndex(1);
                     },
-                    buttonColor: MihColors.getGoldColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.gold(),
                     width: 300,
                     child: Text(
                       "Leader Board",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -612,6 +567,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(),
     );
@@ -642,11 +598,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                                 Icon(
                                   MihIcons.mineSweeper,
                                   size: 165,
-                                  color: MihColors.getSecondaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
+                                  color: MihColors.secondary(),
                                 ),
                                 const SizedBox(height: 10),
                                 Text(
@@ -656,11 +608,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                                   style: TextStyle(
                                     fontSize: 25,
                                     fontWeight: FontWeight.bold,
-                                    color: MihColors.getSecondaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.secondary(),
                                   ),
                                 ),
                                 const SizedBox(height: 25),
@@ -671,11 +619,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                                       style: TextStyle(
                                         fontSize: 20,
                                         fontWeight: FontWeight.normal,
-                                        color: MihColors.getSecondaryColor(
-                                            MzansiInnovationHub.of(context)!
-                                                    .theme
-                                                    .mode ==
-                                                "Dark"),
+                                        color: MihColors.secondary(),
                                       ),
                                       children: [
                                         TextSpan(text: "Press "),
@@ -685,11 +629,7 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                                           child: Icon(
                                             Icons.menu,
                                             size: 20,
-                                            color: MihColors.getSecondaryColor(
-                                                MzansiInnovationHub.of(context)!
-                                                        .theme
-                                                        .mode ==
-                                                    "Dark"),
+                                            color: MihColors.secondary(),
                                           ),
                                         ),
                                         TextSpan(
@@ -803,23 +743,15 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                           SpeedDialChild(
                             child: Icon(
                               Icons.rule_rounded,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                             label: "Learn how to play",
-                            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: () {
                               mihMineSweeperProvider.setToolIndex(3);
                             },
@@ -827,23 +759,15 @@ class _MineSweeperGameState extends State<MineSweeperGame> {
                           SpeedDialChild(
                             child: Icon(
                               Icons.add,
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                             ),
                             label: "Start New Game",
-                            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: () {
                               showStartGameWindow(mihMineSweeperProvider);
                             },

mih_ui/lib/mih_packages/mine_sweeper/package_tools/mine_sweeper_quick_start_guide.dart

@@ -1,8 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class MineSweeperQuickStartGuide extends StatefulWidget {
   const MineSweeperQuickStartGuide({super.key});
@@ -21,8 +18,7 @@ class _MineSweeperQuickStartGuideState
   Widget sectionOne() {
     return Container(
       decoration: BoxDecoration(
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode != "Darl"),
+        color: MihColors.secondary(),
         borderRadius: BorderRadius.circular(15),
       ),
       child: Padding(
@@ -36,8 +32,7 @@ class _MineSweeperQuickStartGuideState
               style: TextStyle(
                 fontSize: titleSize,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
             ),
             const SizedBox(height: 8),
@@ -48,9 +43,7 @@ class _MineSweeperQuickStartGuideState
                   TextSpan(
                     text: 'Quick Tap (or Click): This is the Dig action.',
                     style: TextStyle(
-                      color: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode !=
-                              "Dark"),
+                      color: MihColors.green(),
                       fontWeight: FontWeight.bold,
                       fontSize: subtitleSize,
                     ),
@@ -69,9 +62,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Goal:',
                         style: TextStyle(
-                          color: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.green(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -79,9 +70,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' To uncover a square and see a number clue.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -102,9 +91,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Risk:',
                         style: TextStyle(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.red(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -112,9 +99,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' If you click a mine, the game ends!',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -133,9 +118,7 @@ class _MineSweeperQuickStartGuideState
                     text:
                         'Tap and Hold (or Long Press): This is the Flag action (🚩).',
                     style: TextStyle(
-                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode !=
-                              "Dark"),
+                      color: MihColors.red(),
                       fontWeight: FontWeight.bold,
                       fontSize: subtitleSize,
                     ),
@@ -154,9 +137,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Goal:',
                         style: TextStyle(
-                          color: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.green(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -164,9 +145,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' To safely mark a square that you are',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -174,9 +153,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' certain',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -184,9 +161,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' is a mine.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -207,9 +182,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Risk:',
                         style: TextStyle(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.red(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -218,9 +191,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' Accidental placement of flags will cause confusion.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -241,9 +212,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Benefit:',
                         style: TextStyle(
-                          color: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.green(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -252,9 +221,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' You cannot accidentally click a square that is flagged.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -273,8 +240,7 @@ class _MineSweeperQuickStartGuideState
   Widget sectionTwo() {
     return Container(
       decoration: BoxDecoration(
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode != "Darl"),
+        color: MihColors.secondary(),
         borderRadius: BorderRadius.circular(15),
       ),
       child: Padding(
@@ -288,8 +254,7 @@ class _MineSweeperQuickStartGuideState
               style: TextStyle(
                 fontSize: titleSize,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
             ),
             const SizedBox(height: 8),
@@ -301,9 +266,7 @@ class _MineSweeperQuickStartGuideState
                     text:
                         'The number tells you exactly how many mines are touching that square (including sides and corners).',
                     style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                       fontWeight: FontWeight.normal,
                       fontSize: subtitleSize,
                     ),
@@ -322,9 +285,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: "• If you see a Blank Space (a '0'):",
                         style: TextStyle(
-                          color: MihColors.getOrangeColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.orange(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -332,9 +293,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: " Zero (0) ",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -343,9 +302,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' mines are touching it. All surrounding squares are safe, and the game will open them for you automatically.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -366,9 +323,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: "• If you see a '1':",
                         style: TextStyle(
-                          color: MihColors.getOrangeColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.orange(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -376,9 +331,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' Only ',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -386,9 +339,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: 'one',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -397,9 +348,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' mine is touching this square. You must find and flag that single mine.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -420,9 +369,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: "• If you see a '3':",
                         style: TextStyle(
-                          color: MihColors.getOrangeColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.orange(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -430,9 +377,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: " Three ",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -441,9 +386,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             'mines are touching this square. You must find and flag all three.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -462,8 +405,7 @@ class _MineSweeperQuickStartGuideState
   Widget sectionThree() {
     return Container(
       decoration: BoxDecoration(
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode != "Darl"),
+        color: MihColors.secondary(),
         borderRadius: BorderRadius.circular(15),
       ),
       child: Padding(
@@ -477,8 +419,7 @@ class _MineSweeperQuickStartGuideState
               style: TextStyle(
                 fontSize: titleSize,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
             ),
             const SizedBox(height: 8),
@@ -490,9 +431,7 @@ class _MineSweeperQuickStartGuideState
                     text:
                         'The game is won by uncovering every single safe square and correctly flagging all the mines. Use this two-step loop to clear the board:',
                     style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                       fontWeight: FontWeight.normal,
                       fontSize: subtitleSize,
                     ),
@@ -507,9 +446,7 @@ class _MineSweeperQuickStartGuideState
                   TextSpan(
                     text: 'A. Find the Mines (Where to Flag 🚩)',
                     style: TextStyle(
-                      color: MihColors.getPurpleColor(
-                          MzansiInnovationHub.of(context)!.theme.mode !=
-                              "Dark"),
+                      color: MihColors.purple(),
                       fontWeight: FontWeight.bold,
                       fontSize: subtitleSize,
                     ),
@@ -528,9 +465,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Goal:',
                         style: TextStyle(
-                          color: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.green(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -539,9 +474,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' Look for a number that only has one choice for a mine. e.g. If a \'1\' is touching only one hidden square, that hidden square',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -549,9 +482,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' must ',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -559,9 +490,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: 'be the mine.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -582,9 +511,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Action:',
                         style: TextStyle(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.red(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -592,9 +519,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' Tap and Hold to place a',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -602,9 +527,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' Flag ',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -612,9 +535,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: 'on the square you are sure is a mine.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -632,9 +553,7 @@ class _MineSweeperQuickStartGuideState
                   TextSpan(
                     text: 'B. Find the Safe Squares (Where to Dig)',
                     style: TextStyle(
-                      color: MihColors.getPurpleColor(
-                          MzansiInnovationHub.of(context)!.theme.mode !=
-                              "Dark"),
+                      color: MihColors.purple(),
                       fontWeight: FontWeight.bold,
                       fontSize: subtitleSize,
                     ),
@@ -653,9 +572,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Goal:',
                         style: TextStyle(
-                          color: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.green(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -664,9 +581,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' Look for a number that has been \'satisfied\' by your flags. e.g. You see a \'2\' and you have already placed two 🚩 flags touching it. The \'2\' is satisfied.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -687,9 +602,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: '• Action:',
                         style: TextStyle(
-                          color: MihColors.getRedColor(
-                              MzansiInnovationHub.of(context)!.theme.mode !=
-                                  "Dark"),
+                          color: MihColors.red(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -698,9 +611,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             ' Quick Tap any of the remaining hidden squares touching that \'satisfied\' number. They',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -708,9 +619,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: ' must be safe ',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -719,9 +628,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             'because the mine requirement has already been met.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -740,8 +647,7 @@ class _MineSweeperQuickStartGuideState
   Widget sectionFour() {
     return Container(
       decoration: BoxDecoration(
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode != "Darl"),
+        color: MihColors.secondary(),
         borderRadius: BorderRadius.circular(15),
       ),
       child: Padding(
@@ -755,8 +661,7 @@ class _MineSweeperQuickStartGuideState
               style: TextStyle(
                 fontSize: titleSize,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
             ),
             const SizedBox(height: 8),
@@ -770,9 +675,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: "• Start on the Edges and Corners: ",
                         style: TextStyle(
-                          color: MihColors.getBronze(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.bronze(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -781,9 +684,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             'Numbers on the edge or corner of the board are easier to solve because they have fewer surrounding squares to check.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -804,9 +705,7 @@ class _MineSweeperQuickStartGuideState
                       TextSpan(
                         text: "• Don't Guess: ",
                         style: TextStyle(
-                          color: MihColors.getBronze(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.bronze(),
                           fontWeight: FontWeight.bold,
                           fontSize: pointsSize,
                         ),
@@ -815,9 +714,7 @@ class _MineSweeperQuickStartGuideState
                         text:
                             'If you are down to two squares and either one could be the mine, look somewhere else on the board for a guaranteed, safe move.',
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontWeight: FontWeight.normal,
                           fontSize: pointsSize,
                         ),
@@ -838,6 +735,7 @@ class _MineSweeperQuickStartGuideState
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width),
     );

mih_ui/lib/mih_packages/mine_sweeper/package_tools/my_score_board.dart

@@ -1,15 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mih_mine_sweeper_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_packages/mine_sweeper/builders/build_my_scoreboard_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_minesweeper_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -64,6 +59,7 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
             refreshLeaderBoard(mineSweeperProvider, filterController.text);
           },
           child: MihPackageToolBody(
+            backgroundColor: MihColors.primary(),
             borderOn: false,
             bodyItem: getBody(width),
           ),
@@ -91,10 +87,8 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
                   editable: false,
                   fileNameController: null,
                   userSelectedfile: null,
-                  frameColor: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                  backgroundColor: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  frameColor: MihColors.secondary(),
+                  backgroundColor: MihColors.primary(),
                   onChange: (selectedImage) {},
                   key: ValueKey(profileProvider.userProfilePicUrl),
                 ),
@@ -142,9 +136,7 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
                           Icon(
                             MihIcons.mineSweeper,
                             size: 165,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                           const SizedBox(height: 10),
                           Text(
@@ -154,9 +146,7 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                             ),
                           ),
                           const SizedBox(height: 25),
@@ -167,11 +157,7 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
                                 style: TextStyle(
                                   fontSize: 20,
                                   fontWeight: FontWeight.normal,
-                                  color: MihColors.getSecondaryColor(
-                                      MzansiInnovationHub.of(context)!
-                                              .theme
-                                              .mode ==
-                                          "Dark"),
+                                  color: MihColors.secondary(),
                                 ),
                                 children: [
                                   TextSpan(text: "Press "),
@@ -180,11 +166,7 @@ class _MihMineSweeperLeaderBoardState extends State<MyScoreBoard> {
                                     child: Icon(
                                       FontAwesomeIcons.bomb,
                                       size: 20,
-                                      color: MihColors.getSecondaryColor(
-                                          MzansiInnovationHub.of(context)!
-                                                  .theme
-                                                  .mode ==
-                                              "Dark"),
+                                      color: MihColors.secondary(),
                                     ),
                                   ),
                                   TextSpan(text: " and start a new game"),

mih_ui/lib/mih_packages/mzansi_ai/mzansi_ai.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/mzansi_ai_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
@@ -58,11 +55,11 @@ class _MzansiAiState extends State<MzansiAi> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: context.watch<MzansiAiProvider>().toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: context.watch<MzansiAiProvider>().toolIndex,
           onIndexChange: (newValue) {
             context.read<MzansiAiProvider>().setToolIndex(newValue);
           },
@@ -92,7 +89,7 @@ class _MzansiAiState extends State<MzansiAi> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiAiProvider>().toolIndex,
+      selectedIndex: context.watch<MzansiAiProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_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 MzansiAiTile extends StatefulWidget {
   final double packageSize;
@@ -33,16 +30,14 @@ class _MzansiAiTileState extends State<MzansiAiTile> {
         //   ),
         // );
       },
-      appName: "Mzansi AI",
-      appIcon: Icon(
+      packageName: "Mzansi AI",
+      packageIcon: Icon(
         MihIcons.mzansiAi,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_ai/package_tools/mih_ai_chat.dart

@@ -8,12 +8,9 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:flutter_tts/flutter_tts.dart';
 import 'package:intl/intl.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_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_ai_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:provider/provider.dart';
 
@@ -40,8 +37,7 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
             Icon(
               MihIcons.mzansiAi,
               size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             const SizedBox(height: 10),
             Text(
@@ -51,8 +47,7 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
             const SizedBox(height: 25),
@@ -63,8 +58,7 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                   children: [
                     TextSpan(
@@ -81,8 +75,7 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                   children: [
                     TextSpan(text: "Press "),
@@ -91,9 +84,7 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
                       child: Icon(
                         Icons.menu,
                         size: 20,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                     TextSpan(text: " to start a new chat or read last message"),
@@ -338,13 +329,13 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
             //     onPressed: () {
             //       saveHistory(profileProvider, aiProvider);
             //     },
-            //     buttonColor: MihColors.getGreenColor(
-            //         MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            //     buttonColor: MihColors.green(
+            //         ),
             //     child: Text(
             //       "View History as json",
             //       style: TextStyle(
-            //         color: MihColors.getPrimaryColor(
-            //             MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            //         color: MihColors.primary(
+            //             ),
             //       ),
             //     ),
             //   ),
@@ -363,16 +354,11 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
                       stopTTS(aiProvider);
                     }
                   },
-                  buttonColor: !aiProvider.ttsOn
-                      ? MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                      : MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                  buttonColor:
+                      !aiProvider.ttsOn ? MihColors.green() : MihColors.red(),
                   child: Icon(
                     !aiProvider.ttsOn ? Icons.volume_up : Icons.volume_off,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
                 ),
               ),
@@ -385,21 +371,15 @@ class _MihAiChatState extends State<MihAiChat> with WidgetsBindingObserver {
                   SpeedDialChild(
                     child: Icon(
                       Icons.refresh,
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                     ),
                     label: "New Chat",
-                    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: () {
                       resetChat(aiProvider);
                     },

mih_ui/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart

@@ -1,11 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_business_profile_preview.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 
 class BuildBusinessSearchResultsList extends StatefulWidget {
@@ -33,14 +32,12 @@ class _BuildBusinessSearchResultsListState
           itemCount: widget.businessList.length,
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemBuilder: (context, index) {
             return Material(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               child: InkWell(
                 onTap: () {
                   directoryProvider.setSelectedBusiness(
@@ -50,9 +47,7 @@ class _BuildBusinessSearchResultsListState
                     'businessProfileView',
                   );
                 },
-                splashColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                    .withOpacity(0.2),
+                splashColor: MihColors.secondary().withOpacity(0.2),
                 borderRadius: BorderRadius.circular(15),
                 child: Padding(
                   padding: EdgeInsetsGeometry.symmetric(

mih_ui/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart

@@ -1,11 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_business_profile_preview.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 
 class BuildFavouriteBusinessesList extends StatefulWidget {
@@ -44,8 +43,7 @@ class _BuildFavouriteBusinessesListState
               return const SizedBox(); // Or a placeholder if a business couldn't be loaded
             }
             return Material(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               child: InkWell(
                 onTap: () {
                   directoryProvider.setSelectedBusiness(
@@ -55,9 +53,7 @@ class _BuildFavouriteBusinessesListState
                     'businessProfileView',
                   );
                 },
-                splashColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                    .withOpacity(0.2),
+                splashColor: MihColors.secondary().withOpacity(0.2),
                 borderRadius: BorderRadius.circular(15),
                 child: Padding(
                   padding: EdgeInsets.symmetric(

mih_ui/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart

@@ -1,11 +1,10 @@
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.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_package_components/mih_personal_profile_preview.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 
 class BuildUserSearchResultsList extends StatefulWidget {
@@ -33,14 +32,12 @@ class _BuildUserSearchResultsListState
           itemCount: widget.userList.length,
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemBuilder: (context, index) {
             return Material(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               child: InkWell(
                 onTap: () {
                   directoryProvider.setSelectedUser(
@@ -49,9 +46,7 @@ class _BuildUserSearchResultsListState
                     'mzansiProfileView',
                   );
                 },
-                splashColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                    .withOpacity(0.2),
+                splashColor: MihColors.secondary().withOpacity(0.2),
                 borderRadius: BorderRadius.circular(15),
                 child: Padding(
                   padding: EdgeInsetsGeometry.symmetric(

mih_ui/lib/mih_packages/mzansi_directory/mzansi_directory.dart

@@ -1,10 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:geolocator/geolocator.dart';
 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/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart';
@@ -74,11 +71,11 @@ class _MzansiDirectoryState extends State<MzansiDirectory> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: directoryProvider.toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: directoryProvider.toolIndex,
           onIndexChange: (newValue) {
             directoryProvider.setToolIndex(newValue);
           },
@@ -121,7 +118,7 @@ class _MzansiDirectoryState extends State<MzansiDirectory> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
+      selectedIndex: context.watch<MzansiDirectoryProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tile.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class MzansiDirectoryTile extends StatefulWidget {
   final double packageSize;
@@ -32,16 +29,14 @@ class _MzansiDirectoryTileState extends State<MzansiDirectoryTile> {
         //   ),
         // );
       },
-      appName: "Mzansi Directory",
-      appIcon: Icon(
+      packageName: "Mzansi Directory",
+      packageIcon: Icon(
         MihIcons.mzansiDirectory,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart

@@ -1,9 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 
 class MihContacts extends StatefulWidget {
   const MihContacts({super.key});
@@ -21,6 +17,7 @@ class _MihContactsState extends State<MihContacts> {
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width),
     );
@@ -37,10 +34,8 @@ class _MihContactsState extends State<MihContacts> {
               controller: contactSearchController,
               hintText: "Search Contacts",
               prefixIcon: Icons.search,
-              fillColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-              hintColor: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              fillColor: MihColors.secondary(),
+              hintColor: MihColors.primary(),
               onPrefixIconTap: () {},
               searchFocusNode: searchFocusNode,
             ),

mih_ui/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart

@@ -1,13 +1,8 @@
 import 'dart:async';
 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/business.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
@@ -107,6 +102,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width),
     );
@@ -130,10 +126,8 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                 controller: businessSearchController,
                 hintText: "Search Businesses",
                 prefixIcon: Icons.search,
-                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                hintColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                fillColor: MihColors.secondary(),
+                hintColor: MihColors.primary(),
                 onPrefixIconTap: () {},
                 searchFocusNode: searchFocusNode,
               ),
@@ -151,9 +145,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                           Icon(
                             MihIcons.iDontKnow,
                             size: 165,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                           const SizedBox(height: 10),
                           Text(
@@ -163,9 +155,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                             style: TextStyle(
                               fontSize: 25,
                               fontWeight: FontWeight.bold,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                             ),
                           ),
                         ],
@@ -182,9 +172,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                             Icon(
                               MihIcons.businessProfile,
                               size: 165,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                             ),
                             const SizedBox(height: 10),
                             Text(
@@ -194,11 +182,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                               style: TextStyle(
                                 fontSize: 25,
                                 fontWeight: FontWeight.bold,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.secondary(),
                               ),
                             ),
                             const SizedBox(height: 25),
@@ -209,11 +193,7 @@ class _MihFavouriteBusinessesState extends State<MihFavouriteBusinesses> {
                                   style: TextStyle(
                                     fontSize: 20,
                                     fontWeight: FontWeight.normal,
-                                    color: MihColors.getSecondaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.secondary(),
                                   ),
                                   children: [
                                     TextSpan(text: "Use the mzansi search"),

mih_ui/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart

@@ -1,18 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:ken_logger/ken_logger.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/business.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_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_packages/mzansi_directory/builders/build_business_search_resultsList.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
@@ -151,6 +143,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width),
     );
@@ -190,18 +183,12 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                           icon: Icon(
                             Icons.swap_horiz_rounded,
                             size: 35,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                           ),
                         ),
                       ],
-                      fillColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      hintColor: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      fillColor: MihColors.secondary(),
+                      hintColor: MihColors.primary(),
                       onPrefixIconTap: () {
                         searchPressed(profileProvider, directoryProvider);
                       },
@@ -231,9 +218,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                             ? Icons.filter_list_rounded
                             : Icons.filter_list_off_rounded,
                         size: 35,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                   ),
@@ -280,18 +265,12 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                                 );
                               }
                             },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                             elevation: 10,
                             child: Text(
                               "Search",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -337,8 +316,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
             Icon(
               MihIcons.iDontKnow,
               size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             const SizedBox(height: 25),
             Text(
@@ -348,8 +326,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
           ],
@@ -369,8 +346,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
               Icon(
                 MihIcons.businessProfile,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               const SizedBox(height: 10),
               Text(
@@ -380,8 +356,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 25),
@@ -392,9 +367,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -403,9 +376,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         child: Icon(
                           Icons.swap_horiz_rounded,
                           size: 20,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                       TextSpan(text: " to search for people of Mzansi"),
@@ -421,9 +392,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -432,9 +401,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         child: Icon(
                           Icons.filter_list_rounded,
                           size: 20,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                       TextSpan(text: " to filter business types"),
@@ -450,10 +417,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
       return Center(
         child: Text(
           "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
-          style: TextStyle(
-              fontSize: 25,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
+          style: TextStyle(fontSize: 25, color: MihColors.red()),
           textAlign: TextAlign.center,
         ),
       );
@@ -485,8 +449,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
               Icon(
                 MihIcons.personalProfile,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               const SizedBox(height: 10),
               Text(
@@ -496,8 +459,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 25),
@@ -508,9 +470,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -519,9 +479,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
                         child: Icon(
                           Icons.swap_horiz_rounded,
                           size: 20,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                       TextSpan(text: " to search for businesses of Mzansi"),
@@ -543,8 +501,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
             Icon(
               MihIcons.iDontKnow,
               size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             const SizedBox(height: 10),
             Text(
@@ -554,8 +511,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
           ],
@@ -565,10 +521,7 @@ class _MihSearchMzansiState extends State<MihSearchMzansi> {
       return Center(
         child: Text(
           "Error pulling Patients Data\n/users/search/${directoryProvider.searchTerm}",
-          style: TextStyle(
-              fontSize: 25,
-              color: MihColors.getRedColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
+          style: TextStyle(fontSize: 25, color: MihColors.red()),
           textAlign: TextAlign.center,
         ),
       );

mih_ui/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart

@@ -1,7 +1,6 @@
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_employee.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_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:flutter/material.dart';
@@ -37,8 +36,7 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: mzansiProfileProvider.employeeList!.length,
@@ -58,8 +56,7 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
               subtitle: Text(
                 "${mzansiProfileProvider.employeeList![index].username}\n${mzansiProfileProvider.employeeList![index].email}\nAccess: ${mzansiProfileProvider.employeeList![index].access}",
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               onTap: () {

mih_ui/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart

@@ -1,6 +1,5 @@
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.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_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:flutter/material.dart';
@@ -44,8 +43,7 @@ class _BuildUserListState extends State<BuildUserList> {
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: profileProvider.userSearchResults.length,
@@ -61,8 +59,7 @@ class _BuildUserListState extends State<BuildUserList> {
               subtitle: Text(
                 "Email: ${hideEmail(profileProvider.userSearchResults[index].email)}",
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               onTap: () {

mih_ui/lib/mih_packages/mzansi_profile/business_profile/busines_profile.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 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/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart';
@@ -74,11 +71,11 @@ class _BusinesProfileState extends State<BusinesProfile> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appToolTitles: getToolTitle(),
-          appBody: getToolBody(),
-          selectedbodyIndex: mzansiProfileProvider.businessIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolTitles: getToolTitle(),
+          packageToolBodies: getToolBody(),
+          selectedBodyIndex: mzansiProfileProvider.businessIndex,
           onIndexChange: (newIndex) {
             mzansiProfileProvider.setBusinessIndex(newIndex);
           },
@@ -129,7 +126,7 @@ class _BusinesProfileState extends State<BusinesProfile> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiProfileProvider>().businessIndex,
+      selectedIndex: context.watch<MzansiProfileProvider>().businessIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart

@@ -1,13 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_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_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
@@ -94,15 +90,13 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
             context.pop();
             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,
             ),
@@ -122,22 +116,19 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
           fullscreen: false,
           windowTitle: null,
           onWindowTapClose: null,
-          backgroundColor: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          backgroundColor: MihColors.secondary(),
           windowBody: Column(
             children: [
               Icon(
                 Icons.warning_rounded,
                 size: 150,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
               Text(
                 "Bookmark Business",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                 ),
@@ -146,8 +137,7 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
               Text(
                 "Are you sure you want to save ${widget.business.Name} to your Mzansi Directory?",
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 18,
                 ),
               ),
@@ -164,14 +154,11 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                     onPressed: () async {
                       Navigator.of(context).pop();
                     },
-                    buttonColor: MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.red(),
                     child: Text(
                       "Cancel",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),
@@ -182,14 +169,11 @@ class _MihAddBookmarkAlertState extends State<MihAddBookmarkAlert> {
                     onPressed: () {
                       addBookmark(profileProvider, widget.business.business_id);
                     },
-                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.green(),
                     child: Text(
                       "Bookmark Business",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 20,
                         fontWeight: FontWeight.bold,
                       ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_employee_window.dart

@@ -1,14 +1,9 @@
 import 'package:flutter/material.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_objects/app_user.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_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_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_business_employee_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -58,15 +53,13 @@ class _MihAddEmployeeWindowState extends State<MihAddEmployeeWindow> {
             context.pop();
             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,
             ),
@@ -120,12 +113,8 @@ class _MihAddEmployeeWindowState extends State<MihAddEmployeeWindow> {
                   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: usernameController,
                       multiLineInput: false,
                       requiredText: true,
@@ -134,12 +123,8 @@ class _MihAddEmployeeWindowState extends State<MihAddEmployeeWindow> {
                     ),
                     const SizedBox(height: 10.0),
                     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: emailController,
                       multiLineInput: false,
                       requiredText: true,
@@ -172,16 +157,12 @@ class _MihAddEmployeeWindowState extends State<MihAddEmployeeWindow> {
                             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,
                           ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart

@@ -1,12 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_objects/bookmarked_business.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
@@ -98,15 +94,13 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
             context.pop();
             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,
             ),
@@ -123,22 +117,19 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
       fullscreen: false,
       windowTitle: null,
       onWindowTapClose: null,
-      backgroundColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      backgroundColor: MihColors.secondary(),
       windowBody: Column(
         children: [
           Icon(
             Icons.warning_rounded,
             size: 150,
-            color: MihColors.getPrimaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.primary(),
           ),
           Text(
             "Remove Bookmark",
             textAlign: TextAlign.center,
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 25,
               fontWeight: FontWeight.bold,
             ),
@@ -147,8 +138,7 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
           Text(
             "Are you sure you want to remove ${widget.business.Name} from your Mzansi Directory?",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 18,
             ),
           ),
@@ -165,13 +155,11 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
                 onPressed: () async {
                   Navigator.of(context).pop();
                 },
-                buttonColor: MihColors.getGreenColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                buttonColor: MihColors.green(),
                 child: Text(
                   "Cancel",
                   style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),
@@ -184,13 +172,11 @@ class _MihDeleteBookmarkAlertState extends State<MihDeleteBookmarkAlert> {
                   deleteBookmark(
                       widget.bookmarkBusiness!.idbookmarked_businesses);
                 },
-                buttonColor: MihColors.getRedColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                buttonColor: MihColors.red(),
                 child: Text(
                   "Remove Business",
                   style: TextStyle(
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                   ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_edit_employee_details_window.dart

@@ -1,15 +1,10 @@
 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_objects/business_employee.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_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_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_business_employee_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart';
@@ -87,15 +82,13 @@ class _MihEditEmployeeDetailsWindowState
             context.pop();
             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,
             ),
@@ -145,19 +138,15 @@ class _MihEditEmployeeDetailsWindowState
             SpeedDialChild(
               child: Icon(
                 Icons.delete,
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
               ),
               label: "Delete Employee",
-              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: () {
                 showDeleteWarning();
               },
@@ -177,12 +166,8 @@ class _MihEditEmployeeDetailsWindowState
                   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: fnameController,
                       multiLineInput: false,
                       requiredText: true,
@@ -191,12 +176,8 @@ class _MihEditEmployeeDetailsWindowState
                     ),
                     const SizedBox(height: 10.0),
                     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: lnameController,
                       multiLineInput: false,
                       requiredText: true,
@@ -205,12 +186,8 @@ class _MihEditEmployeeDetailsWindowState
                     ),
                     const SizedBox(height: 10.0),
                     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: titleController,
                       multiLineInput: false,
                       requiredText: true,
@@ -243,16 +220,12 @@ class _MihEditEmployeeDetailsWindowState
                             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,
                           ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart

@@ -2,18 +2,12 @@ import 'package:custom_rating_bar/custom_rating_bar.dart';
 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_objects/business.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_review.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_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_business_details_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
@@ -90,13 +84,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
               }
             });
           },
-          buttonColor: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.secondary(),
           child: Text(
             "Delete",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -107,13 +99,11 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
           onPressed: () {
             context.pop();
           },
-          buttonColor: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.green(),
           child: Text(
             "Cancel",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -126,11 +116,9 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.secondary();
     } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.red();
     }
   }
 
@@ -220,15 +208,13 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
             context.pop();
             widget.onSuccessDismissPressed!.call();
           },
-          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,
             ),
@@ -294,21 +280,15 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                   SpeedDialChild(
                     child: Icon(
                       Icons.delete,
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                     ),
                     label: "Delete Review",
-                    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: () {
                       showDeleteReviewAlert(directoryProvider);
                     },
@@ -337,9 +317,7 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                             "Business Rating",
                             textAlign: TextAlign.left,
                             style: TextStyle(
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                               fontSize: 18,
                               fontWeight: FontWeight.bold,
                             ),
@@ -354,18 +332,12 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                               filledIcon: Icons.star,
                               emptyIcon: Icons.star_border,
                               halfFilledIcon: Icons.star_half,
-                              filledColor: MihColors.getYellowColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              filledColor: MihColors.yellow(),
                               // filledColor: MzansiInnovationHub.of(context)!
                               //     .theme
                               //     .secondaryColor(),
-                              emptyColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              halfFilledColor: MihColors.getYellowColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              emptyColor: MihColors.secondary(),
+                              halfFilledColor: MihColors.yellow(),
                               // MzansiInnovationHub.of(context)!
                               //     .theme
                               //     .secondaryColor(),
@@ -381,15 +353,9 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                               filledIcon: Icons.star,
                               emptyIcon: Icons.star_border,
                               halfFilledIcon: Icons.star_half,
-                              filledColor: MihColors.getYellowColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              emptyColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              halfFilledColor: MihColors.getYellowColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              filledColor: MihColors.yellow(),
+                              emptyColor: MihColors.secondary(),
+                              halfFilledColor: MihColors.yellow(),
                               isHalfAllowed: true,
                               initialRating: widget.businessReview != null
                                   ? double.parse(_reviewScoreController.text)
@@ -411,12 +377,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                         visible: widget.readOnly,
                         child: MihTextFormField(
                           // width: 200,
-                          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: _reviewReviewerController,
                           multiLineInput: false,
                           requiredText: true,
@@ -430,12 +392,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       const SizedBox(height: 10),
                       MihTextFormField(
                         // width: 200,
-                        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: _reviewTitleController,
                         multiLineInput: false,
                         requiredText: true,
@@ -449,12 +407,8 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                       const SizedBox(height: 10),
                       MihTextFormField(
                         height: 250,
-                        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: _reviewDescriptionController,
                         multiLineInput: true,
                         requiredText: widget.readOnly,
@@ -517,20 +471,14 @@ class _MihReviewBusinessWindowState extends State<MihReviewBusinessWindow> {
                                 MihAlertServices().inputErrorAlert(context);
                               }
                             },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                             width: 300,
                             child: Text(
                               widget.businessReview != null
                                   ? "Update Review"
                                   : "Add Review",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart

@@ -3,16 +3,10 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.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_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
@@ -98,11 +92,9 @@ class _MihUpdateBusinessDetailsWindowState
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.secondary();
     } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.red();
     }
   }
 
@@ -275,12 +267,8 @@ class _MihUpdateBusinessDetailsWindowState
                               editable: true,
                               fileNameController: fileNameController,
                               userSelectedfile: newSelectedLogoPic,
-                              frameColor: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
-                              backgroundColor: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              frameColor: MihColors.secondary(),
+                              backgroundColor: MihColors.primary(),
                               onChange: (selectedfile) {
                                 setState(() {
                                   newSelectedLogoPic = selectedfile;
@@ -291,12 +279,8 @@ class _MihUpdateBusinessDetailsWindowState
                           Visibility(
                             visible: false,
                             child: 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: fileNameController,
                               multiLineInput: false,
                               requiredText: true,
@@ -306,12 +290,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           const SizedBox(height: 20),
                           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: nameController,
                             multiLineInput: false,
                             requiredText: true,
@@ -322,12 +302,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           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: typeController,
                             multiLineInput: false,
                             requiredText: true,
@@ -339,12 +315,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           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: emailController,
                             multiLineInput: false,
                             requiredText: true,
@@ -382,30 +354,13 @@ class _MihUpdateBusinessDetailsWindowState
                                 initialSelection: countryCodeController.text,
                                 showDropDownButton: false,
                                 pickerStyle: PickerStyle.bottomSheet,
-                                dialogBackgroundColor:
-                                    MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
-                                barrierColor: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                dialogBackgroundColor: MihColors.primary(),
+                                barrierColor: MihColors.primary(),
                               ),
                               Expanded(
                                 child: 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: contactController,
                                   numberMode: true,
                                   multiLineInput: false,
@@ -422,12 +377,8 @@ class _MihUpdateBusinessDetailsWindowState
                           const SizedBox(height: 10),
                           MihTextFormField(
                             height: 250,
-                            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: missionVisionController,
                             multiLineInput: true,
                             requiredText: true,
@@ -469,12 +420,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           const SizedBox(height: 10.0),
                           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: websiteController,
                             multiLineInput: false,
                             requiredText: false,
@@ -486,12 +433,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           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: regController,
                             multiLineInput: false,
                             requiredText: false,
@@ -503,12 +446,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           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: practiceNoController,
                             multiLineInput: false,
                             requiredText: false,
@@ -519,12 +458,8 @@ class _MihUpdateBusinessDetailsWindowState
                           ),
                           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: vatNoController,
                             multiLineInput: false,
                             requiredText: false,
@@ -540,16 +475,8 @@ class _MihUpdateBusinessDetailsWindowState
                             children: [
                               Flexible(
                                 child: 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: locationController,
                                   multiLineInput: false,
                                   requiredText: true,
@@ -581,20 +508,12 @@ class _MihUpdateBusinessDetailsWindowState
                                     context.pop();
                                   });
                                 },
-                                buttonColor: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                buttonColor: MihColors.secondary(),
                                 width: 100,
                                 child: Text(
                                   "Set",
                                   style: TextStyle(
-                                    color: MihColors.getPrimaryColor(
-                                        MzansiInnovationHub.of(context)!
-                                                .theme
-                                                .mode ==
-                                            "Dark"),
+                                    color: MihColors.primary(),
                                     fontSize: 20,
                                     fontWeight: FontWeight.bold,
                                   ),
@@ -612,18 +531,12 @@ class _MihUpdateBusinessDetailsWindowState
                                   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,
                                 ),
@@ -647,9 +560,7 @@ class _MihUpdateBusinessDetailsWindowState
                           MihAlertServices().inputErrorAlert(context);
                         }
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 100,
                       height: 25,
                       child: Text(
@@ -657,9 +568,7 @@ class _MihUpdateBusinessDetailsWindowState
                             ? "Setup Profile"
                             : "Update",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 15,
                           fontWeight: FontWeight.bold,
                         ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/components/mih_update_my_business_user_details.dart

@@ -1,15 +1,10 @@
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.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_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
@@ -146,10 +141,10 @@ class _MihUpdateMyBusinessUserDetailsState
                         //     editable: false,
                         //     fileNameController: fileNameController,
                         //     userSelectedfile: userPicFile,
-                        //     frameColor: MihColors.getSecondaryColor(
+                        //     frameColor: MihColors.secondary(
                         //         MzansiInnovationHub.of(context)!.theme.mode ==
                         //             "Dark"),
-                        //     backgroundColor: MihColors.getPrimaryColor(
+                        //     backgroundColor: MihColors.primary(
                         //         MzansiInnovationHub.of(context)!.theme.mode ==
                         //             "Dark"),
                         //     onChange: (_) {},
@@ -158,12 +153,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         Visibility(
                           visible: false,
                           child: 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: fileNameController,
                             multiLineInput: false,
                             requiredText: true,
@@ -173,12 +164,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         ),
                         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: titleTextController,
                           multiLineInput: false,
                           requiredText: true,
@@ -190,12 +177,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         ),
                         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: fnameController,
                           multiLineInput: false,
                           requiredText: true,
@@ -207,12 +190,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         ),
                         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: lnameController,
                           multiLineInput: false,
                           requiredText: true,
@@ -224,12 +203,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         ),
                         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: accessController,
                           multiLineInput: false,
                           requiredText: true,
@@ -272,12 +247,8 @@ class _MihUpdateMyBusinessUserDetailsState
                         Visibility(
                           visible: false,
                           child: 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: fileNameController,
                             multiLineInput: false,
                             requiredText: true,
@@ -295,18 +266,12 @@ class _MihUpdateMyBusinessUserDetailsState
                                 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,
                               ),
@@ -329,16 +294,13 @@ class _MihUpdateMyBusinessUserDetailsState
                         MihAlertServices().inputErrorAlert(context);
                       }
                     },
-                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.green(),
                     width: 100,
                     height: 25,
                     child: Text(
                       "Update",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
                       ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/mzansi_business_profile_view.dart

@@ -1,10 +1,7 @@
 import 'package:go_router/go_router.dart';
 import 'package:ken_logger/ken_logger.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:flutter/material.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/mzansi_directory_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart';
@@ -27,7 +24,7 @@ class MzansiBusinessProfileView extends StatefulWidget {
 }
 
 class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
   late final MihBusinessDetailsView _businessDetailsView;
   late final MihBusinessReviews _businessReviews;
   late final MihBusinessQrCode _businessQrCode;
@@ -77,14 +74,14 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
           );
         } else {
           return MihPackage(
-            appActionButton: getAction(),
-            appTools: getTools(),
-            appBody: getToolBody(directoryProvider),
-            appToolTitles: getToolTitle(),
-            selectedbodyIndex: _selcetedIndex,
+            packageActionButton: getAction(),
+            packageTools: getTools(),
+            packageToolBodies: getToolBody(directoryProvider),
+            packageToolTitles: getToolTitle(),
+            selectedBodyIndex: _selectedIndex,
             onIndexChange: (newValue) {
               setState(() {
-                _selcetedIndex = newValue;
+                _selectedIndex = newValue;
               });
             },
           );
@@ -117,22 +114,22 @@ class _MzansiBusinessProfileViewState extends State<MzansiBusinessProfileView> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.business)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     temp[const Icon(Icons.star_rate_rounded)] = () {
       setState(() {
-        _selcetedIndex = 1;
+        _selectedIndex = 1;
       });
     };
     temp[const Icon(Icons.qr_code_rounded)] = () {
       setState(() {
-        _selcetedIndex = 2;
+        _selectedIndex = 2;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_profile/business_profile/mzansi_set_up_business_profile.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart';
 import 'package:provider/provider.dart';
@@ -28,11 +26,11 @@ class _MzansiSetUpBusinessProfileState
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: context.watch<MzansiProfileProvider>().businessIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: getToolTitle(),
+      selectedBodyIndex: context.watch<MzansiProfileProvider>().businessIndex,
       onIndexChange: (newIndex) {
         context.read<MzansiProfileProvider>().setBusinessIndex(newIndex);
       },
@@ -60,7 +58,7 @@ class _MzansiSetUpBusinessProfileState
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiProfileProvider>().businessIndex,
+      selectedIndex: context.watch<MzansiProfileProvider>().businessIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_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 MzansiBusinessProfileTile extends StatefulWidget {
   final double packageSize;
@@ -30,16 +27,14 @@ class _MzansiBusinessProfileTileState extends State<MzansiBusinessProfileTile> {
         //   arguments: widget.arguments,
         // );
       },
-      appName: "Business Profile",
-      appIcon: Icon(
+      packageName: "Business Profile",
+      packageIcon: Icon(
         MihIcons.businessProfile,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart

@@ -1,10 +1,7 @@
 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_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:provider/provider.dart';
 
 class MzansiSetupBusinessProfileTile extends StatefulWidget {
@@ -36,15 +33,13 @@ class _MzansiSetupBusinessProfileTileState
         //   arguments: widget.signedInUser,
         // );
       },
-      appName: "Set Up Business",
-      appIcon: Icon(
+      packageName: "Set Up Business",
+      packageIcon: Icon(
         MihIcons.businessSetup,
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        color: MihColors.secondary(),
       ),
       iconSize: widget.packageSize,
-      textColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      textColor: MihColors.secondary(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart

@@ -1,14 +1,11 @@
 import 'package:custom_rating_bar/custom_rating_bar.dart';
 import 'package:file_picker/file_picker.dart';
 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_package_components/mih_business_info_card_v2.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_packages/mzansi_profile/business_profile/components/mih_update_business_details_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
 import 'package:provider/provider.dart';
 
@@ -48,6 +45,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth, context),
@@ -81,12 +79,8 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                             editable: false,
                             fileNameController: fileNameController,
                             userSelectedfile: newSelectedLogoPic,
-                            frameColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            backgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            frameColor: MihColors.secondary(),
+                            backgroundColor: MihColors.primary(),
                             onChange: (selectedfile) {
                               setState(() {
                                 newSelectedLogoPic = selectedfile;
@@ -102,18 +96,12 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                                 editBizProfileWindow(
                                     mzansiProfileProvider, width);
                               },
-                              buttonColor: MihColors.getGreenColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              buttonColor: MihColors.green(),
                               width: 35,
                               height: 35,
                               child: Icon(
                                 Icons.edit,
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                               ),
                             ),
                           ),
@@ -126,9 +114,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                         style: TextStyle(
                           fontSize: 35,
                           fontWeight: FontWeight.bold,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                     ),
@@ -138,9 +124,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.w600,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                     ),
@@ -150,17 +134,11 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                       filledIcon: Icons.star,
                       emptyIcon: Icons.star_border,
                       halfFilledIcon: Icons.star_half,
-                      filledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                      emptyColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      halfFilledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      filledColor: MihColors.yellow(),
+                      // MihColors.primary(),
+                      emptyColor: MihColors.secondary(),
+                      halfFilledColor: MihColors.yellow(),
+                      // MihColors.primary(),
                       isHalfAllowed: true,
                       initialRating: mzansiProfileProvider
                               .business!.rating.isNotEmpty
@@ -181,9 +159,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                           style: TextStyle(
                             fontSize: 15,
                             fontWeight: FontWeight.bold,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                         ),
                       ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_set_up.dart

@@ -4,16 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:http/http.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_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart';
@@ -174,11 +169,9 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
 
   Color getMissionVisionLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.secondary();
     } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.red();
     }
   }
 
@@ -202,15 +195,13 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
               extra: stayOnPersonalSide,
             );
           },
-          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,
             ),
@@ -279,6 +270,7 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -316,10 +308,7 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       fontSize: 25,
                     ),
                   ),
-                  Divider(
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark")),
+                  Divider(color: MihColors.secondary()),
                   const SizedBox(height: 10.0),
                   MihForm(
                     formKey: _formKey,
@@ -334,12 +323,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                           editable: true,
                           fileNameController: logoFileNameController,
                           userSelectedfile: newSelectedLogoPic,
-                          frameColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          backgroundColor: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          frameColor: MihColors.secondary(),
+                          backgroundColor: MihColors.primary(),
                           onChange: (selectedfile) {
                             setState(() {
                               newSelectedLogoPic = selectedfile;
@@ -349,12 +334,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 20),
                       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: nameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -365,12 +346,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: typeController,
                         multiLineInput: false,
                         requiredText: true,
@@ -382,12 +359,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: emailController,
                         multiLineInput: false,
                         requiredText: true,
@@ -424,21 +397,13 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                             initialSelection: countryCodeController.text,
                             showDropDownButton: false,
                             pickerStyle: PickerStyle.bottomSheet,
-                            dialogBackgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            barrierColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            dialogBackgroundColor: MihColors.primary(),
+                            barrierColor: MihColors.primary(),
                           ),
                           Expanded(
                             child: 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: contactController,
                               numberMode: true,
                               multiLineInput: false,
@@ -454,12 +419,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       const SizedBox(height: 10.0),
                       MihTextFormField(
                         height: 250,
-                        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: missionVisionController,
                         multiLineInput: true,
                         requiredText: true,
@@ -501,12 +462,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: websiteController,
                         multiLineInput: false,
                         requiredText: false,
@@ -519,12 +476,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       const SizedBox(height: 10.0),
 
                       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: regController,
                         multiLineInput: false,
                         requiredText: false,
@@ -536,12 +489,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: practiceNoController,
                         multiLineInput: false,
                         requiredText: false,
@@ -553,12 +502,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
 
                       const SizedBox(height: 10.0),
                       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: vatNoController,
                         multiLineInput: false,
                         requiredText: false,
@@ -574,12 +519,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                         children: [
                           Flexible(
                             child: 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: locationController,
                               multiLineInput: false,
                               requiredText: true,
@@ -610,18 +551,12 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                                 Navigator.of(context).pop();
                               });
                             },
-                            buttonColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.secondary(),
                             width: 100,
                             child: Text(
                               "Set",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -640,18 +575,11 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                           ),
                         ),
                       ),
-                      Divider(
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark")),
+                      Divider(color: MihColors.secondary()),
                       const SizedBox(height: 10.0),
                       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: titleController,
                         multiLineInput: false,
                         requiredText: true,
@@ -673,12 +601,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       // ),
                       const SizedBox(height: 10.0),
                       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: fnameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -690,12 +614,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: lnameController,
                         multiLineInput: false,
                         requiredText: true,
@@ -707,12 +627,8 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                       ),
                       const SizedBox(height: 10.0),
                       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: accessController,
                         multiLineInput: false,
                         requiredText: true,
@@ -761,16 +677,12 @@ class _MihBusinessDetailsSetUpState extends State<MihBusinessDetailsSetUp> {
                               MihAlertServices().inputErrorAlert(context);
                             }
                           },
-                          buttonColor: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.green(),
                           width: 300,
                           child: Text(
                             "Set Up Buasiness",
                             style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart

@@ -2,14 +2,11 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:custom_rating_bar/custom_rating_bar.dart';
 import 'package:file_picker/file_picker.dart';
 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_package_components/mih_business_info_card_v2.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
 import 'package:provider/provider.dart';
 
@@ -44,6 +41,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth, context),
@@ -81,36 +79,22 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                                 editable: false,
                                 fileNameController: TextEditingController(),
                                 userSelectedfile: file,
-                                frameColor: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
-                                backgroundColor: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                frameColor: MihColors.secondary(),
+                                backgroundColor: MihColors.primary(),
                                 onChange: () {},
                               );
                             } else {
                               return Icon(
                                 MihIcons.iDontKnow,
                                 size: profilePictureWidth,
-                                color: MihColors.getSecondaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.secondary(),
                               );
                             }
                           } else {
                             return Icon(
                               MihIcons.mihRing,
                               size: profilePictureWidth,
-                              color: MihColors.getSecondaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.secondary(),
                             );
                           }
                         }),
@@ -122,9 +106,9 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                     //     fileNameController: fileNameController,
                     //     userSelectedfile: imageFile,
                     //     frameColor:
-                    //         MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    //         MihColors.secondary(),
                     //     backgroundColor:
-                    //         MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    //         MihColors.primary(),
                     //     onChange: (selectedfile) {
                     //       setState(() {
                     //         imageFile = selectedfile;
@@ -138,9 +122,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                         style: TextStyle(
                           fontSize: 35,
                           fontWeight: FontWeight.bold,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                     ),
@@ -150,9 +132,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                         style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.w600,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                     ),
@@ -162,17 +142,11 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                       filledIcon: Icons.star,
                       emptyIcon: Icons.star_border,
                       halfFilledIcon: Icons.star_half,
-                      filledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                      emptyColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      halfFilledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      filledColor: MihColors.yellow(),
+                      // MihColors.primary(),
+                      emptyColor: MihColors.secondary(),
+                      halfFilledColor: MihColors.yellow(),
+                      // MihColors.primary(),
                       isHalfAllowed: true,
                       initialRating:
                           directoryProvider.selectedBusiness!.rating.isNotEmpty
@@ -195,9 +169,7 @@ class _MihBusinessDetailsViewState extends State<MihBusinessDetailsView> {
                           style: TextStyle(
                             fontSize: 15,
                             fontWeight: FontWeight.bold,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                         ),
                       ),

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_qr_code.dart

@@ -8,19 +8,12 @@ import 'package:flutter/material.dart';
 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/business.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_floating_menu.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
 import 'package:provider/provider.dart';
 import 'package:screenshot/screenshot.dart';
@@ -56,17 +49,11 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
   }
 
   String getQrCodeData(int qrSize) {
-    String color = MihColors.getPrimaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-        .toARGB32()
-        .toRadixString(16)
-        .substring(2, 8);
+    String color =
+        MihColors.primary().toARGB32().toRadixString(16).substring(2, 8);
     // KenLogger.warning(color);
-    String bgColor = MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-        .toARGB32()
-        .toRadixString(16)
-        .substring(2, 8);
+    String bgColor =
+        MihColors.secondary().toARGB32().toRadixString(16).substring(2, 8);
     // KenLogger.warning(bgColor);
     String encodedData =
         Uri.encodeComponent("$qrCodedata${business.business_id}");
@@ -138,15 +125,13 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
               Icon(
                 MihIcons.mihLogo,
                 size: 100,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               Text(
                 "Let's Get Started",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                 ),
@@ -155,8 +140,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
               Text(
                 "Ready to dive in to the world of MIH?\nSign in or create a free MIH account to unlock all the powerful features of the MIH app. It's quick and easy!",
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontSize: 15,
                 ),
               ),
@@ -169,16 +153,13 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                       extra: true,
                     );
                   },
-                  buttonColor: MihColors.getGreenColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  buttonColor: MihColors.green(),
                   elevation: 10,
                   width: 300,
                   child: Text(
                     "Sign In/ Create Account",
                     style: TextStyle(
-                      color: MihColors.getPrimaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.primary(),
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                     ),
@@ -196,16 +177,13 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
     return Screenshot(
       controller: screenshotController,
       child: Material(
-        color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-            .withValues(alpha: 0.6),
+        color: MihColors.secondary().withValues(alpha: 0.6),
         borderRadius: BorderRadius.circular(25),
         elevation: 10,
         shadowColor: Colors.black,
         child: Container(
           decoration: BoxDecoration(
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
             borderRadius: BorderRadius.circular(20),
           ),
           child: Padding(
@@ -230,30 +208,22 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                             editable: false,
                             fileNameController: TextEditingController(),
                             userSelectedfile: file,
-                            frameColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            backgroundColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            frameColor: MihColors.primary(),
+                            backgroundColor: MihColors.secondary(),
                             onChange: () {},
                           );
                         } else {
                           return Icon(
                             MihIcons.iDontKnow,
                             size: profilePictureWidth,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                           );
                         }
                       } else {
                         return Icon(
                           MihIcons.mihRing,
                           size: profilePictureWidth,
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                         );
                       }
                     },
@@ -264,9 +234,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                       style: TextStyle(
                         fontSize: 35,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                     ),
                   ),
@@ -276,9 +244,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                       style: TextStyle(
                         fontSize: 20,
                         fontWeight: FontWeight.w600,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                     ),
                   ),
@@ -292,9 +258,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                           style: TextStyle(
                             fontSize: 15,
                             fontWeight: FontWeight.w600,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                           ),
                         ),
                       ),
@@ -302,9 +266,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                       Icon(
                         MihIcons.mihLogo,
                         size: 20,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                     ],
                   ),
@@ -328,9 +290,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                       style: TextStyle(
                         fontSize: 30,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                     ),
                   ),
@@ -373,6 +333,7 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
   Widget build(BuildContext context) {
     Size screenSize = MediaQuery.of(context).size;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenSize, context),
@@ -410,19 +371,15 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                 SpeedDialChild(
                   child: Icon(
                     Icons.download_rounded,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
                   label: "Download QR Code",
-                  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: () {
                     downloadQrCode();
                   },
@@ -430,19 +387,15 @@ class _MihBusinessQrCodeState extends State<MihBusinessQrCode> {
                 SpeedDialChild(
                   child: Icon(
                     Icons.share_rounded,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
                   label: "Share Business",
-                  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: () {
                     shareMIHLink(
                       context,

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart

@@ -1,12 +1,9 @@
 import 'package:custom_rating_bar/custom_rating_bar.dart';
 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/business.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_review.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/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_directory_services.dart';
 import 'package:provider/provider.dart';
@@ -84,17 +81,13 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                           child: Icon(
                             MihIcons.mihRing,
                             size: 165,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           ),
                         ),
                         Icon(
                           Icons.star_rate_rounded,
                           size: 150,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ],
                     ),
@@ -106,9 +99,7 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                     // const SizedBox(height: 10),
@@ -150,7 +141,7 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
               //       Icons.star_rate_rounded,
               //       size: 150,
               //       color:
-              //           MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              //           MihColors.secondary(),
               //     ),
               //     Text(
               //       "No reviews yet, be the first the review\n${widget.business.Name}",
@@ -178,23 +169,17 @@ class _MihBusinessReviewsState extends State<MihBusinessReviews> {
                       filledIcon: Icons.star,
                       emptyIcon: Icons.star_border,
                       halfFilledIcon: Icons.star_half,
-                      filledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                      emptyColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      halfFilledColor: MihColors.getYellowColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
-                      // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      filledColor: MihColors.yellow(),
+                      // MihColors.primary(),
+                      emptyColor: MihColors.secondary(),
+                      halfFilledColor: MihColors.yellow(),
+                      // MihColors.primary(),
                       // filledColor:
-                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      //     MihColors.secondary(),
                       // emptyColor:
-                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      //     MihColors.secondary(),
                       // halfFilledColor:
-                      //     MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                      //     MihColors.secondary(),
                       isHalfAllowed: true,
                       initialRating: double.parse(reviews[index].rating_score),
                       maxRating: 5,

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart

@@ -1,10 +1,6 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_search_bar.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_providers/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart';
 import 'package:flutter/material.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart';
@@ -52,8 +48,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
           Icon(
             MihIcons.iDontKnow,
             size: 165,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
           const SizedBox(height: 10),
           Text(
@@ -63,8 +58,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             style: TextStyle(
               fontSize: 25,
               fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ),
         ],
@@ -80,8 +74,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
             Icon(
               MihIcons.personalProfile,
               size: 165,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
             const SizedBox(height: 10),
             Text(
@@ -91,8 +84,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
               style: TextStyle(
                 fontSize: 25,
                 fontWeight: FontWeight.bold,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
             ),
             const SizedBox(height: 25),
@@ -103,8 +95,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                   style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.normal,
-                    color: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.secondary(),
                   ),
                   children: [
                     TextSpan(
@@ -133,7 +124,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
     //     "Enter Username or Email to search",
     //     style: TextStyle(
     //         fontSize: 25,
-    //         color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
+    //         color: MihColors.grey()),
     //     textAlign: TextAlign.center,
     //   ),
     // );
@@ -156,6 +147,7 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(width),
@@ -176,10 +168,8 @@ class _MihBusinessUserSearchState extends State<MihBusinessUserSearch> {
                 controller: searchController,
                 hintText: "Search Users",
                 prefixIcon: Icons.search,
-                fillColor: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                hintColor: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                fillColor: MihColors.secondary(),
+                hintColor: MihColors.primary(),
                 onPrefixIconTap: () {
                   submitUserForm(profileProvider);
                 },

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart

@@ -1,8 +1,5 @@
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.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/mzansi_profile_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_objects/business_employee.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart';
 import 'package:flutter/material.dart';
@@ -35,10 +32,7 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
     return Center(
       child: Text(
         "",
-        style: TextStyle(
-            fontSize: 25,
-            color: MihColors.getGreyColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark")),
+        style: TextStyle(fontSize: 25, color: MihColors.grey()),
         textAlign: TextAlign.center,
       ),
     );
@@ -56,6 +50,7 @@ class _MihMyBusinessTeamState extends State<MihMyBusinessTeam> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(),
     );

mih_ui/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart

@@ -2,16 +2,12 @@ import 'dart:ui';
 
 import 'package:file_picker/file_picker.dart';
 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_package_components/mih_circle_avatar.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_image_display.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_window.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_update_my_business_user_details.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_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:provider/provider.dart';
 
 class MihMyBusinessUser extends StatefulWidget {
@@ -56,29 +52,24 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
     TextStyle titleStyle = TextStyle(
       fontSize: 30,
       fontWeight: FontWeight.bold,
-      color: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      color: MihColors.primary(),
     );
     TextStyle subtitleStyle = TextStyle(
       fontSize: 20,
       fontWeight: FontWeight.normal,
-      color: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      color: MihColors.primary(),
     );
     TextStyle subtitleHeadingStyle = TextStyle(
       fontSize: 20,
       fontWeight: FontWeight.bold,
-      color: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      color: MihColors.primary(),
     );
     return MihPackageWindow(
       fullscreen: false,
       windowTitle: "Employee Info Card",
       onWindowTapClose: null,
-      backgroundColor: MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-      foregroundColor: MihColors.getPrimaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+      backgroundColor: MihColors.secondary(),
+      foregroundColor: MihColors.primary(),
       windowBody: Column(
         mainAxisAlignment: MainAxisAlignment.start,
         crossAxisAlignment: CrossAxisAlignment.start,
@@ -162,6 +153,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth),
@@ -193,12 +185,8 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                             editable: false,
                             fileNameController: fileNameController,
                             userSelectedfile: userPicFile,
-                            frameColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            backgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            frameColor: MihColors.secondary(),
+                            backgroundColor: MihColors.primary(),
                             onChange: (_) {},
                           ),
                           Positioned(
@@ -209,18 +197,12 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                                 editBizUserProfileWindow(
                                     mzansiProfileProvider, width);
                               },
-                              buttonColor: MihColors.getGreenColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              buttonColor: MihColors.green(),
                               width: 35,
                               height: 35,
                               child: Icon(
                                 Icons.edit,
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                               ),
                             ),
                           ),
@@ -289,16 +271,13 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                       !mzansiProfileProvider.hideBusinessUserDetails);
                 },
                 buttonColor: mzansiProfileProvider.hideBusinessUserDetails
-                    ? MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark")
-                    : MihColors.getRedColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    ? MihColors.green()
+                    : MihColors.red(),
                 child: Icon(
                   mzansiProfileProvider.hideBusinessUserDetails
                       ? Icons.visibility
                       : Icons.visibility_off,
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                 ),
               ),
             ),

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart

@@ -2,16 +2,10 @@ import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.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_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_form.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.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_toggle.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_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
@@ -150,11 +144,9 @@ class _MihEditPersonalProfileWindowState
 
   Color getPurposeLimitColor(int limit) {
     if (_counter.value <= limit) {
-      return MihColors.getSecondaryColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.secondary();
     } else {
-      return MihColors.getRedColor(
-          MzansiInnovationHub.of(context)!.theme.mode == "Dark");
+      return MihColors.red();
     }
   }
 
@@ -176,15 +168,13 @@ class _MihEditPersonalProfileWindowState
               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,
             ),
@@ -211,15 +201,13 @@ class _MihEditPersonalProfileWindowState
               Icon(
                 MihIcons.businessSetup,
                 size: 150,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               Text(
                 "Setup Business Profile?",
                 textAlign: TextAlign.center,
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
                 ),
@@ -228,8 +216,7 @@ class _MihEditPersonalProfileWindowState
               Text(
                 "It looks like this is the first time activating your business account. Would you like to set up your business now or would you like to do it later?",
                 style: TextStyle(
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                   fontSize: 15,
                   fontWeight: FontWeight.bold,
                 ),
@@ -250,17 +237,13 @@ class _MihEditPersonalProfileWindowState
                           extra: profileProvider.user,
                         );
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       elevation: 10,
                       width: 300,
                       child: Text(
                         "Setup Business",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -272,17 +255,13 @@ class _MihEditPersonalProfileWindowState
                         context.pop();
                         context.pop();
                       },
-                      buttonColor: MihColors.getOrangeColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.orange(),
                       elevation: 10,
                       width: 300,
                       child: Text(
                         "Setup Later",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -347,12 +326,8 @@ class _MihEditPersonalProfileWindowState
                             editable: true,
                             fileNameController: proPicController,
                             userSelectedfile: newSelectedProPic,
-                            frameColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            backgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            frameColor: MihColors.secondary(),
+                            backgroundColor: MihColors.primary(),
                             onChange: (selectedImage) {
                               setState(() {
                                 newSelectedProPic = selectedImage;
@@ -364,12 +339,8 @@ class _MihEditPersonalProfileWindowState
                         Visibility(
                           visible: false,
                           child: 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: proPicController,
                             multiLineInput: false,
                             requiredText: true,
@@ -379,12 +350,8 @@ class _MihEditPersonalProfileWindowState
                         ),
                         const SizedBox(height: 10.0),
                         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: usernameController,
                           multiLineInput: false,
                           requiredText: true,
@@ -396,12 +363,8 @@ class _MihEditPersonalProfileWindowState
                         ),
                         const SizedBox(height: 10.0),
                         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: fnameController,
                           multiLineInput: false,
                           requiredText: true,
@@ -412,12 +375,8 @@ class _MihEditPersonalProfileWindowState
                         ),
                         const SizedBox(height: 10.0),
                         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: lnameController,
                           multiLineInput: false,
                           requiredText: true,
@@ -429,12 +388,8 @@ class _MihEditPersonalProfileWindowState
                         const SizedBox(height: 10.0),
                         MihTextFormField(
                           height: 250,
-                          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: purposeController,
                           multiLineInput: true,
                           requiredText: true,
@@ -478,12 +433,8 @@ class _MihEditPersonalProfileWindowState
                         MihToggle(
                           hintText: "Activate Business Account",
                           initialPostion: businessUser,
-                          fillColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
-                          secondaryFillColor: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          fillColor: MihColors.secondary(),
+                          secondaryFillColor: MihColors.primary(),
                           onChange: (value) {
                             setState(() {
                               businessUser = value;
@@ -502,20 +453,14 @@ class _MihEditPersonalProfileWindowState
                                 MihAlertServices().inputErrorAlert(context);
                               }
                             },
-                            buttonColor: MihColors.getGreenColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            buttonColor: MihColors.green(),
                             width: 300,
                             child: Text(
                               mzansiProfileProvider.user!.username.isEmpty
                                   ? "Setup Profile"
                                   : "Update",
                               style: TextStyle(
-                                color: MihColors.getPrimaryColor(
-                                    MzansiInnovationHub.of(context)!
-                                            .theme
-                                            .mode ==
-                                        "Dark"),
+                                color: MihColors.primary(),
                                 fontSize: 20,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -538,8 +483,7 @@ class _MihEditPersonalProfileWindowState
                         MihAlertServices().inputErrorAlert(context);
                       }
                     },
-                    buttonColor: MihColors.getGreenColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    buttonColor: MihColors.green(),
                     width: 100,
                     height: 25,
                     child: Text(
@@ -547,9 +491,7 @@ class _MihEditPersonalProfileWindowState
                           ? "Setup Profile"
                           : "Update",
                       style: TextStyle(
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
                       ),

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile.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/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart';
@@ -61,11 +58,11 @@ class _MzansiProfileState extends State<MzansiProfile> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: profileProvider.personalIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: profileProvider.personalIndex,
           onIndexChange: (newIndex) {
             profileProvider.setPersonalIndex(newIndex);
           },
@@ -101,7 +98,7 @@ class _MzansiProfileState extends State<MzansiProfile> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiProfileProvider>().personalIndex,
+      selectedIndex: context.watch<MzansiProfileProvider>().personalIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/mzansi_profile_view.dart

@@ -1,7 +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:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart';
 import 'package:flutter/material.dart';
 
@@ -15,7 +13,7 @@ class MzansiProfileView extends StatefulWidget {
 }
 
 class _MzansiProfileViewState extends State<MzansiProfileView> {
-  int _selcetedIndex = 0;
+  int _selectedIndex = 0;
   late final MihPersonalProfileView _personalProfileView;
 
   @override
@@ -27,14 +25,14 @@ class _MzansiProfileViewState extends State<MzansiProfileView> {
   @override
   Widget build(BuildContext context) {
     return MihPackage(
-      appActionButton: getAction(),
-      appTools: getTools(),
-      appBody: getToolBody(),
-      appToolTitles: getToolTitle(),
-      selectedbodyIndex: _selcetedIndex,
+      packageActionButton: getAction(),
+      packageTools: getTools(),
+      packageToolBodies: getToolBody(),
+      packageToolTitles: getToolTitle(),
+      selectedBodyIndex: _selectedIndex,
       onIndexChange: (newValue) {
         setState(() {
-          _selcetedIndex = newValue;
+          _selectedIndex = newValue;
         });
       },
     );
@@ -55,12 +53,12 @@ class _MzansiProfileViewState extends State<MzansiProfileView> {
     Map<Widget, void Function()?> temp = {};
     temp[const Icon(Icons.person)] = () {
       setState(() {
-        _selcetedIndex = 0;
+        _selectedIndex = 0;
       });
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: _selcetedIndex,
+      selectedIndex: _selectedIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_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 MzansiProfileTile extends StatefulWidget {
   final double packageSize;
@@ -27,16 +24,14 @@ class _MzansiProfileTileState extends State<MzansiProfileTile> {
           'mzansiProfileManage',
         );
       },
-      appName: "Mzansi Profile",
-      appIcon: Icon(
+      packageName: "Mzansi Profile",
+      packageIcon: Icon(
         MihIcons.mihLogo,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_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 MzansiSetupProfileTile extends StatefulWidget {
   final double packageSize;
@@ -26,16 +23,14 @@ class _MzansiSetupProfileTileState extends State<MzansiSetupProfileTile> {
           'mzansiProfileManage',
         );
       },
-      appName: "Set Up Profile",
-      appIcon: Icon(
+      packageName: "Set Up Profile",
+      packageIcon: Icon(
         MihIcons.profileSetup,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart

@@ -1,15 +1,10 @@
 import 'package:file_picker/file_picker.dart';
 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/profile_link.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
-// import 'package:mzansi_innovation_hub/mih_package_components/mih_profile_links.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_loading_circle.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_packages/mzansi_profile/personal_profile/components/mih_edit_personal_profile_window.dart';
 import 'package:provider/provider.dart';
 
@@ -130,6 +125,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(screenWidth),
     );
@@ -164,12 +160,8 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                         editable: false,
                         fileNameController: proPicController,
                         userSelectedfile: newSelectedProPic,
-                        frameColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
-                        backgroundColor: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        frameColor: MihColors.secondary(),
+                        backgroundColor: MihColors.primary(),
                         onChange: (selectedImage) {
                           setState(() {
                             newSelectedProPic = selectedImage;
@@ -184,16 +176,12 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                           onPressed: () {
                             editProfileWindow(width);
                           },
-                          buttonColor: MihColors.getGreenColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.green(),
                           width: 35,
                           height: 35,
                           child: Icon(
                             Icons.edit,
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                           ),
                         ),
                       ),
@@ -208,9 +196,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       style: TextStyle(
                         fontSize: 35,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                   ),
@@ -222,9 +208,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       style: TextStyle(
                         fontSize: 25,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                   ),
@@ -236,9 +220,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                   ),
@@ -254,9 +236,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                         style: TextStyle(
                           fontSize: 15,
                           fontWeight: FontWeight.bold,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                     ),
@@ -277,14 +257,14 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                   //         onPressed: () {
                   //           editProfileWindow(width);
                   //         },
-                  //         buttonColor: MihColors.getGreenColor(
+                  //         buttonColor: MihColors.green(
                   //             MzansiInnovationHub.of(context)!.theme.mode ==
                   //                 "Dark"),
                   //         width: 35,
                   //         height: 35,
                   //         child: Icon(
                   //           Icons.link,
-                  //           color: MihColors.getPrimaryColor(
+                  //           color: MihColors.primary(
                   //               MzansiInnovationHub.of(context)!.theme.mode ==
                   //                   "Dark"),
                   //         ),

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart

@@ -1,11 +1,8 @@
 import 'package:cached_network_image/cached_network_image.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_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_directory_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_package_components/mih_circle_avatar.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
@@ -42,6 +39,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
   Widget build(BuildContext context) {
     double screenWidth = MediaQuery.of(context).size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       innerHorizontalPadding: 10,
       bodyItem: getBody(screenWidth),
@@ -78,30 +76,22 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                             editable: false,
                             fileNameController: TextEditingController(),
                             userSelectedfile: file,
-                            frameColor: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
-                            backgroundColor: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            frameColor: MihColors.secondary(),
+                            backgroundColor: MihColors.primary(),
                             onChange: () {},
                           );
                         } else {
                           return Icon(
                             MihIcons.iDontKnow,
                             size: profilePictureWidth,
-                            color: MihColors.getSecondaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.secondary(),
                           );
                         }
                       } else {
                         return Icon(
                           MihIcons.mihRing,
                           size: profilePictureWidth,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         );
                       }
                     }),
@@ -113,9 +103,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                     style: TextStyle(
                       fontSize: 35,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -127,9 +115,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                     style: TextStyle(
                       fontSize: 25,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -139,9 +125,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                     style: TextStyle(
                       fontSize: 15,
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -157,9 +141,7 @@ class _MihPersonalProfileViewState extends State<MihPersonalProfileView> {
                       style: TextStyle(
                         fontSize: 15,
                         fontWeight: FontWeight.bold,
-                        color: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.secondary(),
                       ),
                     ),
                   ),

mih_ui/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart

@@ -1,11 +1,7 @@
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.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_user_services.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_single_child_scroll.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
@@ -26,6 +22,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
       builder: (BuildContext context,
           MzansiProfileProvider mzansiProfileProvider, Widget? child) {
         return MihPackageToolBody(
+          backgroundColor: MihColors.primary(),
           borderOn: false,
           innerHorizontalPadding: 10,
           bodyItem: getBody(mzansiProfileProvider),
@@ -44,14 +41,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           onPressed: () {
             MihUserServices.deleteAccount(mzansiProfileProvider, context);
           },
-          buttonColor: MihColors.getPrimaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.primary(),
           width: 300,
           child: Text(
             "Delete",
             style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -61,14 +56,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           onPressed: () {
             Navigator.pop(context);
           },
-          buttonColor: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.green(),
           width: 300,
           child: Text(
             "Cancel",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -87,8 +80,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
           Center(
             child: FaIcon(
               FontAwesomeIcons.trashCan,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
               size: 150,
             ),
           ),
@@ -99,8 +91,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             style: TextStyle(
               fontSize: 18,
               fontWeight: FontWeight.bold,
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ),
           const SizedBox(height: 10.0),
@@ -108,14 +99,12 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
             onPressed: () {
               deleteAccountPopUp(mzansiProfileProvider, context);
             },
-            buttonColor: MihColors.getRedColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            buttonColor: MihColors.red(),
             width: 300,
             child: Text(
               "Delete Account",
               style: TextStyle(
-                color: MihColors.getPrimaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.primary(),
                 fontSize: 20,
                 fontWeight: FontWeight.bold,
               ),

mih_ui/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart

@@ -4,19 +4,14 @@ import 'package:flutter/foundation.dart';
 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_package_components/mih_banner_ad.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_icons.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_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_wallet_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_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_objects/loyalty_card.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_card_display.dart';
 import 'package:flutter/material.dart';
@@ -84,10 +79,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 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: _nicknameController,
                     multiLineInput: false,
                     requiredText: false,
@@ -101,12 +94,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     children: [
                       Flexible(
                         child: 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: _cardNumberController,
                           multiLineInput: false,
                           requiredText: true,
@@ -122,16 +111,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         onPressed: () {
                           openscanner();
                         },
-                        buttonColor: MihColors.getSecondaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.secondary(),
                         width: 100,
                         child: Text(
                           "Scan",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -171,16 +156,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                           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,
                         ),
@@ -236,14 +217,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           onPressed: () async {
             context.pop();
           },
-          buttonColor: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.red(),
           width: 300,
           child: Text(
             "Cancel",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -280,14 +259,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               MihAlertServices().internetConnectionAlert(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,
             ),
@@ -335,14 +312,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               MihAlertServices().internetConnectionAlert(context);
             }
           },
-          buttonColor: MihColors.getRedColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.red(),
           width: 300,
           child: Text(
             "Remove",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -352,14 +327,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           onPressed: () async {
             context.pop();
           },
-          buttonColor: MihColors.getGreenColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          buttonColor: MihColors.green(),
           width: 300,
           child: Text(
             "Cancel",
             style: TextStyle(
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
               fontSize: 20,
               fontWeight: FontWeight.bold,
             ),
@@ -391,26 +364,21 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
             child: widget.cardList[index].favourite == ""
                 ? Icon(
                     Icons.favorite,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   )
                 : Icon(
                     Icons.favorite_border,
-                    color: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    color: MihColors.primary(),
                   ),
             label: widget.cardList[index].favourite == ""
                 ? "Add to Favourite"
                 : "Remove from Favourite",
-            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: () {
               if (widget.cardList[index].favourite == "") {
                 addToFavCardWindow(
@@ -432,19 +400,15 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.edit,
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
             ),
             label: "Edit Card Details",
-            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: () {
               setState(() {
                 _cardNumberController.text = widget.cardList[index].card_number;
@@ -462,19 +426,15 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
           SpeedDialChild(
             child: Icon(
               Icons.delete,
-              color: MihColors.getPrimaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.primary(),
             ),
             label: "Delete Card",
-            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: () {
               deleteCardWindow(
                 mzansiProfileProvider,
@@ -517,7 +477,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                       height: 75,
                       // width: 300,
                       child: BarcodeWidget(
-                        //color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                        //color: MihColors.secondary(),
                         barcode: Barcode.code128(),
                         backgroundColor: Colors.white,
                         data: widget.cardList[index].card_number,
@@ -540,7 +500,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         color: Colors.black,
                         fontSize: 25,
                         fontWeight: FontWeight.bold
-                        //MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                        //MihColors.secondary(),
                         ),
                   ),
                 ],
@@ -602,14 +562,12 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 await ScreenBrightness.instance
                     .setSystemScreenBrightness(newBrightness);
               },
-              buttonColor: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              buttonColor: MihColors.secondary(),
               width: 300,
               child: Text(
                 "Grant Permission",
                 style: TextStyle(
-                  color: MihColors.getPrimaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.primary(),
                   fontSize: 20,
                   fontWeight: FontWeight.bold,
                 ),
@@ -701,8 +659,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.iDontKnow,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               const SizedBox(height: 10),
               Text(
@@ -712,8 +669,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
             ],
@@ -729,8 +685,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.mzansiWallet,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               const SizedBox(height: 10),
               Text(
@@ -740,8 +695,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 25),
@@ -752,9 +706,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -763,9 +715,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         child: Icon(
                           Icons.menu,
                           size: 20,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                       TextSpan(text: " to add your first loyalty card"),
@@ -787,8 +737,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               Icon(
                 MihIcons.mzansiWallet,
                 size: 165,
-                color: MihColors.getSecondaryColor(
-                    MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                color: MihColors.secondary(),
               ),
               const SizedBox(height: 10),
               Text(
@@ -798,8 +747,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                 style: TextStyle(
                   fontSize: 25,
                   fontWeight: FontWeight.bold,
-                  color: MihColors.getSecondaryColor(
-                      MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                  color: MihColors.secondary(),
                 ),
               ),
               const SizedBox(height: 25),
@@ -810,9 +758,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.normal,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                     children: [
                       TextSpan(text: "Press "),
@@ -821,9 +767,7 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                         child: Icon(
                           Icons.menu,
                           size: 20,
-                          color: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.secondary(),
                         ),
                       ),
                       TextSpan(

mih_ui/lib/mih_packages/mzansi_wallet/components/mih_add_card_window.dart

@@ -1,15 +1,10 @@
 import 'package:flutter/material.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_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_dropdwn_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_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_card_display.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_wallet_services.dart';
@@ -168,12 +163,8 @@ class _MihAddCardWindowState extends State<MihAddCardWindow> {
                     ),
                     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: _nicknameController,
                       multiLineInput: false,
                       requiredText: false,
@@ -187,12 +178,8 @@ class _MihAddCardWindowState extends State<MihAddCardWindow> {
                       children: [
                         Flexible(
                           child: 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: _cardNumberController,
                             multiLineInput: false,
                             requiredText: true,
@@ -212,16 +199,12 @@ class _MihAddCardWindowState extends State<MihAddCardWindow> {
                                   _cardNumberController, // Use local controller
                             );
                           },
-                          buttonColor: MihColors.getSecondaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          buttonColor: MihColors.secondary(),
                           width: 100,
                           child: Text(
                             "Scan",
                             style: TextStyle(
-                              color: MihColors.getPrimaryColor(
-                                  MzansiInnovationHub.of(context)!.theme.mode ==
-                                      "Dark"),
+                              color: MihColors.primary(),
                               fontSize: 20,
                               fontWeight: FontWeight.bold,
                             ),
@@ -266,16 +249,12 @@ class _MihAddCardWindowState extends State<MihAddCardWindow> {
                             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,
                           ),

mih_ui/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart

@@ -1,10 +1,8 @@
 import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mobile_scanner/mobile_scanner.dart';
-import 'package:mzansi_innovation_hub/main.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_button.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 
 class MihBarcodeScanner extends StatefulWidget {
   final TextEditingController cardNumberController;
@@ -107,9 +105,7 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                   decoration: BoxDecoration(
                     border: Border.all(
                       width: 5,
-                      color: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.secondary(),
                     ),
                   ),
                 ),
@@ -127,17 +123,13 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                         _scannerController.stop();
                         context.pop();
                       },
-                      buttonColor: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.red(),
                       width: 100,
                       height: 50,
                       child: Text(
                         "Cancel",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),

mih_ui/lib/mih_packages/mzansi_wallet/mih_wallet.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/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart';
 import 'package:flutter/material.dart';
@@ -82,11 +79,11 @@ class _MihWalletState extends State<MihWallet> {
           );
         }
         return MihPackage(
-          appActionButton: getAction(),
-          appTools: getTools(),
-          appBody: getToolBody(),
-          appToolTitles: getToolTitle(),
-          selectedbodyIndex: walletProvider.toolIndex,
+          packageActionButton: getAction(),
+          packageTools: getTools(),
+          packageToolBodies: getToolBody(),
+          packageToolTitles: getToolTitle(),
+          selectedBodyIndex: walletProvider.toolIndex,
           onIndexChange: (newIndex) {
             walletProvider.setToolIndex(newIndex);
           },
@@ -118,7 +115,7 @@ class _MihWalletState extends State<MihWallet> {
     };
     return MihPackageTools(
       tools: temp,
-      selcetedIndex: context.watch<MzansiWalletProvider>().toolIndex,
+      selectedIndex: context.watch<MzansiWalletProvider>().toolIndex,
     );
   }
 

mih_ui/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_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 MihWalletTile extends StatefulWidget {
   final double packageSize;
@@ -31,16 +28,14 @@ class _MihWalletTileState extends State<MihWalletTile> {
         //   arguments: WalletArguments(widget.signedInUser, 0),
         // );
       },
-      appName: "Mzansi Wallet",
-      appIcon: Icon(
+      packageName: "Mzansi Wallet",
+      packageIcon: Icon(
         MihIcons.mzansiWallet,
-        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(),
     );
   }
 }

mih_ui/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_package_tool_body.dart';
 import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart';
 import 'package:provider/provider.dart';
@@ -33,6 +33,7 @@ class _MihCardFavouritesState extends State<MihCardFavourites> {
   @override
   Widget build(BuildContext context) {
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(),
     );

mih_ui/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart

@@ -1,11 +1,7 @@
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_wallet_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/components/mih_add_card_window.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_search_bar.dart';
 import 'package:mzansi_innovation_hub/mih_objects/loyalty_card.dart';
 import 'package:mzansi_innovation_hub/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart';
 import 'package:flutter/material.dart';
@@ -93,6 +89,7 @@ class _MihCardsState extends State<MihCards> {
     final Size size = MediaQuery.sizeOf(context);
     final double width = size.width;
     return MihPackageToolBody(
+      backgroundColor: MihColors.primary(),
       borderOn: false,
       bodyItem: getBody(width),
     );
@@ -119,10 +116,8 @@ class _MihCardsState extends State<MihCards> {
                     hintText: "Search Cards",
                     // prefixIcon: Icons.search,
                     prefixIcon: Icons.search,
-                    fillColor: MihColors.getSecondaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
-                    hintColor: MihColors.getPrimaryColor(
-                        MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+                    fillColor: MihColors.secondary(),
+                    hintColor: MihColors.primary(),
                     onPrefixIconTap: () {
                       // print("Search Icon Pressed: ${cardSearchController.text}");
                     },
@@ -154,23 +149,15 @@ class _MihCardsState extends State<MihCards> {
                     SpeedDialChild(
                       child: Icon(
                         Icons.add,
-                        color: MihColors.getPrimaryColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.primary(),
                       ),
                       label: "Add Loyalty Card",
-                      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: () {
                         addCardWindow(context, width);
                       },

mih_ui/lib/mih_packages/patient_manager/pat_manager/list_builders/build_mih_patient_search_list.dart

@@ -1,16 +1,12 @@
 import 'package:go_router/go_router.dart';
 import 'package:ken_logger/ken_logger.dart';
-import 'package:mzansi_innovation_hub/main.dart';
+import 'package:mih_package_toolkit/mih_package_toolkit.dart';
 import 'package:mzansi_innovation_hub/mih_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/patient_manager_provider.dart';
-import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_access_controls_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_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_package_window.dart';
-import 'package:mzansi_innovation_hub/mih_package_components/mih_text_form_field.dart';
 import 'package:mzansi_innovation_hub/mih_config/mih_env.dart';
 import 'package:mzansi_innovation_hub/mih_objects/arguments.dart';
 import 'package:flutter/material.dart';
@@ -138,10 +134,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         windowBody: Column(
           children: [
             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: idController,
               multiLineInput: false,
               requiredText: true,
@@ -153,10 +147,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             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: fnameController,
               multiLineInput: false,
               requiredText: true,
@@ -168,10 +160,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             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: lnameController,
               multiLineInput: false,
               requiredText: true,
@@ -183,10 +173,8 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             ),
             const SizedBox(height: 10.0),
             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: accessStatusController,
               multiLineInput: false,
               requiredText: true,
@@ -207,18 +195,14 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                     "Important Notice: Requesting Patient Profile Access",
                     style: TextStyle(
                       fontWeight: FontWeight.bold,
-                      color: MihColors.getRedColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.red(),
                     ),
                   ),
                   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(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.red(),
                     ),
                   ),
                   SizedBox(
@@ -227,9 +211,7 @@ 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(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                   ),
@@ -239,9 +221,7 @@ 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(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                   ),
@@ -251,9 +231,7 @@ 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(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        color: MihColors.red(),
                       ),
                     ),
                   ),
@@ -261,9 +239,7 @@ 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(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      color: MihColors.red(),
                     ),
                   ),
                 ],
@@ -313,16 +289,12 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                             );
                           }
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                         width: 300,
                         child: Text(
                           "View Profile",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -353,16 +325,12 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                           refreshMyPatientList(
                               profileProvider, patientManagerProvider);
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                         width: 300,
                         child: Text(
                           "Request Access",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -391,16 +359,12 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                           refreshMyPatientList(
                               profileProvider, patientManagerProvider);
                         },
-                        buttonColor: MihColors.getGreenColor(
-                            MzansiInnovationHub.of(context)!.theme.mode ==
-                                "Dark"),
+                        buttonColor: MihColors.green(),
                         width: 300,
                         child: Text(
                           "Re-apply",
                           style: TextStyle(
-                            color: MihColors.getPrimaryColor(
-                                MzansiInnovationHub.of(context)!.theme.mode ==
-                                    "Dark"),
+                            color: MihColors.primary(),
                             fontSize: 20,
                             fontWeight: FontWeight.bold,
                           ),
@@ -438,8 +402,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
             // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
             "${patientManagerProvider.patientSearchResults[index].first_name} ${patientManagerProvider.patientSearchResults[index].last_name}",
             style: TextStyle(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             ),
           ),
           const SizedBox(
@@ -447,8 +410,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
           ),
           Icon(
             Icons.star_border_rounded,
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
         ],
       );
@@ -457,8 +419,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar",
         "${patientManagerProvider.patientSearchResults[index].first_name} ${patientManagerProvider.patientSearchResults[index].last_name}",
         style: TextStyle(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
         ),
       );
     }
@@ -488,8 +449,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: $displayedIdNo\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
         ),
         onTap: () {
@@ -505,8 +465,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.arrow_forward,
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
         ),
       );
     } else {
@@ -515,8 +474,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         subtitle: Text(
           "ID No.: $displayedIdNo\nMedical Aid No.: $medAidNoStar",
           style: TextStyle(
-            color: MihColors.getSecondaryColor(
-                MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+            color: MihColors.secondary(),
           ),
         ),
         onTap: () {
@@ -531,8 +489,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         },
         trailing: Icon(
           Icons.add,
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
         ),
       );
     }
@@ -560,8 +517,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: patientManagerProvider.patientSearchResults.length,

mih_ui/lib/mih_packages/patient_manager/pat_manager/list_builders/build_my_patient_list_list.dart

@@ -1,20 +1,14 @@
 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_providers/mzansi_profile_provider.dart';
 import 'package:mzansi_innovation_hub/mih_providers/patient_manager_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_file_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_patient_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart';
 import 'package:mzansi_innovation_hub/mih_services/mih_user_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';
@@ -84,15 +78,13 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               lnameController.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,
             ),
@@ -144,10 +136,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                 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: idController,
                     multiLineInput: false,
                     requiredText: true,
@@ -159,10 +149,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   ),
                   const SizedBox(height: 10.0),
                   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: fnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -174,10 +162,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                   ),
                   const SizedBox(height: 10.0),
                   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: lnameController,
                     multiLineInput: false,
                     requiredText: true,
@@ -221,16 +207,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                           MihAlertServices().inputErrorAlert(context);
                         }
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -305,10 +287,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
           child: Column(
             children: [
               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: idController,
                 multiLineInput: false,
                 requiredText: true,
@@ -320,10 +300,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               ),
               const SizedBox(height: 10.0),
               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: fnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -335,10 +313,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
               ),
               const SizedBox(height: 10.0),
               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: lnameController,
                 multiLineInput: false,
                 requiredText: true,
@@ -362,16 +338,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                         appointmentPopUp(profileProvider,
                             patientManagerProvider, index, width);
                       },
-                      buttonColor: MihColors.getGreenColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.green(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -387,16 +359,12 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                           'patientManagerPatient',
                         );
                       },
-                      buttonColor: MihColors.getSecondaryColor(
-                          MzansiInnovationHub.of(context)!.theme.mode ==
-                              "Dark"),
+                      buttonColor: MihColors.secondary(),
                       width: 300,
                       child: Text(
                         "View Medical Records",
                         style: TextStyle(
-                          color: MihColors.getPrimaryColor(
-                              MzansiInnovationHub.of(context)!.theme.mode ==
-                                  "Dark"),
+                          color: MihColors.primary(),
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                         ),
@@ -430,38 +398,28 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       firstName = patientManagerProvider.myPaitentList![index].fname;
       lastName = patientManagerProvider.myPaitentList![index].lname;
       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") {
       firstName =
           "${patientManagerProvider.myPaitentList![index].fname[0]}********";
       lastName =
           "${patientManagerProvider.myPaitentList![index].lname[0]}********";
       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 {
       firstName =
           "${patientManagerProvider.myPaitentList![index].fname[0]}********";
       lastName =
           "${patientManagerProvider.myPaitentList![index].lname[0]}********";
-      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(
         "$firstName $lastName",
         style: TextStyle(
-          color: MihColors.getSecondaryColor(
-              MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+          color: MihColors.secondary(),
         ),
       ),
       subtitle: RichText(
@@ -497,8 +455,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
       },
       trailing: Icon(
         Icons.arrow_forward,
-        color: MihColors.getSecondaryColor(
-            MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+        color: MihColors.secondary(),
       ),
     );
   }
@@ -527,8 +484,7 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
         return ListView.separated(
           separatorBuilder: (BuildContext context, index) {
             return Divider(
-              color: MihColors.getSecondaryColor(
-                  MzansiInnovationHub.of(context)!.theme.mode == "Dark"),
+              color: MihColors.secondary(),
             );
           },
           itemCount: patientManagerProvider.myPaitentList!.length,