diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart index b92a082e..52886370 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_one.dart @@ -104,14 +104,12 @@ class _PackageToolOneState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Window", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { // showTestWindow(); }, @@ -694,8 +692,7 @@ class _PackageToolOneState extends State { onPressed: () { print("Button Pressed"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -824,15 +821,13 @@ class _PackageToolOneState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Window", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { showTestWindow(); }, @@ -844,15 +839,13 @@ class _PackageToolOneState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Full Window", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { showTestFullWindow(); }, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart b/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart index daa98710..e9cfdd47 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../../main.dart'; import 'package:table_calendar/table_calendar.dart'; @@ -64,7 +65,7 @@ class _MIHCalendarState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), todayDecoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.successColor(), + color: MihColors.getGreenColor(context), shape: BoxShape.circle, ), selectedTextStyle: TextStyle( diff --git a/Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart b/Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart index cee9c9df..36ae5dcc 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_floating_menu.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihFloatingMenu extends StatefulWidget { final IconData? icon; @@ -30,7 +31,7 @@ class _MihFloatingMenuState extends State { animatedIcon: widget.animatedIcon, direction: widget.direction ?? SpeedDialDirection.up, activeIcon: Icons.close, - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), activeBackgroundColor: MzansiInnovationHub.of(context)!.theme.errorColor(), foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart b/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart index bdd19659..b0e804dd 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihToggle extends StatefulWidget { final String hintText; @@ -79,7 +80,7 @@ class _MihToggleState extends State { widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, activeTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MzansiInnovationHub.of(context)!.theme.successColor(), + : MihColors.getGreenColor(context), inactiveThumbColor: widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, inactiveTrackColor: widget.readOnly == true diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart index ab685b6e..c920d9d7 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_success_message.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; class MIHSuccessMessage extends StatefulWidget { @@ -61,9 +62,8 @@ class _MIHSuccessMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.successColor(), - width: 5.0), + border: + Border.all(color: MihColors.getGreenColor(context), width: 5.0), ), child: Column( mainAxisSize: MainAxisSize.min, @@ -71,14 +71,14 @@ class _MIHSuccessMessageState extends State { Icon( Icons.check_circle_outline_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.successColor(), + color: MihColors.getGreenColor(context), ), //const SizedBox(height: 15), Text( "Success!", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.successColor(), + color: MihColors.getGreenColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -100,8 +100,7 @@ class _MIHSuccessMessageState extends State { onPressed: () { Navigator.pop(context); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Dismiss", diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart index e5e09c41..28d51598 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_ attributes.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:url_launcher/url_launcher.dart'; class MihAttributes extends StatefulWidget { @@ -70,8 +71,7 @@ class _MihAttributesState extends State { ), ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 100, child: Text( "Visit", diff --git a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart index 703a8e10..6858f506 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tools/mih_info.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_install_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_tile.dart'; @@ -541,8 +542,7 @@ class _MihInfoState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: getInstallButtonText(), ), @@ -554,8 +554,7 @@ class _MihInfoState extends State { ), ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -588,8 +587,7 @@ class _MihInfoState extends State { ), ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, @@ -653,14 +651,12 @@ class _MihInfoState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - Web", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { shareMIHLink( context, @@ -675,14 +671,12 @@ class _MihInfoState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - iOS", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { shareMIHLink( context, @@ -697,14 +691,12 @@ class _MihInfoState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - Android", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { shareMIHLink( context, diff --git a/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart b/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart index 5d598163..aff1475b 100644 --- a/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart +++ b/Frontend/lib/mih_packages/access_review/builder/build_access_request_list.dart @@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; @@ -131,8 +132,7 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.successColor())); + style: TextStyle(color: MihColors.getGreenColor(context))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", @@ -266,8 +266,7 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "approved"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Approve", diff --git a/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart b/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart index 25b7c2c9..def3f24a 100644 --- a/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart +++ b/Frontend/lib/mih_packages/access_review/builder/build_business_access_list.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; @@ -84,8 +85,7 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.successColor())); + style: TextStyle(color: MihColors.getGreenColor(context))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", @@ -382,8 +382,7 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Approve", diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index 194b8d93..10b918d3 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -6,6 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_layout_build import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/mih_profile_getter.dart'; import 'package:flutter/material.dart'; import 'package:local_auth/local_auth.dart'; @@ -155,8 +156,7 @@ class _BiometricCheckState extends State { Navigator.of(context).pop(); authenticateUser(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Authenticate Now", @@ -228,8 +228,7 @@ class _BiometricCheckState extends State { onPressed: () { authenticateUser(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Authenticate Now", diff --git a/Frontend/lib/mih_packages/authentication/forgot_password.dart b/Frontend/lib/mih_packages/authentication/forgot_password.dart index e91ded04..bb82d225 100644 --- a/Frontend/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/lib/mih_packages/authentication/forgot_password.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter/material.dart'; import 'package:flutter/services.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_components/mih_package_components/mih_button.dart'; @@ -121,8 +122,7 @@ class _ForgotPasswordState extends State { Navigator.of(context).pop(); validateInput(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Continue", diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index 5413e022..c8b29aef 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -1,5 +1,6 @@ import 'dart:convert'; +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_install_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; @@ -239,7 +240,7 @@ class _RegisterState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 150, child: Text( "Install MIH", diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 385aebe9..4ec7d03a 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +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_install_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; @@ -303,7 +304,7 @@ class _SignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 150, child: Text( "Install MIH", diff --git a/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart index e0072c8e..9d1dcd16 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_access_request_list.dart @@ -5,6 +5,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/access_request. import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -133,8 +134,7 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.successColor())); + style: TextStyle(color: MihColors.getGreenColor(context))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", @@ -268,8 +268,7 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "approved"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Approve", diff --git a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart index 786eb960..c5f16642 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_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'; @@ -95,8 +96,7 @@ class _BuildAppointmentListState extends State { appointmentColor = MzansiInnovationHub.of(context)!.theme.messageTextColor(); } else if (appointHour == hourNow) { - appointmentColor = - MzansiInnovationHub.of(context)!.theme.successColor(); + appointmentColor = MihColors.getGreenColor(context); } } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) { appointmentColor = @@ -161,14 +161,12 @@ class _BuildAppointmentListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -179,14 +177,12 @@ class _BuildAppointmentListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deleteAppointmentConfirmationWindow(index); }, @@ -279,14 +275,12 @@ class _BuildAppointmentListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -297,14 +291,12 @@ class _BuildAppointmentListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deleteAppointmentConfirmationWindow(index); }, diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index 407d278d..bfb7c56f 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.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'; @@ -403,14 +404,12 @@ class _PatientAccessRequestState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { addAppointmentWindow(width); }, diff --git a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart index e15c58c2..4d2b7a66 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -15,6 +15,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; import 'package:supertokens_flutter/http.dart' as http; import "package:universal_html/html.dart" as html; @@ -866,15 +867,13 @@ class _MIHHomeLegacyState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete File", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () {}, ), ], diff --git a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart index 9929d6e7..3b44db14 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_action.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tools.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/mih_home.dart'; import 'package:flutter/material.dart'; @@ -120,8 +121,7 @@ class _MIHProfileGetterState extends State { onPressed: () { Navigator.of(context).popAndPushNamed("/"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Refresh", diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart index b3bb8aec..2288a069 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tools/ai_chat.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_dropdwn_field.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_numeric_stepper.dart'; @@ -193,16 +194,14 @@ class _AiChatState extends State { .primaryColor(), ), label: "Read Aloud", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { _speakText(snapshot.requireData); }, @@ -313,7 +312,7 @@ class _AiChatState extends State { inputTextCursorColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.successColor(), + secondaryColor: MihColors.getGreenColor(context), errorColor: MzansiInnovationHub.of(context)!.theme.errorColor(), sentMessageBodyTextStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), @@ -752,14 +751,12 @@ class _AiChatState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "New Chat", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { _resetChat(); }, @@ -770,14 +767,12 @@ class _AiChatState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Settings", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { if (_showModelOptions.value == true) { setState(() { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart index aed810a9..1b1cd49c 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_employee_list.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -164,14 +165,12 @@ class _BuildEmployeeListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Employee", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { showDeleteWarning(index); }, @@ -257,8 +256,7 @@ class _BuildEmployeeListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Update", diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart index 565f8910..302fb6c7 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_add_bookmark_alert.dart @@ -105,8 +105,7 @@ class _MihAddBookmarkAlertState extends State { onPressed: () { addBookmark(widget.business.business_id); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), child: Text( "Bookmark Business", style: TextStyle( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart index ab0e46df..3d6ea82a 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_delete_bookmark_alert.dart @@ -103,8 +103,7 @@ class _MihDeleteBookmarkAlertState extends State { onPressed: () async { Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), child: Text( "Cancel", style: TextStyle( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart index ab3b2318..083127aa 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_review_business_window.dart @@ -134,8 +134,7 @@ class _MihReviewBusinessWindowState extends State { onPressed: () { Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), child: Text( "Cancel", style: TextStyle( @@ -305,14 +304,12 @@ class _MihReviewBusinessWindowState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Review", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { showDeleteReviewAlert(); }, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart index 6c0dd053..f417ef12 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_business_details_services.dart'; @@ -779,8 +780,7 @@ class _MihBusinessDetailsState extends State { // Connect with the user editBizProfileWindow(width); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Edit Profile", @@ -811,13 +811,13 @@ class _MihBusinessDetailsState extends State { // ), // label: "Edit Profile", // labelBackgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // labelStyle: TextStyle( // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // onTap: () { // editBizProfileWindow(width); // }, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart index 2cd4579c..cd2b3164 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_user.dart @@ -1,6 +1,7 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_my_business_user_services.dart'; @@ -359,8 +360,7 @@ class _MihMyBusinessUserState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Update", diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart index ce17f9ce..85b8b2c1 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.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_user_services.dart'; @@ -367,8 +368,7 @@ class _MihPersonalProfileState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Update", @@ -541,8 +541,7 @@ class _MihPersonalProfileState extends State { // Connect with the user editProfileWindow(width); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( widget.arguments.signedInUser.username.isEmpty @@ -575,13 +574,13 @@ class _MihPersonalProfileState extends State { // ), // label: "Edit Profile", // labelBackgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // labelStyle: TextStyle( // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // onTap: () { // editProfileWindow(width); // }, diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart index edfccf9e..54ff4696 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_profile_view.dart @@ -175,7 +175,7 @@ class _MihPersonalProfileViewState extends State { // // Connect with the user // }, // buttonColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // width: 300, // child: Text( // widget.user.username.isEmpty diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart index a14d7877..944a7e7a 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tools/mih_personal_settings.dart @@ -1,4 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_user_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; @@ -82,8 +83,7 @@ class _MihPersonalSettingsState extends State { onPressed: () { Navigator.pop(context); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Cancel", diff --git a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart index 9447cf4f..f9ced553 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/builder/build_loyalty_card_list.dart @@ -2,6 +2,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_banner_ad.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.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'; @@ -151,8 +152,7 @@ class _BuildLoyaltyCardListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Update", @@ -200,10 +200,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MzansiInnovationHub.of(context)!.theme.successColor(), + alertColour: MihColors.getGreenColor(context), alertIcon: Icon( Icons.favorite, - color: MzansiInnovationHub.of(context)!.theme.successColor(), + color: MihColors.getGreenColor(context), size: 100, ), alertTitle: "Add to Favourites", @@ -233,8 +233,7 @@ class _BuildLoyaltyCardListState extends State { ctxt, ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Add", @@ -343,14 +342,12 @@ class _BuildLoyaltyCardListState extends State { label: widget.cardList[index].favourite == "" ? "Add to Favourite" : "Remove from Favourite", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { if (widget.cardList[index].favourite == "") { addToFavCardWindow(context, index); @@ -365,14 +362,12 @@ class _BuildLoyaltyCardListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Card Details", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { setState(() { _cardNumberController.text = widget.cardList[index].card_number; @@ -387,14 +382,12 @@ class _BuildLoyaltyCardListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Card", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deleteCardWindow(context, index); }, diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart index 3b8e582d..879c04cd 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_card_favourites.dart @@ -96,14 +96,14 @@ class _MihCardFavouritesState extends State { // ), // label: "Add Loyalty Card", // labelBackgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // labelStyle: TextStyle( // color: // MzansiInnovationHub.of(context)!.theme.primaryColor(), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.successColor(), + // MihColors.getGreenColor(context), // onTap: () { // // addCardWindow(context); // }, diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart index 0bc622e9..7b717416 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tools/mih_cards.dart @@ -1,6 +1,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/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_mzansi_wallet_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; @@ -272,8 +273,7 @@ class _MihCardsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Add", @@ -406,15 +406,13 @@ class _MihCardsState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Loyalty Card", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { addCardWindow(context, width); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart index 3ca74ae4..709bbb65 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart @@ -1,4 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_mzansi_calendar_services.dart'; @@ -190,8 +191,7 @@ class _BuildPatientsListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Book Appointment", @@ -322,8 +322,7 @@ class _BuildPatientsListState extends State { onPressed: () { appointmentPopUp(index, width); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Book Appointment", @@ -386,8 +385,7 @@ class _BuildPatientsListState extends State { lastName = widget.patientAccesses[index].lname; accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.successColor())); + style: TextStyle(color: MihColors.getGreenColor(context))); } else if (access == "PENDING") { firstName = "${widget.patientAccesses[index].fname[0]}********"; lastName = "${widget.patientAccesses[index].lname[0]}********"; diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart index 07a3c6c8..eb38d033 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart @@ -1,6 +1,7 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.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'; @@ -131,14 +132,12 @@ class _WaitingRoomState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Appointment", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { // addAppointmentWindow(); appointmentTypeSelection(width); @@ -281,8 +280,7 @@ class _WaitingRoomState extends State { widget.onIndexChange(1); Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Existing Patient", @@ -300,8 +298,7 @@ class _WaitingRoomState extends State { widget.onIndexChange(2); Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Existing MIH User", @@ -319,8 +316,7 @@ class _WaitingRoomState extends State { Navigator.pop(context); addAppointmentWindow(width); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Skeleton Appointment", diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart index 89e867dd..2bc1b4ff 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart @@ -1,4 +1,5 @@ import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_icd10_code_services.dart'; @@ -383,8 +384,7 @@ class _ClaimStatementWindowState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Generate", diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/prescip_input.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/prescip_input.dart index d637be0b..f3e4683b 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/prescip_input.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/prescip_input.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_form.dart'; @@ -552,7 +553,7 @@ class _PrescripInputState extends State { ); } }, - buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Generate", diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart index c3f1ce6c..d78c47f7 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_claim_statement_files_list.dart @@ -4,6 +4,7 @@ import 'package:fl_downloader/fl_downloader.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; @@ -162,13 +163,12 @@ class _BuildClaimStatementFileListState color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Download", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); @@ -185,13 +185,12 @@ class _BuildClaimStatementFileListState color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Print", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { printDocument(url, filePath); }, @@ -204,13 +203,12 @@ class _BuildClaimStatementFileListState color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Full Screen", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { printDocument(url, filePath); }, @@ -225,14 +223,12 @@ class _BuildClaimStatementFileListState color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Document", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deleteFilePopUp(filePath, fileID); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_files_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_files_list.dart index 9c6be4b7..aab70bfd 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_files_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_files_list.dart @@ -5,6 +5,7 @@ import 'package:fl_downloader/fl_downloader.dart'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.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_components/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; @@ -212,13 +213,12 @@ class _BuildFilesListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Download", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); @@ -236,14 +236,12 @@ class _BuildFilesListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Print", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { printDocument(url, filePath); }, @@ -257,13 +255,12 @@ class _BuildFilesListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Full Screen", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { Navigator.of(context).pushNamed( '/file-veiwer', @@ -284,14 +281,12 @@ class _BuildFilesListState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Document", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deleteFilePopUp(filePath, fileID); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_notes_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_notes_list.dart index bf6bad4a..198c3cde 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_notes_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_notes_list.dart @@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_delete_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_message.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_success_message.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_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; @@ -149,15 +150,13 @@ class _BuildNotesListState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Note", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { deletePatientPopUp(selectednote.idpatient_notes); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart index 121b76e0..7e86e642 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_claim_or_statement.dart @@ -1,5 +1,6 @@ import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_claim_statement_generation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; @@ -130,15 +131,13 @@ class _PatientClaimOrStatementState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Claim/ Statement", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { claimOrStatementWindow(); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart index 73be9846..d5e5d55a 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; @@ -210,8 +211,7 @@ class _PatientConsultationState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Add Note", @@ -382,15 +382,13 @@ class _PatientConsultationState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Note", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { // addConsultationNotePopUp(); addNotePopUp(width); diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart index 914e9e80..79074d99 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart @@ -2,6 +2,7 @@ import 'dart:convert'; import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_file_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; @@ -310,8 +311,7 @@ class _PatientDocumentsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Add File", @@ -391,8 +391,7 @@ class _PatientDocumentsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Generate", @@ -485,14 +484,12 @@ class _PatientDocumentsState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Attach Document", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { uploudFilePopUp(width); }, @@ -514,14 +511,12 @@ class _PatientDocumentsState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Document", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { uploudFilePopUp(width); }, @@ -532,14 +527,12 @@ class _PatientDocumentsState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Medical Certificate", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { medCertPopUp(); }, @@ -550,14 +543,12 @@ class _PatientDocumentsState extends State { color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Prescription", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { prescritionPopUp(); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart index 6ee31cd5..3ed76aa4 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_info.dart @@ -10,6 +10,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PatientInfo extends StatefulWidget { final AppUser signedInUser; @@ -414,15 +415,13 @@ class _PatientInfoState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Profile", - labelBackgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + labelBackgroundColor: MihColors.getGreenColor(context), labelStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MihColors.getGreenColor(context), onTap: () { Navigator.of(context).pushNamed('/patient-profile/edit', arguments: PatientEditArguments( diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart index 387666f9..2bf97505 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_action.dart'; @@ -447,8 +448,7 @@ class _AddPatientState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Add", diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart index 66952acc..1422739f 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_layout/mih_action.dart'; @@ -660,8 +661,7 @@ class _EditPatientState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Update", diff --git a/Frontend/lib/mih_services/mih_alert_services.dart b/Frontend/lib/mih_services/mih_alert_services.dart index 35157e4b..070497d1 100644 --- a/Frontend/lib/mih_services/mih_alert_services.dart +++ b/Frontend/lib/mih_services/mih_alert_services.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_alert.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihAlertServices { void formNotFilledCompletely(BuildContext context) { @@ -64,7 +65,7 @@ class MihAlertServices { alertIcon: Icon( Icons.check_circle_outline_rounded, size: 150, - color: MzansiInnovationHub.of(context)!.theme.successColor(), + color: MihColors.getGreenColor(context), ), alertTitle: title, alertBody: Column( @@ -81,7 +82,7 @@ class MihAlertServices { const SizedBox(height: 25), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.successColor(), + alertColour: MihColors.getGreenColor(context), ); }, );