From 6ba3da6368ec52155e4d9c2432e404376771084d Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 14 Aug 2025 09:54:00 +0200 Subject: [PATCH 1/4] Use Mih Color Green --- .../package_tools/package_tool_one.dart | 21 +++++-------- .../mih_package_components/mih_calendar.dart | 3 +- .../mih_floating_menu.dart | 3 +- .../mih_package_components/mih_toggle.dart | 3 +- .../mih_success_message.dart | 13 ++++---- .../package_tools/mih_ attributes.dart | 4 +-- .../about_mih/package_tools/mih_info.dart | 28 ++++++----------- .../builder/build_access_request_list.dart | 7 ++--- .../builder/build_business_access_list.dart | 7 ++--- .../authentication/biometric_check.dart | 7 ++--- .../authentication/forgot_password.dart | 4 +-- .../mih_packages/authentication/register.dart | 3 +- .../mih_packages/authentication/signin.dart | 3 +- .../builder/build_access_request_list.dart | 7 ++--- .../builder/build_appointment_list.dart | 28 ++++++----------- .../calendar/package_tools/appointments.dart | 7 ++--- .../mih_home/mih_home_legacy.dart | 7 ++--- .../mih_home/mih_profile_getter.dart | 4 +-- .../mzansi_ai/package_tools/ai_chat.dart | 21 +++++-------- .../builders/build_employee_list.dart | 10 +++--- .../components/mih_add_bookmark_alert.dart | 3 +- .../components/mih_delete_bookmark_alert.dart | 3 +- .../mih_review_business_window.dart | 9 ++---- .../package_tools/mih_business_details.dart | 8 ++--- .../package_tools/mih_my_business_user.dart | 4 +-- .../package_tools/mih_personal_profile.dart | 11 +++---- .../mih_personal_profile_view.dart | 2 +- .../package_tools/mih_personal_settings.dart | 4 +-- .../builder/build_loyalty_card_list.dart | 29 +++++++---------- .../package_tools/mih_card_favourites.dart | 4 +-- .../package_tools/mih_cards.dart | 10 +++--- .../build_my_patient_list_list.dart | 10 +++--- .../package_tools/waiting_room.dart | 16 ++++------ .../components/claim_statement_window.dart | 4 +-- .../pat_profile/components/prescip_input.dart | 3 +- .../build_claim_statement_files_list.dart | 22 ++++++------- .../list_builders/build_files_list.dart | 23 ++++++-------- .../list_builders/build_notes_list.dart | 7 ++--- .../patient_claim_or_statement.dart | 7 ++--- .../package_tools/patient_consultation.dart | 10 +++--- .../package_tools/patient_documents.dart | 31 +++++++------------ .../package_tools/patient_info.dart | 7 ++--- .../pat_profile/patient_add.dart | 4 +-- .../pat_profile/patient_edit.dart | 4 +-- .../lib/mih_services/mih_alert_services.dart | 5 +-- 45 files changed, 178 insertions(+), 252 deletions(-) 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), ); }, ); From 726c6f521349b3b8d7b4560d9ff61704664212f6 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 14 Aug 2025 09:58:28 +0200 Subject: [PATCH 2/4] Use Mih Color Red --- .../mih_layout/mih_notification_drawer.dart | 3 +- .../Example/package_test.dart | 5 +- .../package_tools/package_tool_one.dart | 3 +- .../mih_floating_menu.dart | 3 +- .../mih_package_alert.dart | 3 +- .../mih_package_window.dart | 3 +- .../mih_package_components/mih_toggle.dart | 2 +- .../mih_delete_message.dart | 26 ++--- .../mih_error_message.dart | 110 ++++++++---------- .../mih_notification_message.dart | 3 +- .../mih_warning_message.dart | 13 ++- .../builder/build_access_request_list.dart | 6 +- .../builder/build_business_access_list.dart | 21 ++-- .../authentication/biometric_check.dart | 4 +- .../mih_packages/authentication/signin.dart | 2 +- .../package_tools/currency_exchange_rate.dart | 4 +- .../calculator/package_tools/simple_calc.dart | 8 +- .../calculator/package_tools/tip_calc.dart | 8 +- .../builder/build_access_request_list.dart | 6 +- .../calendar/package_tools/appointments.dart | 4 +- .../package_tools/mih_register.dart | 5 +- .../mih_home/mih_home_legacy.dart | 2 +- .../mih_home/mih_profile_getter.dart | 3 +- .../mzansi_ai/package_tools/ai_chat.dart | 4 +- .../package_tools/mih_search_mzansi.dart | 7 +- .../components/mih_add_bookmark_alert.dart | 3 +- .../components/mih_business_info_card.dart | 26 ++--- .../components/mih_delete_bookmark_alert.dart | 3 +- .../mih_review_business_window.dart | 13 +-- .../package_tools/mih_business_details.dart | 7 +- .../mih_business_user_search.dart | 5 +- .../package_tools/mih_my_business_team.dart | 5 +- .../package_tools/mih_my_business_user.dart | 5 +- .../profile_business_add.dart | 3 +- .../package_tools/mih_personal_profile.dart | 6 +- .../package_tools/mih_personal_settings.dart | 9 +- .../builder/build_loyalty_card_list.dart | 7 +- .../components/mih_barcode_scanner.dart | 4 +- .../build_mih_patient_search_list.dart | 31 ++--- .../build_my_patient_list_list.dart | 3 +- .../package_tools/mih_patient_search.dart | 5 +- .../package_tools/my_patient_list.dart | 5 +- .../package_tools/waiting_room.dart | 4 +- .../package_tools/patient_consultation.dart | 2 +- .../pat_profile/patient_edit.dart | 5 +- .../lib/mih_services/mih_alert_services.dart | 8 +- 46 files changed, 181 insertions(+), 236 deletions(-) diff --git a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart index 0bdfb342..12d95cbd 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; 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/notification.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; import 'package:supertokens_flutter/http.dart' as http; @@ -101,7 +102,7 @@ class _MIHNotificationDrawerState extends State { children: [ Icon( Icons.circle_notifications, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), const SizedBox( width: 5, diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart index 003da094..a25b8e6b 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart @@ -7,6 +7,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Exam import 'package:mzansi_innovation_hub/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PackageTest extends StatefulWidget { // final AppUser user; @@ -66,7 +67,7 @@ class _PackageTestState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -111,7 +112,7 @@ class _PackageTestState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); 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 52886370..bf25552d 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 @@ -721,8 +721,7 @@ class _PackageToolOneState extends State { onPressed: () { print("Button Pressed"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Click Me", 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 36ae5dcc..e710a9db 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 @@ -32,8 +32,7 @@ class _MihFloatingMenuState extends State { direction: widget.direction ?? SpeedDialDirection.up, activeIcon: Icons.close, backgroundColor: MihColors.getGreenColor(context), - activeBackgroundColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + activeBackgroundColor: MihColors.getRedColor(context), foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), overlayColor: Colors.black, overlayOpacity: 0.5, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart index aa6cf0bc..8e890311 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihPackageAlert extends StatefulWidget { final Widget alertIcon; @@ -101,7 +102,7 @@ class _MihPackageAlertState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart index 2106dbf6..0fe91e9a 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart @@ -3,6 +3,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_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_floating_menu.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihPackageWindow extends StatefulWidget { final String windowTitle; @@ -84,7 +85,7 @@ class _MihPackageWindowState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzansiInnovationHub.of(context)!.theme.errorColor()), + MihColors.getRedColor(context)), ), color: MzansiInnovationHub.of(context)!.theme.primaryColor(), iconSize: 20, 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 b0e804dd..fc815372 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart @@ -85,7 +85,7 @@ class _MihToggleState extends State { widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, inactiveTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MzansiInnovationHub.of(context)!.theme.errorColor(), + : MihColors.getRedColor(context), // activeColor: widget.secondaryFillColor, // activeTrackColor: widget.fillColor, // inactiveThumbColor: widget.fillColor, diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart index 23493ad8..92d36623 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_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 MIHDeleteMessage extends StatefulWidget { @@ -99,8 +100,7 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -127,7 +127,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -184,8 +184,7 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -212,7 +211,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -270,8 +269,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -298,7 +296,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -355,8 +353,7 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -383,7 +380,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -440,8 +437,7 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -468,7 +464,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart index 9bff754d..191da4c7 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; class MIHErrorMessage extends StatefulWidget { @@ -57,9 +58,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -68,14 +68,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 5), Text( "Oops! Looks like some fields are missing.", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -137,7 +137,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -156,9 +156,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -167,14 +166,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 15), Text( "Password Doesn't Meet Requirements", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -243,7 +242,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -262,9 +261,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -273,14 +271,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 15), Text( "Let's Fix That Username", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -311,7 +309,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -330,9 +328,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -341,14 +338,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 15), Text( "Oops! Invalid Email", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -379,7 +376,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -398,9 +395,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -409,14 +405,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //SizedBox(height: 15), Text( "Email Already Exists", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -435,7 +431,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -466,7 +462,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -485,9 +481,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -496,14 +491,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //SizedBox(height: 15), Text( "Passwords Don't Match", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -522,7 +517,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -554,7 +549,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -573,9 +568,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -584,14 +578,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //SizedBox(height: 15), Text( "Uh oh! Login attempt unsuccessful.", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -610,7 +604,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -642,7 +636,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -661,9 +655,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -672,14 +665,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 15), Text( "Internet Connection Lost!", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -698,7 +691,7 @@ class _MIHErrorMessageState extends State { Text( "Here are a few things you can try:", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -730,7 +723,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -749,9 +742,8 @@ class _MIHErrorMessageState extends State { decoration: BoxDecoration( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), - border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), - width: 5.0), + border: + Border.all(color: MihColors.getRedColor(context), width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -760,14 +752,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), //const SizedBox(height: 15), Text( "Location Services Not Enabled", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -786,7 +778,7 @@ class _MIHErrorMessageState extends State { // Text( // "Here are a few things you can try:", // style: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.errorColor(), + // color: MihColors.getRedColor(context), // fontSize: popUpSubtitleSize, // fontWeight: FontWeight.bold, // ), @@ -818,7 +810,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart index 31a44246..52d662eb 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; import '../../mih_components/mih_objects/arguments.dart'; @@ -132,7 +133,7 @@ class _MIHNotificationMessageState extends State super.initState(); setState(() { primary = MzansiInnovationHub.of(context)!.theme.primaryColor(); - secondary = MzansiInnovationHub.of(context)!.theme.errorColor(); + secondary = MihColors.getRedColor(context); }); _animationController = AnimationController( vsync: this, diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart index b6b002ca..0a8f5f2e 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; class MIHWarningMessage extends StatefulWidget { @@ -109,7 +110,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -179,7 +180,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -249,7 +250,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -319,7 +320,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -389,7 +390,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), @@ -459,7 +460,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), 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 aff1475b..95dd7ebb 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 @@ -142,8 +142,7 @@ class _BuildPatientsListState extends State { } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor())); + style: TextStyle(color: MihColors.getRedColor(context))); } return ListTile( @@ -248,8 +247,7 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "declined"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Decline", 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 def3f24a..e429a0af 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 @@ -95,8 +95,7 @@ class _BuildPatientsListState extends State { } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor())); + style: TextStyle(color: MihColors.getRedColor(context))); } return ListTile( @@ -212,16 +211,14 @@ class _BuildPatientsListState extends State { "Important Notice: Approving Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), 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: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), SizedBox( @@ -264,8 +261,7 @@ class _BuildPatientsListState extends State { "By pressing the \"Approve\" button you accept the above terms.", style: TextStyle( fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), ], @@ -281,16 +277,14 @@ class _BuildPatientsListState extends State { "Important Notice: Approved Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), Text( "You have accepted access to your patient's profile. Please be aware of the following important points:", style: TextStyle( fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), SizedBox( @@ -355,8 +349,7 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Decline", diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index 10b918d3..29450b93 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -110,7 +110,7 @@ class _BiometricCheckState extends State { Widget alertpopUp = MihPackageAlert( alertIcon: Icon( Icons.fingerprint, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 100, ), alertTitle: "Biometric Authentication Error", @@ -172,7 +172,7 @@ class _BiometricCheckState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); showDialog( context: context, diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 4ec7d03a..2af687a6 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -282,7 +282,7 @@ class _SignInState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), diff --git a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart index d00de2f7..b727be5a 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart @@ -10,6 +10,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ 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_text_form_field.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_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'; @@ -436,8 +437,7 @@ class _CurrencyExchangeRateState extends State { child: Text( "Error pulling Currency Exchange Data.", style: TextStyle( - fontSize: 25, - color: MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index 054fb93f..f71725c4 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.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_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}); @@ -295,8 +296,7 @@ class _SimpleCalcState extends State { equalPressed(); }); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 50, height: 50, borderRadius: 5, @@ -320,9 +320,7 @@ class _SimpleCalcState extends State { userInput = answer; }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 50, height: 50, borderRadius: 5, diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index 3ec8ffed..e5ac3c16 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -1,5 +1,6 @@ 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_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; @@ -392,9 +393,7 @@ class _TipCalcState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Calculate", @@ -411,8 +410,7 @@ class _TipCalcState extends State { onPressed: () { clearInput(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Clear", 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 9d1dcd16..f551fd20 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 @@ -144,8 +144,7 @@ class _BuildPatientsListState extends State { } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor())); + style: TextStyle(color: MihColors.getRedColor(context))); } return ListTile( @@ -250,8 +249,7 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "declined"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Decline", diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index bfb7c56f..b4542e01 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -243,9 +243,7 @@ class _PatientAccessRequestState 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/mih_authentication/package_tools/mih_register.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart index 862f1bc0..df89c31a 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart @@ -11,6 +11,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.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_loading_circle.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'; @@ -159,7 +160,7 @@ class _MihRegisterState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_amber_rounded, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 100, ), alertTitle: "Error While Signing Up", @@ -170,7 +171,7 @@ class _MihRegisterState extends State { fontSize: 18, ), ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); 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 4d2b7a66..7fe283df 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -1021,7 +1021,7 @@ class _MIHHomeLegacyState extends State { child: Icon( Icons.circle, size: 10, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ) ], 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 3b44db14..4af5036b 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -142,8 +142,7 @@ class _MIHProfileGetterState extends State { "Error: $error", textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), fontSize: 15, fontWeight: FontWeight.bold, ), 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 2288a069..777aeff9 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 @@ -313,7 +313,7 @@ class _AiChatState extends State { MzansiInnovationHub.of(context)!.theme.primaryColor(), primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryColor: MihColors.getGreenColor(context), - errorColor: MzansiInnovationHub.of(context)!.theme.errorColor(), + errorColor: MihColors.getRedColor(context), sentMessageBodyTextStyle: TextStyle( color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: _chatFrontSize, @@ -697,7 +697,7 @@ class _AiChatState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzansiInnovationHub.of(context)!.theme.errorColor()), + MihColors.getRedColor(context)), ), color: MzansiInnovationHub.of(context)!.theme.primaryColor(), diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart index 550e9ea2..b09410ea 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart @@ -9,6 +9,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.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_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'; @@ -397,8 +398,7 @@ class _MihSearchMzansiState extends State { child: Text( "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( - fontSize: 25, - color: MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); @@ -550,8 +550,7 @@ class _MihSearchMzansiState extends State { child: Text( "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( - fontSize: 25, - color: MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); 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 302fb6c7..bac0f167 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 @@ -88,8 +88,7 @@ class _MihAddBookmarkAlertState extends State { onPressed: () async { Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), child: Text( "Cancel", style: TextStyle( diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart index 3ca50400..c678ea60 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart @@ -52,7 +52,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Making Call", alertBody: Column( @@ -68,7 +68,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } @@ -102,7 +102,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Creating Email", alertBody: Column( @@ -118,7 +118,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } @@ -143,7 +143,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -159,8 +159,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: - MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } @@ -172,7 +171,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -188,7 +187,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } @@ -212,7 +211,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -228,8 +227,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: - MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } @@ -241,7 +239,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -257,7 +255,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }); } 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 3d6ea82a..bf12f343 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 @@ -121,8 +121,7 @@ class _MihDeleteBookmarkAlertState extends State { deleteBookmark( widget.bookmarkBusiness!.idbookmarked_businesses); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), child: Text( "Remove Business", 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 083127aa..dba24806 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 @@ -52,11 +52,11 @@ class _MihReviewBusinessWindowState extends State { showDialog( context: context, builder: (context) => MihPackageAlert( - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Delete Review", alertBody: Column( @@ -117,8 +117,7 @@ class _MihReviewBusinessWindowState extends State { } }); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), child: Text( "Delete", style: TextStyle( @@ -157,7 +156,7 @@ class _MihReviewBusinessWindowState extends State { if (_counter.value <= limit) { return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzansiInnovationHub.of(context)!.theme.errorColor(); + return MihColors.getRedColor(context); } } @@ -501,9 +500,7 @@ class _MihReviewBusinessWindowState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( widget.businessReview != null 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 f417ef12..3be979cf 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 @@ -105,7 +105,7 @@ class _MihBusinessDetailsState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Updating Business Details", alertBody: Column( @@ -120,8 +120,7 @@ class _MihBusinessDetailsState extends State { ), ], ), - alertColour: - MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); @@ -605,7 +604,7 @@ class _MihBusinessDetailsState extends State { if (_counter.value <= limit) { return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzansiInnovationHub.of(context)!.theme.errorColor(); + return MihColors.getRedColor(context); } } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart index 289ba0dc..86120f62 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart @@ -6,6 +6,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; 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_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'; @@ -223,9 +224,7 @@ class _MihBusinessUserSearchState extends State { child: Text( "$errorCode: Error pulling Patients Data\n/users/search/$userSearch\n$errorBody", style: TextStyle( - fontSize: 25, - color: - MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart index 610b5a88..6832f576 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.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_package_tool_body.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_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_employee.dart'; @@ -104,9 +105,7 @@ class _MihMyBusinessTeamState extends State { child: Text( "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody", style: TextStyle( - fontSize: 25, - color: - MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); 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 cd2b3164..b2bbaef8 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 @@ -127,7 +127,7 @@ class _MihMyBusinessUserState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Error Updating Business User Details", alertBody: Column( @@ -142,8 +142,7 @@ class _MihMyBusinessUserState extends State { ), ], ), - alertColour: - MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart index 2bd8596f..6e101128 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart @@ -4,6 +4,7 @@ import 'package:country_code_picker/country_code_picker.dart'; import 'package:http/http.dart'; import 'package:mzansi_innovation_hub/main.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_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'; @@ -259,7 +260,7 @@ class _ProfileBusinessAddState extends State { if (_counter.value <= limit) { return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzansiInnovationHub.of(context)!.theme.errorColor(); + return MihColors.getRedColor(context); } } 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 85b8b2c1..2a5fa115 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 @@ -54,7 +54,7 @@ class _MihPersonalProfileState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Too Slow, That Username is Taken", alertBody: const Text( @@ -63,7 +63,7 @@ class _MihPersonalProfileState extends State { fontSize: 15, ), ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); @@ -196,7 +196,7 @@ class _MihPersonalProfileState extends State { if (_counter.value <= limit) { return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzansiInnovationHub.of(context)!.theme.errorColor(); + return MihColors.getRedColor(context); } } 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 944a7e7a..159e0909 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 @@ -39,7 +39,7 @@ class _MihPersonalSettingsState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Are you sure you want to permanently delete your MIH account?", @@ -65,8 +65,7 @@ class _MihPersonalSettingsState extends State { MihUserServices.deleteAccount( widget.signedInUser.app_id, context); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -100,7 +99,7 @@ class _MihPersonalSettingsState extends State { ) ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); @@ -132,7 +131,7 @@ class _MihPersonalSettingsState extends State { onPressed: () { deleteAccountPopUp(context); }, - buttonColor: MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete Account", 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 f9ced553..62d48733 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 @@ -258,10 +258,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), alertIcon: Icon( Icons.favorite_border, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 100, ), alertTitle: "Remove From Favourites", @@ -291,8 +291,7 @@ class _BuildLoyaltyCardListState extends State { ctxt, ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Remove", diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart index 0e6abcc6..d983dbf5 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihBarcodeScanner extends StatefulWidget { final TextEditingController cardNumberController; @@ -125,8 +126,7 @@ class _MihBarcodeScannerState extends State _scannerController.stop(); Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 100, height: 50, child: Text( diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart index 958170dd..cc985d02 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart @@ -1,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_service_calls.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'; @@ -283,16 +284,14 @@ class _BuildPatientsListState extends State { "Important Notice: Requesting Patient Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), 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: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), SizedBox( @@ -301,8 +300,7 @@ class _BuildPatientsListState extends State { "1. Permanent Access: Once the patient accepts your access request, it will become permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), ), @@ -312,8 +310,7 @@ class _BuildPatientsListState extends State { "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: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), ), @@ -323,8 +320,7 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: Once granted, you cannot revoke your access to the patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), ), @@ -332,8 +328,7 @@ class _BuildPatientsListState extends State { "By pressing the \"Request Access\" button you accept the above terms.\n", style: TextStyle( fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), ), ], @@ -366,9 +361,7 @@ class _BuildPatientsListState extends State { noAccessWarning(); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "View Profile", @@ -402,9 +395,7 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Request Access", @@ -436,9 +427,7 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor(context), width: 300, child: Text( "Re-apply", 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 709bbb65..ced1f4d0 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 @@ -399,8 +399,7 @@ class _BuildPatientsListState extends State { lastName = "${widget.patientAccesses[index].lname[0]}********"; accessWithColour = TextSpan( text: "$access\n", - style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.errorColor())); + style: TextStyle(color: MihColors.getRedColor(context))); } return ListTile( diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart index ac367f65..3dcc5dd0 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart @@ -1,5 +1,6 @@ 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_service_calls.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_package_tool_body.dart'; @@ -91,9 +92,7 @@ class _MihPatientSearchState extends State { child: Text( "Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString", style: TextStyle( - fontSize: 25, - color: - MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart index 56f7685e..e14a1480 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart @@ -1,5 +1,6 @@ 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_service_calls.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_package_tool_body.dart'; @@ -93,9 +94,7 @@ class _MyPatientListState extends State { child: Text( "Error pulling Patient Access Data\n$baseUrl/access-requests/business/patient/${widget.business!.business_id}", style: TextStyle( - fontSize: 25, - color: - MzansiInnovationHub.of(context)!.theme.errorColor()), + fontSize: 25, color: MihColors.getRedColor(context)), textAlign: TextAlign.center, ), ); 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 eb38d033..b9f50ca5 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 @@ -419,9 +419,7 @@ class _WaitingRoomState 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/package_tools/patient_consultation.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart index d5e5d55a..e5ab765f 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 @@ -280,7 +280,7 @@ class _PatientConsultationState extends State { if (_counter.value <= 512) { return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzansiInnovationHub.of(context)!.theme.errorColor(); + return MihColors.getRedColor(context); } } 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 1422739f..989f7328 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 @@ -281,8 +281,7 @@ class _EditPatientState extends State { ), MihButton( onPressed: deletePatientApiCall, - buttonColor: - MzansiInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MihColors.getRedColor(context), width: 300, child: Text( "Delete", @@ -310,7 +309,7 @@ class _EditPatientState extends State { }, icon: Icon( Icons.close, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), size: 35, ), ), diff --git a/Frontend/lib/mih_services/mih_alert_services.dart b/Frontend/lib/mih_services/mih_alert_services.dart index 070497d1..81961075 100644 --- a/Frontend/lib/mih_services/mih_alert_services.dart +++ b/Frontend/lib/mih_services/mih_alert_services.dart @@ -12,7 +12,7 @@ class MihAlertServices { alertIcon: Icon( Icons.warning_amber_rounded, size: 150, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -51,7 +51,7 @@ class MihAlertServices { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); @@ -96,7 +96,7 @@ class MihAlertServices { alertIcon: Icon( Icons.warning_amber_rounded, size: 150, - color: MzansiInnovationHub.of(context)!.theme.errorColor(), + color: MihColors.getRedColor(context), ), alertTitle: title, alertBody: Column( @@ -113,7 +113,7 @@ class MihAlertServices { const SizedBox(height: 25), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), + alertColour: MihColors.getRedColor(context), ); }, ); From 96d913629a61e590b901641473ef36892e8e8af4 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 14 Aug 2025 15:26:26 +0200 Subject: [PATCH 3/4] Use MihColor Across MIH --- Frontend/lib/main.dart | 5 +- .../mih_components/mih_layout/mih_body.dart | 7 +- .../mih_layout/mih_notification_drawer.dart | 37 ++- .../mih_components/mih_layout/mih_tile.dart | 14 +- .../Example/package_test.dart | 26 +- .../package_tools/package_tool_one.dart | 299 ++++++++++-------- .../package_tools/package_tool_two.dart | 7 +- .../mih_business_profile_preview.dart | 17 +- .../mih_package_components/mih_calendar.dart | 26 +- .../mih_date_field.dart | 51 ++- .../mih_dropdwn_field.dart | 81 +++-- .../mih_floating_menu.dart | 9 +- .../mih_image_display.dart | 12 +- .../mih_numeric_stepper.dart | 13 +- .../mih_package_alert.dart | 6 +- .../mih_package_tile.dart | 5 +- .../mih_package_tool_body.dart | 13 +- .../mih_package_window.dart | 16 +- .../mih_personal_profile_preview.dart | 16 +- .../mih_text_form_field.dart | 41 ++- .../mih_time_field.dart | 53 +++- .../mih_package_components/mih_toggle.dart | 18 +- .../mih_delete_message.dart | 145 +++++---- .../mih_error_message.dart | 260 +++++++++------ .../mih_loading_circle.dart | 8 +- .../mih_notification_message.dart | 6 +- .../mih_success_message.dart | 26 +- .../mih_warning_message.dart | 126 ++++---- Frontend/lib/mih_config/mih_colors.dart | 80 +++-- Frontend/lib/mih_config/mih_theme.dart | 146 ++++----- .../policy_and_terms_text.dart | 9 +- .../package_tile/about_mih_tile.dart | 10 +- .../package_tools/mih_ attributes.dart | 13 +- .../about_mih/package_tools/mih_info.dart | 190 +++++++---- .../builder/build_access_request_list.dart | 44 +-- .../builder/build_business_access_list.dart | 102 +++--- .../package_tile/mih_access_tile.dart | 10 +- .../package_tools/mih_access_requests.dart | 21 +- .../authentication/biometric_check.dart | 50 +-- .../authentication/forgot_password.dart | 61 ++-- .../mih_packages/authentication/register.dart | 89 +++--- .../authentication/reset_password.dart | 57 ++-- .../mih_packages/authentication/signin.dart | 133 ++++---- .../package_tiles/mih_calculator_tile.dart | 10 +- .../package_tools/currency_exchange_rate.dart | 108 ++++--- .../calculator/package_tools/simple_calc.dart | 86 ++--- .../calculator/package_tools/tip_calc.dart | 99 +++--- .../builder/build_access_request_list.dart | 44 +-- .../builder/build_appointment_list.dart | 163 +++++----- .../calendar/builder/build_queue_list.dart | 14 +- .../package_tiles/mzansi_calendar_tile.dart | 10 +- .../calendar/package_tools/appointments.dart | 72 +++-- .../package_tools/mih_register.dart | 64 ++-- .../package_tools/mih_sign_in.dart | 101 +++--- .../mih_home/components/mih_app_drawer.dart | 97 +++--- .../lib/mih_packages/mih_home/mih_home.dart | 10 +- .../mih_home/mih_home_legacy.dart | 41 ++- .../mih_home/mih_profile_getter.dart | 20 +- .../package_tools/mih_business_home.dart | 25 +- .../package_tools/mih_personal_home.dart | 34 +- .../package_tiles/mzansi_ai_tile.dart | 10 +- .../mzansi_ai/package_tools/ai_chat.dart | 157 +++++---- .../build_business_search_resultsList.dart | 12 +- .../build_favourite_businesses_list.dart | 9 +- .../build_user_search_results_list.dart | 12 +- .../package_tiles/mzansi_directory_tile.dart | 10 +- .../package_tools/mih_contacts.dart | 8 +- .../mih_favourite_businesses.dart | 45 +-- .../package_tools/mih_search_mzansi.dart | 116 +++---- .../builders/build_employee_list.dart | 44 +-- .../builders/build_user_list.dart | 43 +-- .../components/mih_add_bookmark_alert.dart | 23 +- .../components/mih_business_info_card.dart | 176 ++++++----- .../components/mih_delete_bookmark_alert.dart | 23 +- .../mih_review_business_window.dart | 114 ++++--- .../mzansi_business_profile_tile.dart | 10 +- .../mzansi_setup_business_profile_tile.dart | 10 +- .../package_tools/mih_business_details.dart | 257 ++++++++------- .../mih_business_details_view.dart | 83 ++--- .../package_tools/mih_business_reviews.dart | 44 +-- .../mih_business_user_search.dart | 29 +- .../package_tools/mih_my_business_team.dart | 9 +- .../package_tools/mih_my_business_user.dart | 77 ++--- .../profile_business_add.dart | 225 ++++++------- .../package_tiles/mzansi_profile_tile.dart | 10 +- .../mzansi_setup_profile_tile.dart | 10 +- .../package_tools/mih_personal_profile.dart | 133 ++++---- .../mih_personal_profile_view.dart | 47 +-- .../package_tools/mih_personal_settings.dart | 40 ++- .../builder/build_loyalty_card_list.dart | 166 +++++----- .../components/mih_barcode_scanner.dart | 19 +- .../package_tiles/mih_wallet_tile.dart | 10 +- .../package_tools/mih_card_favourites.dart | 8 +- .../package_tools/mih_cards.dart | 64 ++-- .../build_mih_patient_search_list.dart | 107 ++++--- .../build_my_patient_list_list.dart | 101 +++--- .../package_tiles/pat_manager_tile.dart | 10 +- .../package_tools/mih_patient_search.dart | 29 +- .../package_tools/my_patient_list.dart | 35 +- .../package_tools/waiting_room.dart | 98 +++--- .../pat_profile/add_or_view_patient.dart | 5 +- .../components/claim_statement_window.dart | 118 +++---- .../components/full_screen_file.dart | 22 +- .../components/icd10_search_window.dart | 14 +- .../pat_profile/components/prescip_input.dart | 75 +++-- .../build_claim_statement_files_list.dart | 82 +++-- .../list_builders/build_file_view.dart | 6 +- .../list_builders/build_files_list.dart | 80 +++-- .../list_builders/build_icd10_code_list.dart | 7 +- .../list_builders/build_med_list.dart | 13 +- .../list_builders/build_notes_list.dart | 85 ++--- .../package_tiles/patient_profile_tile.dart | 10 +- .../patient_claim_or_statement.dart | 14 +- .../package_tools/patient_consultation.dart | 70 ++-- .../package_tools/patient_documents.dart | 91 +++--- .../package_tools/patient_info.dart | 121 ++++--- .../pat_profile/patient_add.dart | 147 +++++---- .../pat_profile/patient_edit.dart | 197 ++++++------ .../lib/mih_services/mih_alert_services.dart | 40 ++- 119 files changed, 4018 insertions(+), 2968 deletions(-) diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index 70a86c1b..b2812def 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'mih_config/mih_env.dart'; import 'mih_config/mih_routeGenerator.dart'; import 'mih_config/mih_theme.dart'; @@ -20,7 +21,7 @@ class _MzansiInnovationHubState extends State { late MihTheme theme; Color getPrimany() { - return theme.primaryColor(); + return MihColors.getPrimaryColor(theme.mode == "Dark"); } String getTitle() { @@ -60,9 +61,9 @@ class _MzansiInnovationHubState extends State { // } else { // theme.mode = "Light"; // } + super.initState(); theme.mode = "Dark"; theme.platform = Theme.of(context).platform; - super.initState(); //doInit(); } diff --git a/Frontend/lib/mih_components/mih_layout/mih_body.dart b/Frontend/lib/mih_components/mih_layout/mih_body.dart index 43a313f3..976064ac 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_body.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_body.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../main.dart'; class MIHBody extends StatefulWidget { @@ -46,10 +47,12 @@ class _MIHBodyState extends State { Decoration? getBoader() { if (widget.borderOn) { return BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 3.0), ); } else { diff --git a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart index 12d95cbd..b2ca0662 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart @@ -1,11 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; -import '../../main.dart'; import 'package:supertokens_flutter/http.dart' as http; - import '../../mih_config/mih_env.dart'; import '../mih_pop_up_messages/mih_error_message.dart'; @@ -79,13 +78,15 @@ class _MIHNotificationDrawerState extends State { title: Text( title, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( subtitle, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () {}, @@ -102,7 +103,8 @@ class _MIHNotificationDrawerState extends State { children: [ Icon( Icons.circle_notifications, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox( width: 5, @@ -111,7 +113,8 @@ class _MIHNotificationDrawerState extends State { child: Text( title, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -125,7 +128,8 @@ class _MIHNotificationDrawerState extends State { child: Text( title, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -137,7 +141,8 @@ class _MIHNotificationDrawerState extends State { subtitle: Text( subtitle, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { @@ -160,7 +165,8 @@ class _MIHNotificationDrawerState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.notifications.length, @@ -199,14 +205,15 @@ class _MIHNotificationDrawerState extends State { Widget build(BuildContext context) { return SafeArea( child: Drawer( - //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: SingleChildScrollView( child: Column( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, children: [ Container( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -216,9 +223,9 @@ class _MIHNotificationDrawerState extends State { child: Text( "Notifications", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, fontSize: 20, ), @@ -233,7 +240,7 @@ class _MIHNotificationDrawerState extends State { // physics: const NeverScrollableScrollPhysics(), // separatorBuilder: (BuildContext context, index) { // return Divider( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ); // }, // itemCount: widget.notifications.length, diff --git a/Frontend/lib/mih_components/mih_layout/mih_tile.dart b/Frontend/lib/mih_components/mih_layout/mih_tile.dart index 372eb544..b9f3cb30 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_tile.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_tile.dart @@ -2,6 +2,7 @@ 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_package_components/mih_yt_video_player.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MIHTile extends StatefulWidget { final String tileName; @@ -83,7 +84,7 @@ class _MIHTileState extends State { child: Material( color: mainC, // shadowColor: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // elevation: 5, borderRadius: BorderRadius.circular(80), child: InkWell( @@ -94,10 +95,10 @@ class _MIHTileState extends State { displayHint(); }, // hoverDuration: , - splashColor: - MzansiInnovationHub.of(context)!.theme.highlightColor(), - highlightColor: - MzansiInnovationHub.of(context)!.theme.highlightColor(), + splashColor: MihColors.getHighlightColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + highlightColor: MihColors.getHighlightColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: widget.tileIcon, ), ), @@ -111,7 +112,8 @@ class _MIHTileState extends State { softWrap: true, overflow: TextOverflow.visible, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 40.0, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart index a25b8e6b..3c473292 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_test.dart @@ -67,7 +67,8 @@ class _PackageTestState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -75,8 +76,8 @@ class _PackageTestState extends State { Text( "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -85,8 +86,8 @@ class _PackageTestState extends State { RichText( text: TextSpan( style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -95,16 +96,16 @@ class _PackageTestState extends State { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan(text: "Look for fields with an asterisk ("), TextSpan( text: "*", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( text: ") next to them, as these are mandatory."), ], @@ -112,7 +113,8 @@ class _PackageTestState extends State { ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); 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 bf25552d..ad71ced0 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 @@ -101,15 +101,19 @@ class _PackageToolOneState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Show New Window", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { // showTestWindow(); }, @@ -178,9 +182,9 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -191,15 +195,16 @@ class _PackageToolOneState extends State { onPressed: () { KenLogger.success("Successfully tested"); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Success Logger", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -212,15 +217,16 @@ class _PackageToolOneState extends State { onPressed: () { KenLogger.error("Successfully tested"); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Error Logger", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -233,15 +239,16 @@ class _PackageToolOneState extends State { onPressed: () { KenLogger.warning("Successfully tested"); }, - buttonColor: MihColors.getOrangeColor(context), + buttonColor: MihColors.getOrangeColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Warning Logger", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -254,15 +261,16 @@ class _PackageToolOneState extends State { onPressed: () { KenLogger.info("Successfully tested"); }, - buttonColor: MihColors.getBluishPurpleColor(context), + buttonColor: MihColors.getBluishPurpleColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Info Logger", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -278,10 +286,10 @@ class _PackageToolOneState extends State { initialSelection: '+27', showDropDownButton: false, pickerStyle: PickerStyle.bottomSheet, - dialogBackgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), - barrierColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + dialogBackgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + barrierColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Center( @@ -296,16 +304,16 @@ class _PackageToolOneState extends State { }, ); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Show Loading", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -322,9 +330,9 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -343,9 +351,9 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -422,8 +430,8 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), Divider( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), thickness: 2, ), const SizedBox(height: 10), @@ -436,9 +444,9 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -446,8 +454,8 @@ class _PackageToolOneState extends State { MihBannerAd(), const SizedBox(height: 10), Divider( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), thickness: 2, ), const SizedBox(height: 10), @@ -456,11 +464,12 @@ class _PackageToolOneState extends State { formFields: [ MihTextFormField( width: 200, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _textFieldZeroController, multiLineInput: false, requiredText: false, @@ -471,11 +480,12 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _textFieldOneController, multiLineInput: false, requiredText: true, @@ -487,11 +497,12 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _textFieldTwoController, multiLineInput: false, requiredText: true, @@ -504,11 +515,12 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _textFieldThreeController, multiLineInput: false, requiredText: true, @@ -521,11 +533,12 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihNumericStepper( controller: _textFieldFiveController, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), hintText: "Number Stepper", requiredText: true, minValue: 1, @@ -536,11 +549,12 @@ class _PackageToolOneState extends State { MihToggle( hintText: "Toggle", initialPostion: switchpositioin, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), readOnly: false, onChange: (value) { setState(() { @@ -553,11 +567,12 @@ class _PackageToolOneState extends State { MihRadioOptions( controller: _textFieldSixController, hintText: "Radio Options", - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), requiredText: true, radioOptions: const ["Option 1", "Option 2"], ), @@ -598,11 +613,12 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _textFieldFourController, multiLineInput: true, requiredText: false, @@ -626,17 +642,17 @@ class _PackageToolOneState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), elevation: 10, width: 300, child: Text( "Submit Form", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -647,8 +663,8 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), Divider( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), thickness: 2, ), const SizedBox(height: 10), @@ -659,10 +675,10 @@ class _PackageToolOneState extends State { prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, width: 300, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { print("Search Icon Pressed: ${_searchController.text}"); }, @@ -673,15 +689,16 @@ class _PackageToolOneState extends State { onPressed: () { print("Button Pressed"); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), elevation: 10, width: 300, child: Text( "Click Me", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -692,23 +709,24 @@ class _PackageToolOneState extends State { onPressed: () { print("Button Pressed"); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Icon( Icons.delete, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), Text( "Click Me", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -721,13 +739,15 @@ class _PackageToolOneState extends State { onPressed: () { print("Button Pressed"); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Click Me", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -744,8 +764,9 @@ class _PackageToolOneState extends State { onPressed: () {}, icon: Icon( MihIcons.mihLogo, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -756,10 +777,10 @@ class _PackageToolOneState extends State { editable: false, fileNameController: _fileNameController, userSelectedfile: file, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (selectedImage) { setState(() { file = selectedImage; @@ -768,10 +789,10 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _fileNameController, hintText: "Selected Avatar File", requiredText: false, @@ -793,10 +814,10 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _imagefileController, hintText: "Selected Image File", requiredText: false, @@ -816,17 +837,19 @@ class _PackageToolOneState extends State { SpeedDialChild( child: Icon( Icons.add, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Show New Window", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { showTestWindow(); }, @@ -834,17 +857,19 @@ class _PackageToolOneState extends State { SpeedDialChild( child: Icon( Icons.add, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Show New Full Window", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { showTestFullWindow(); }, diff --git a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart index f56ce322..01a6e072 100644 --- a/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart +++ b/Frontend/lib/mih_components/mih_package_components/Example/package_tools/package_tool_two.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.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_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'; class PackageToolTwo extends StatefulWidget { const PackageToolTwo({super.key}); @@ -33,7 +34,8 @@ class _PackageToolTwoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 10), @@ -55,7 +57,8 @@ class _PackageToolTwoState extends State { onPressed: () {}, icon: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ) diff --git a/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart b/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart index 8d8f8548..725c1183 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_business_profile_preview.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.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_services/mih_location_services.dart'; @@ -61,26 +62,26 @@ class _MihBusinessProfilePreviewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: () {}, ); } else { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } else { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } }), 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 e9cfdd47..01fc2f18 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart @@ -1,6 +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 '../../../main.dart'; import 'package:table_calendar/table_calendar.dart'; class MIHCalendar extends StatefulWidget { @@ -38,7 +38,8 @@ class _MIHCalendarState extends State { formatButtonDecoration: BoxDecoration( border: Border.fromBorderSide( BorderSide( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), borderRadius: const BorderRadius.all( @@ -62,29 +63,36 @@ class _MIHCalendarState extends State { calendarStyle: CalendarStyle( outsideDaysVisible: false, todayTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), todayDecoration: BoxDecoration( - color: MihColors.getGreenColor(context), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), shape: BoxShape.circle, ), selectedTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), selectedDecoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), shape: BoxShape.circle, ), weekendTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), daysOfWeekStyle: DaysOfWeekStyle( weekdayStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), weekendStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_date_field.dart b/Frontend/lib/mih_components/mih_package_components/mih_date_field.dart index 46a2015b..d1ad38f5 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_date_field.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_date_field.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 MihDateField extends StatefulWidget { final TextEditingController controller; @@ -47,7 +48,6 @@ class _MihDateFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzansiInnovationHub.of(context)!.theme; return Center( child: SizedBox( width: widget.width, @@ -61,7 +61,8 @@ class _MihDateFieldState extends State { Text( widget.labelText, style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 18, fontWeight: FontWeight.bold, ), @@ -70,7 +71,9 @@ class _MihDateFieldState extends State { Text( "(Optional)", style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -96,25 +99,35 @@ class _MihDateFieldState extends State { readOnly: true, onTap: () => _selectDate(context), style: TextStyle( - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.w500, ), decoration: InputDecoration( suffixIcon: Icon( Icons.calendar_today, - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), errorStyle: const TextStyle(height: 0, fontSize: 0), contentPadding: const EdgeInsets.symmetric( horizontal: 10.0, vertical: 8.0), filled: true, - fillColor: theme.secondaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), border: OutlineInputBorder( borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: field.hasError ? BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 2.0, ) : BorderSide.none, @@ -129,8 +142,16 @@ class _MihDateFieldState extends State { widget.borderRadius ?? 8.0), borderSide: BorderSide( color: field.hasError - ? theme.errorColor() - : theme.secondaryColor(), + ? MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark") + : MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 3.0, ), ), @@ -138,7 +159,9 @@ class _MihDateFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), @@ -146,7 +169,9 @@ class _MihDateFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), @@ -163,7 +188,9 @@ class _MihDateFieldState extends State { field.errorText ?? '', style: TextStyle( fontSize: 12, - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart b/Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart index e3a2f5a4..9bd6d44f 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_dropdwn_field.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import '../../main.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihDropdownField extends StatefulWidget { final TextEditingController controller; @@ -30,13 +31,13 @@ class _MihDropdownFieldState extends State { List> buildMenuOptions(List options) { List> menuList = []; - final theme = MzansiInnovationHub.of(context)!.theme; for (final i in options) { menuList.add(DropdownMenuEntry( value: i, label: i, style: ButtonStyle( - foregroundColor: WidgetStatePropertyAll(theme.primaryColor()), + foregroundColor: WidgetStatePropertyAll(MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), ), )); } @@ -59,8 +60,6 @@ class _MihDropdownFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzansiInnovationHub.of(context)!.theme; - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -70,7 +69,8 @@ class _MihDropdownFieldState extends State { Text( widget.hintText, style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 18, fontWeight: FontWeight.bold, ), @@ -79,7 +79,8 @@ class _MihDropdownFieldState extends State { Text( "(Optional)", style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -98,10 +99,16 @@ class _MihDropdownFieldState extends State { Theme( data: Theme.of(context).copyWith( textSelectionTheme: TextSelectionThemeData( - cursorColor: theme.primaryColor(), - selectionColor: - theme.primaryColor().withValues(alpha: 0.3), - selectionHandleColor: theme.primaryColor(), + cursorColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + selectionColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark") + .withValues(alpha: 0.3), + selectionHandleColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), child: DropdownMenu( @@ -115,16 +122,22 @@ class _MihDropdownFieldState extends State { menuHeight: 400, expandedInsets: EdgeInsets.zero, textStyle: TextStyle( - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.w500, ), trailingIcon: Icon( Icons.arrow_drop_down, - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), selectedTrailingIcon: Icon( Icons.arrow_drop_up, - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), leadingIcon: IconButton( onPressed: () { @@ -133,17 +146,25 @@ class _MihDropdownFieldState extends State { }, icon: Icon( Icons.delete_outline_rounded, - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), onSelected: (String? selectedValue) { field.didChange(selectedValue); }, menuStyle: MenuStyle( - backgroundColor: - WidgetStatePropertyAll(theme.secondaryColor()), + backgroundColor: WidgetStatePropertyAll( + MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), side: WidgetStatePropertyAll( - BorderSide(color: theme.primaryColor(), width: 1.0), + BorderSide( + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + width: 1.0), ), shape: WidgetStatePropertyAll( RoundedRectangleBorder( @@ -157,7 +178,9 @@ class _MihDropdownFieldState extends State { contentPadding: const EdgeInsets.symmetric( horizontal: 10.0, vertical: 8.0), filled: true, - fillColor: theme.secondaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(8.0), borderSide: BorderSide.none, @@ -166,22 +189,30 @@ class _MihDropdownFieldState extends State { borderRadius: BorderRadius.circular(8.0), borderSide: BorderSide( color: field.hasError - ? theme.errorColor() - : theme.secondaryColor(), + ? MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark") + : MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), errorBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), focusedErrorBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), @@ -195,7 +226,9 @@ class _MihDropdownFieldState extends State { field.errorText ?? '', style: TextStyle( fontSize: 12, - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, ), ), 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 e710a9db..936f3e57 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 @@ -31,9 +31,12 @@ class _MihFloatingMenuState extends State { animatedIcon: widget.animatedIcon, direction: widget.direction ?? SpeedDialDirection.up, activeIcon: Icons.close, - backgroundColor: MihColors.getGreenColor(context), - activeBackgroundColor: MihColors.getRedColor(context), - foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + activeBackgroundColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + foregroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), overlayColor: Colors.black, overlayOpacity: 0.5, children: widget.children, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_image_display.dart b/Frontend/lib/mih_components/mih_package_components/mih_image_display.dart index a4f9647d..72986d0d 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_image_display.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_image_display.dart @@ -3,6 +3,7 @@ import 'dart:io'; 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'; class MihImageDisplay extends StatefulWidget { final ImageProvider? imageFile; @@ -33,7 +34,9 @@ class _MihImageDisplayState extends State { ImageProvider? getImage() { Color dark = const Color(0XFF3A4454); if (widget.imageFile == null) { - if (MzansiInnovationHub.of(context)!.theme.secondaryColor() == dark) { + if (MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") == + dark) { print("here in light icon"); return const AssetImage( 'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png'); @@ -77,10 +80,11 @@ class _MihImageDisplayState extends State { right: 0, child: IconButton.filled( style: IconButton.styleFrom( - backgroundColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + backgroundColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPressed: () async { try { FilePickerResult? result = diff --git a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart b/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart index d4077f04..29017db8 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_numeric_stepper.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_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; @@ -109,9 +110,9 @@ class _MihNumericStepperState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzansiInnovationHub.of(context)! - .theme - .errorColor()), + MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), ), color: widget.inputColor, iconSize: 20, @@ -193,9 +194,9 @@ class _MihNumericStepperState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzansiInnovationHub.of(context)! - .theme - .successColor()), + MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), ), color: widget.inputColor, iconSize: 20, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart index 8e890311..29d94682 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_alert.dart @@ -65,7 +65,8 @@ class _MihPackageAlertState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all(color: widget.alertColour, width: 5.0), ), @@ -102,7 +103,8 @@ class _MihPackageAlertState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart index 4af1408e..0e85a771 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_tile.dart @@ -2,6 +2,7 @@ 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_package_components/mih_yt_video_player.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihPackageTile extends StatefulWidget { final String appName; @@ -84,8 +85,8 @@ class _MihPackageTileState extends State { // softWrap: true, // overflow: TextOverflow.visible, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20.0, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart index e4b0fdcd..7b8470d7 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_tool_body.dart @@ -1,5 +1,6 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihPackageToolBody extends StatefulWidget { final bool borderOn; @@ -48,19 +49,23 @@ class _MihPackageToolBodyState extends State { if (widget.borderOn) { _innerBodyPadding = 10.0; return BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 3.0), ); } else { _innerBodyPadding = 0.0; return BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 3.0), ); } diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart index 0fe91e9a..157138f4 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package_window.dart @@ -85,9 +85,12 @@ class _MihPackageWindowState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MihColors.getRedColor(context)), + MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), ), - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), iconSize: 20, onPressed: () { widget.onWindowTapClose(); @@ -109,7 +112,8 @@ class _MihPackageWindowState extends State { style: TextStyle( fontSize: windowTitleSize, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -166,10 +170,12 @@ class _MihPackageWindowState extends State { insetAnimationDuration: Durations.short1, child: Container( decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: widget.fullscreen diff --git a/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart b/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart index f2fcd340..b5bf402f 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_personal_profile_preview.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_circle_avatar.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'; class MihPersonalProfilePreview extends StatefulWidget { @@ -47,25 +48,26 @@ class _MihPersonalProfilePreviewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: () {}, ); } else { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } else { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } }, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart b/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart index cf00e6a3..03d44871 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_text_form_field.dart @@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihTextFormField extends StatefulWidget { final double? width; @@ -215,9 +216,11 @@ class _MihTextFormFieldState extends State { widget.borderRadius ?? 8.0), borderSide: field.hasError ? BorderSide( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 2.0, ) : BorderSide.none, @@ -232,9 +235,11 @@ class _MihTextFormFieldState extends State { widget.borderRadius ?? 8.0), borderSide: BorderSide( color: field.hasError - ? MzansiInnovationHub.of(context)! - .theme - .errorColor() + ? MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark") : widget.inputColor, width: 3.0, ), @@ -243,9 +248,11 @@ class _MihTextFormFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 3.0, ), ), @@ -253,9 +260,11 @@ class _MihTextFormFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 3.0, ), ), @@ -276,9 +285,11 @@ class _MihTextFormFieldState extends State { field.errorText ?? '', style: TextStyle( fontSize: 12, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontWeight: FontWeight.bold, ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_time_field.dart b/Frontend/lib/mih_components/mih_package_components/mih_time_field.dart index c38fd62a..cd6fd5ad 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_time_field.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_time_field.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import '../../main.dart'; +import 'package:mzansi_innovation_hub/main.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihTimeField extends StatefulWidget { final TextEditingController controller; @@ -57,7 +58,6 @@ class _MihTimeFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzansiInnovationHub.of(context)!.theme; return Center( child: SizedBox( width: widget.width, @@ -71,7 +71,8 @@ class _MihTimeFieldState extends State { Text( widget.labelText, style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 18, fontWeight: FontWeight.bold, ), @@ -80,7 +81,9 @@ class _MihTimeFieldState extends State { Text( "(Optional)", style: TextStyle( - color: theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -106,25 +109,35 @@ class _MihTimeFieldState extends State { readOnly: true, onTap: () => _selectTime(context), style: TextStyle( - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.w500, ), decoration: InputDecoration( suffixIcon: Icon( Icons.access_time, - color: theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), errorStyle: const TextStyle(height: 0, fontSize: 0), contentPadding: const EdgeInsets.symmetric( horizontal: 10.0, vertical: 8.0), filled: true, - fillColor: theme.secondaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), border: OutlineInputBorder( borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: field.hasError ? BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 2.0, ) : BorderSide.none, @@ -139,8 +152,16 @@ class _MihTimeFieldState extends State { widget.borderRadius ?? 8.0), borderSide: BorderSide( color: field.hasError - ? theme.errorColor() - : theme.secondaryColor(), + ? MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark") + : MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 3.0, ), ), @@ -148,7 +169,9 @@ class _MihTimeFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), @@ -156,7 +179,9 @@ class _MihTimeFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0, ), ), @@ -173,7 +198,9 @@ class _MihTimeFieldState extends State { field.errorText ?? '', style: TextStyle( fontSize: 12, - color: theme.errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, ), ), 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 fc815372..ecab7a05 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart @@ -67,25 +67,27 @@ class _MihToggleState extends State { return Colors.grey; } if (states.contains(WidgetState.selected)) { - return MzansiInnovationHub.of(context)! - .theme - .successColor(); // Outline color when active + return MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"); // Outline color when active } - return MzansiInnovationHub.of(context)! - .theme - .errorColor(); // Outline color when active + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"); // Outline color when active }, ), activeColor: widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, activeTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MihColors.getGreenColor(context), + : MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), inactiveThumbColor: widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, inactiveTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MihColors.getRedColor(context), + : MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // activeColor: widget.secondaryFillColor, // activeTrackColor: widget.fillColor, // inactiveThumbColor: widget.fillColor, diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart index 92d36623..c3f4abba 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart @@ -60,10 +60,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -73,16 +75,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -91,8 +93,8 @@ class _MIHDeleteMessageState extends State { Text( "This note will be deleted permanently. Are you certain you want to delete it?", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -100,13 +102,15 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -127,7 +131,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -144,10 +149,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -157,16 +164,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -175,8 +182,8 @@ class _MIHDeleteMessageState extends State { Text( "This file will be deleted permanently. Are you certain you want to delete it?", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -184,13 +191,15 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -211,7 +220,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -228,10 +238,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -241,16 +253,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -259,8 +271,8 @@ class _MIHDeleteMessageState extends State { Text( "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -269,13 +281,15 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -296,7 +310,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -313,10 +328,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -326,16 +343,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -344,8 +361,8 @@ class _MIHDeleteMessageState extends State { Text( "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -353,13 +370,15 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -380,7 +399,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -397,10 +417,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -410,16 +432,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -428,8 +450,8 @@ class _MIHDeleteMessageState extends State { Text( "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -437,13 +459,15 @@ class _MIHDeleteMessageState extends State { const SizedBox(height: 15), MihButton( onPressed: widget.onTap, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -464,7 +488,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart index 191da4c7..933a69ef 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_error_message.dart @@ -56,10 +56,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -68,14 +71,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 5), Text( "Oops! Looks like some fields are missing.", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -84,8 +89,8 @@ class _MIHErrorMessageState extends State { Text( "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -94,9 +99,9 @@ class _MIHErrorMessageState extends State { RichText( text: TextSpan( style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -105,17 +110,17 @@ class _MIHErrorMessageState extends State { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( text: "Look for fields with an asterisk ("), TextSpan( text: "*", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( text: ") next to them, as these are mandatory."), ], @@ -137,7 +142,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -154,10 +160,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -166,14 +175,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Password Doesn't Meet Requirements", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -182,8 +193,8 @@ class _MIHErrorMessageState extends State { Text( "Oops! Your password doesn't quite meet our standards. To keep your account secure, please make sure your password meets the following requirements", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -192,9 +203,9 @@ class _MIHErrorMessageState extends State { RichText( text: TextSpan( style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -204,9 +215,9 @@ class _MIHErrorMessageState extends State { style: TextStyle( fontStyle: FontStyle.italic, fontSize: popUpBodySize, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( text: "1) Contailes at least 8 characters\n", ), @@ -242,7 +253,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -259,10 +271,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -271,14 +286,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Let's Fix That Username", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -287,8 +304,8 @@ class _MIHErrorMessageState extends State { Text( "Let's create a great username for you! Just a few quick tips:\n• Your username should start with a letter.\n• You can use letters, numbers, and/ or underscores.\n• Keep it between 6 and 20 characters.\n• Avoid special characters like @, #, or \$.\"", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -309,7 +326,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -326,10 +344,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -338,14 +359,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Oops! Invalid Email", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -354,8 +377,8 @@ class _MIHErrorMessageState extends State { Text( "Looks like there's a little hiccup with that email address. Please double-check that you've entered it correctly, including the \"@\" symbol and a domain (like example@email.com).", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -376,7 +399,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -393,10 +417,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -405,14 +432,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //SizedBox(height: 15), Text( "Email Already Exists", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -421,8 +450,8 @@ class _MIHErrorMessageState extends State { Text( "An account is already registered with this email address. Please try logging in or use a different email.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -431,7 +460,8 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -441,8 +471,8 @@ class _MIHErrorMessageState extends State { "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -462,7 +492,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -479,10 +510,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -491,14 +525,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //SizedBox(height: 15), Text( "Passwords Don't Match", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -507,8 +543,8 @@ class _MIHErrorMessageState extends State { Text( "The password and confirm password fields do not match. Please make sure they are identical.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -517,7 +553,8 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -527,8 +564,8 @@ class _MIHErrorMessageState extends State { "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -549,7 +586,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -566,10 +604,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -578,14 +619,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //SizedBox(height: 15), Text( "Uh oh! Login attempt unsuccessful.", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -594,8 +637,8 @@ class _MIHErrorMessageState extends State { Text( "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -604,7 +647,8 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -614,8 +658,8 @@ class _MIHErrorMessageState extends State { "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -636,7 +680,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -653,10 +698,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -665,14 +713,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Internet Connection Lost!", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -681,8 +731,8 @@ class _MIHErrorMessageState extends State { Text( "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -691,7 +741,8 @@ class _MIHErrorMessageState extends State { Text( "Here are a few things you can try:", style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -701,8 +752,8 @@ class _MIHErrorMessageState extends State { "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.", textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -723,7 +774,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -740,10 +792,13 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getRedColor(context), width: 5.0), + border: Border.all( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: SingleChildScrollView( child: Column( @@ -752,14 +807,16 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Location Services Not Enabled", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -768,8 +825,8 @@ class _MIHErrorMessageState extends State { Text( "To get the most out of MIH, we need your location. Please go to the site settings of the app and enable location services. Once you do that, we can start showing you relevant information based on your location.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -778,7 +835,7 @@ class _MIHErrorMessageState extends State { // Text( // "Here are a few things you can try:", // style: TextStyle( - // color: MihColors.getRedColor(context), + // color: MihColors.getRedColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontSize: popUpSubtitleSize, // fontWeight: FontWeight.bold, // ), @@ -789,7 +846,7 @@ class _MIHErrorMessageState extends State { // textAlign: TextAlign.left, // style: TextStyle( // color: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontSize: popUpBodySize, // fontWeight: FontWeight.bold, // ), @@ -810,7 +867,8 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart index 1a37c03d..7323d8c2 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_loading_circle.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:gif_view/gif_view.dart'; @@ -58,11 +59,12 @@ class _MihloadingcircleState extends State { // width: 250, // height: 275, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: Column( diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart index 52d662eb..521fdb49 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_notification_message.dart @@ -132,8 +132,10 @@ class _MIHNotificationMessageState extends State void initState() { super.initState(); setState(() { - primary = MzansiInnovationHub.of(context)!.theme.primaryColor(); - secondary = MihColors.getRedColor(context); + primary = MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); + secondary = MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); }); _animationController = AnimationController( vsync: this, 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 c920d9d7..d91a2fc8 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 @@ -60,10 +60,13 @@ class _MIHSuccessMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), - border: - Border.all(color: MihColors.getGreenColor(context), width: 5.0), + border: Border.all( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + width: 5.0), ), child: Column( mainAxisSize: MainAxisSize.min, @@ -71,14 +74,16 @@ class _MIHSuccessMessageState extends State { Icon( Icons.check_circle_outline_rounded, size: popUpIconSize, - color: MihColors.getGreenColor(context), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Success!", textAlign: TextAlign.center, style: TextStyle( - color: MihColors.getGreenColor(context), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -88,8 +93,8 @@ class _MIHSuccessMessageState extends State { child: Text( message, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -100,13 +105,14 @@ class _MIHSuccessMessageState extends State { onPressed: () { Navigator.pop(context); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Dismiss", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart b/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart index 0a8f5f2e..356d0f5e 100644 --- a/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart +++ b/Frontend/lib/mih_components/mih_pop_up_messages/mih_warning_message.dart @@ -57,10 +57,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -70,16 +72,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Access Pending", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -88,8 +90,8 @@ class _MIHDeleteMessageState extends State { Text( "Your access request is currently being reviewed.\nOnce approved, you'll be able to view patient data.\nPlease follow up with the patient to approve your access request.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -110,7 +112,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -127,10 +130,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -140,16 +145,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Patient Profile Access Needed", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -158,8 +163,8 @@ class _MIHDeleteMessageState extends State { Text( "To proceed with booking an appointment, you must have access to the patient's profile. This will allow you to view their medical history and other relevant information. Please contact the appropriate administrator to request access.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -180,7 +185,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -197,10 +203,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -210,16 +218,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Appointment Cancelled", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -228,8 +236,8 @@ class _MIHDeleteMessageState extends State { Text( "This appointment has been canceled. As a result, you no longer have access to the patient's profile. If you would like to view the patient's profile again, please book a new appointment.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -250,7 +258,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -267,10 +276,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -280,16 +291,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Access Cancelled", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -298,8 +309,8 @@ class _MIHDeleteMessageState extends State { Text( "This appointment has been canceled. As a result, access has been cancelled and the doctor no longer have access to the patient's profile. If you would like them to view the patient's profile again, please book a new appointment through them.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -320,7 +331,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -337,10 +349,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -350,16 +364,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Access Declined", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -368,8 +382,8 @@ class _MIHDeleteMessageState extends State { Text( "Your request to access the patient's profile has been denied. Please contact the patient directly to inquire about the reason for this restriction.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -390,7 +404,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -407,10 +422,12 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -420,16 +437,16 @@ class _MIHDeleteMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //const SizedBox(height: 15), Text( "Access Expired", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -438,8 +455,8 @@ class _MIHDeleteMessageState extends State { Text( "You no longer have access to this patient profile. The authorized access period has ended. Access to a patients profile is limited to 7 days from appointment date.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -460,7 +477,8 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), diff --git a/Frontend/lib/mih_config/mih_colors.dart b/Frontend/lib/mih_config/mih_colors.dart index 492e8ffb..6c69d0a9 100644 --- a/Frontend/lib/mih_config/mih_colors.dart +++ b/Frontend/lib/mih_config/mih_colors.dart @@ -1,74 +1,96 @@ import 'package:flutter/material.dart'; -import 'package:mzansi_innovation_hub/main.dart'; class MihColors { - - static Color getPrimaryColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getPrimaryColor(bool darkMode) { + if (darkMode == true) { return const Color(0XFF3A4454); - }else{ + } else { return const Color(0XFFbedcfe); } } - static Color getSecondaryColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getSecondaryColor(bool darkMode) { + if (darkMode == true) { return const Color(0XFFbedcfe); - }else{ + } else { return const Color(0XFF3A4454); } } - static Color getGreenColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getHighlightColor(bool darkMode) { + if (darkMode == true) { + return const Color(0XFF9bc7fa); + } else { + return const Color(0XFF354866); + } + } + + static Color getGreyColor(bool darkMode) { + if (darkMode == true) { + return const Color(0XFFc8c8c8); + } else { + return const Color(0XFF747474); + } + } + + static Color getGreenColor(bool darkMode) { + if (darkMode == true) { return const Color(0xff8ae290); - }else{ + } else { return const Color(0xffB0F2B4); } } - static Color getRedColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getRedColor(bool darkMode) { + if (darkMode == true) { return const Color(0xffD87E8B); - }else{ + } else { return const Color(0xffbb3d4f); } } - static Color getPinkColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getPinkColor(bool darkMode) { + if (darkMode == true) { return const Color(0xffdaa2e9); - }else{ + } else { // Add a different shade of pink for light mode return const Color(0xffdaa2e9); } } - static Color getOrangeColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getOrangeColor(bool darkMode) { + if (darkMode == true) { return const Color(0xffd69d7d); - }else{ + } else { // Add a different shade of pink for light mode return const Color(0xffd69d7d); } } - static Color getYellowColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getYellowColor(bool darkMode) { + if (darkMode == true) { return const Color(0xfff4e467); - }else{ + } else { // Add a different shade of pink for light mode return const Color(0xffd4af37); } -} + } - static Color getBluishPurpleColor(BuildContext context) { - if(MzansiInnovationHub.of(context)!.theme.mode == "Dark"){ + static Color getBluishPurpleColor(bool darkMode) { + if (darkMode == true) { return const Color(0xff6e7dcc); - }else{ + } else { // Add a different shade of pink for light mode return const Color(0xff6e7dcc); } -} + } -} \ No newline at end of file + static Color getPurpleColor(bool darkMode) { + if (darkMode == true) { + return const Color(0xffb682e7); + } else { + // Add a different shade of pink for light mode + return const Color(0xffb682e7); + } + } +} diff --git a/Frontend/lib/mih_config/mih_theme.dart b/Frontend/lib/mih_config/mih_theme.dart index 76a9e070..5a836a42 100644 --- a/Frontend/lib/mih_config/mih_theme.dart +++ b/Frontend/lib/mih_config/mih_theme.dart @@ -1,12 +1,13 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import "package:universal_html/html.dart" as html; class MihTheme { - late int _mainColor; - late int _secondColor; + // late int _mainColor; + // late int _secondColor; //late int _errColor; //late int _succColor; - late int _mesColor; + // late int _mesColor; late String mode; late String screenType; late AssetImage loading; @@ -32,10 +33,10 @@ class MihTheme { //_mesColor = 0xffc8c8c8d9; } - ThemeData getData() { + ThemeData getData(bool bool) { return ThemeData( fontFamily: 'Segoe UI', - scaffoldBackgroundColor: primaryColor(), + scaffoldBackgroundColor: MihColors.getPrimaryColor(mode == "Dark"), // pageTransitionsTheme: PageTransitionsTheme( // builders: Map.fromIterable( // TargetPlatform.values, @@ -44,36 +45,37 @@ class MihTheme { // ), colorScheme: ColorScheme( brightness: getBritness(), - primary: secondaryColor(), - onPrimary: primaryColor(), - secondary: primaryColor(), - onSecondary: secondaryColor(), - error: errorColor(), - onError: primaryColor(), - surface: primaryColor(), - onSurface: secondaryColor(), + primary: MihColors.getSecondaryColor(mode == "Dark"), + onPrimary: MihColors.getPrimaryColor(mode == "Dark"), + secondary: MihColors.getPrimaryColor(mode == "Dark"), + onSecondary: MihColors.getSecondaryColor(mode == "Dark"), + error: MihColors.getRedColor(mode == "Dark"), + onError: MihColors.getPrimaryColor(mode == "Dark"), + surface: MihColors.getPrimaryColor(mode == "Dark"), + onSurface: MihColors.getSecondaryColor(mode == "Dark"), ), datePickerTheme: DatePickerThemeData( - backgroundColor: primaryColor(), - headerBackgroundColor: secondaryColor(), - headerForegroundColor: primaryColor(), + backgroundColor: MihColors.getPrimaryColor(mode == "Dark"), + headerBackgroundColor: MihColors.getSecondaryColor(mode == "Dark"), + headerForegroundColor: MihColors.getPrimaryColor(mode == "Dark"), ), appBarTheme: AppBarTheme( - color: secondaryColor(), - foregroundColor: primaryColor(), + color: MihColors.getSecondaryColor(mode == "Dark"), + foregroundColor: MihColors.getPrimaryColor(mode == "Dark"), titleTextStyle: TextStyle( - color: primaryColor(), + color: MihColors.getPrimaryColor(mode == "Dark"), fontSize: 25, fontWeight: FontWeight.bold, ), ), floatingActionButtonTheme: FloatingActionButtonThemeData( - backgroundColor: secondaryColor(), - foregroundColor: primaryColor(), - extendedTextStyle: TextStyle(color: primaryColor()), + backgroundColor: MihColors.getSecondaryColor(mode == "Dark"), + foregroundColor: MihColors.getPrimaryColor(mode == "Dark"), + extendedTextStyle: + TextStyle(color: MihColors.getPrimaryColor(mode == "Dark")), ), drawerTheme: DrawerThemeData( - backgroundColor: primaryColor(), + backgroundColor: MihColors.getPrimaryColor(mode == "Dark"), )); } @@ -110,15 +112,15 @@ class MihTheme { } ThemeData getThemeData() { - return getData(); + return getData(mode == "Dark"); } ThemeData darkMode() { - return getData(); + return getData(mode == "Dark"); } ThemeData lightMode() { - return getData(); + return getData(mode == "Dark"); } Brightness getBritness() { @@ -129,39 +131,39 @@ class MihTheme { } } - Color messageTextColor() { - if (mode == "Dark") { - _mesColor = 0XFFc8c8c8; - } else { - _mesColor = 0XFF747474; - } - return Color(_mesColor); - } + // Color messageTextColor() { + // if (mode == "Dark") { + // _mesColor = 0XFFc8c8c8; + // } else { + // _mesColor = 0XFF747474; + // } + // return Color(_mesColor); + // } - Color errorColor() { - if (mode == "Dark") { - return const Color(0xffD87E8B); - } else { - return const Color(0xffbb3d4f); - } - //return Color(_errColor); - } + // Color errorColor() { + // if (mode == "Dark") { + // return const Color(0xffD87E8B); + // } else { + // return const Color(0xffbb3d4f); + // } + // //return Color(_errColor); + // } - Color highlightColor() { - if (mode == "Dark") { - return const Color(0XFF9bc7fa); - } else { - return const Color(0XFF354866); - } - } + // Color highlightColor() { + // if (mode == "Dark") { + // return const Color(0XFF9bc7fa); + // } else { + // return const Color(0XFF354866); + // } + // } - Color successColor() { - if (mode == "Dark") { - return const Color(0xffB0F2B4); - } else { - return const Color(0xff56a95b); - } - } + // Color successColor() { + // if (mode == "Dark") { + // return const Color(0xffB0F2B4); + // } else { + // return const Color(0xff56a95b); + // } + // } AssetImage loadingImage() { if (mode == "Dark") { @@ -231,21 +233,21 @@ class MihTheme { } } - Color primaryColor() { - if (mode == "Dark") { - _mainColor = 0XFF3A4454; - } else { - _mainColor = 0XFFbedcfe; - } - return Color(_mainColor); - } + // Color MihColors.getPrimaryColor(mode == "Dark") { + // if (mode == "Dark") { + // _mainColor = 0XFF3A4454; + // } else { + // _mainColor = 0XFFbedcfe; + // } + // return Color(_mainColor); + // } - Color secondaryColor() { - if (mode == "Dark") { - _secondColor = 0XFFbedcfe; - } else { - _secondColor = 0XFF3A4454; - } - return Color(_secondColor); - } +// Color MihColors.getSecondaryColor(mode == "Dark") { +// if (mode == "Dark") { +// _secondColor = 0XFFbedcfe; +// } else { +// _secondColor = 0XFF3A4454; +// } +// return Color(_secondColor); +// } } diff --git a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart index 9154b0cc..4552d9af 100644 --- a/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart +++ b/Frontend/lib/mih_packages/about_mih/mih_policy_tos_ext/policy_and_terms_text.dart @@ -1,6 +1,7 @@ -import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.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'; class PolicyAndTermsText { List getPrivacyPolicyText(BuildContext context) { @@ -30,7 +31,8 @@ class PolicyAndTermsText { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -427,7 +429,8 @@ class PolicyAndTermsText { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), diff --git a/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart b/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart index 87480ad5..f8e1bba1 100644 --- a/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart +++ b/Frontend/lib/mih_packages/about_mih/package_tile/about_mih_tile.dart @@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class AboutMihTile extends StatefulWidget { final double packageSize; @@ -27,12 +28,15 @@ class _AboutMihTileState extends State { appName: "About MIH", appIcon: Icon( MihIcons.aboutMih, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 28d51598..1f35132d 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 @@ -35,8 +35,8 @@ class _MihAttributesState extends State { child: Icon( icon, // size: 125, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -71,12 +71,14 @@ class _MihAttributesState extends State { ), ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 100, child: Text( "Visit", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -110,7 +112,8 @@ class _MihAttributesState extends State { children: [ Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 165, ), const SizedBox( 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 6858f506..0fdf31ca 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 @@ -63,8 +63,8 @@ class _MihInfoState extends State { Padding( padding: const EdgeInsets.only(left: 4.0), child: CircleAvatar( - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), backgroundImage: const AssetImage( "lib/mih_components/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'), @@ -74,7 +74,8 @@ class _MihInfoState extends State { Icon( MihIcons.mihRing, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ], ), @@ -234,12 +235,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.youtube, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 175, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -250,12 +254,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.tiktok, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -266,12 +273,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.twitch, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -282,12 +292,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.threads, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -298,12 +311,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.whatsapp, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -314,12 +330,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.instagram, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== @@ -331,12 +350,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.xTwitter, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -347,12 +369,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.linkedin, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -363,12 +388,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.facebook, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -379,12 +407,15 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.reddit, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 200, ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== socials.add(MIHTile( @@ -396,19 +427,22 @@ class _MihInfoState extends State { child: Text( "KICK", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, fontSize: 100, ), ), // FaIcon( // FontAwesomeIcons.tv, - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: 200, // ), ), - p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - s: MzansiInnovationHub.of(context)!.theme.primaryColor(), + p: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + s: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), )); //================================================================== return socials; @@ -448,13 +482,15 @@ class _MihInfoState extends State { children: [ FaIcon( platformIcon, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(width: 10), Text( btnText, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -490,8 +526,8 @@ class _MihInfoState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -542,7 +578,9 @@ class _MihInfoState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: getInstallButtonText(), ), @@ -554,24 +592,26 @@ class _MihInfoState extends State { ), ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ FaIcon( FontAwesomeIcons.youtube, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(width: 10), Text( "MIH Beginners Guide", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -587,24 +627,26 @@ class _MihInfoState extends State { ), ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ FaIcon( FontAwesomeIcons.patreon, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(width: 10), Text( "Support Our Journey", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -648,15 +690,19 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.vpn_lock, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "MIH - Web", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { shareMIHLink( context, @@ -668,15 +714,19 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.apple, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "MIH - iOS", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { shareMIHLink( context, @@ -688,15 +738,19 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.android, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "MIH - Android", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { 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 95dd7ebb..e18906e9 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 @@ -132,24 +132,29 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getGreenColor(context))); + style: TextStyle( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.messageTextColor())); + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getRedColor(context))); + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } return ListTile( title: Text( line1, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -165,7 +170,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), onTap: () { @@ -177,7 +182,7 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), ); } @@ -232,8 +237,8 @@ class _BuildPatientsListState extends State { subtitle, textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -247,14 +252,15 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "declined"); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Decline", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -264,14 +270,15 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "approved"); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Approve", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -308,7 +315,8 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.accessRequests.length, 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 e429a0af..b7e76704 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 @@ -85,24 +85,29 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getGreenColor(context))); + style: TextStyle( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.messageTextColor())); + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getRedColor(context))); + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } return ListTile( title: Text( line1, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -117,7 +122,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), onTap: () { @@ -125,7 +130,7 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), ); } @@ -193,8 +198,8 @@ class _BuildPatientsListState extends State { subtitle, textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -211,14 +216,18 @@ class _BuildPatientsListState extends State { "Important Notice: Approving Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), Text( "You are about to accept access to your patient's profile. Please be aware of the following important points:", style: TextStyle( fontWeight: FontWeight.normal, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), SizedBox( @@ -227,9 +236,9 @@ class _BuildPatientsListState extends State { "1. Permanent Access: Once you accepts this access request, it will become permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -239,9 +248,9 @@ class _BuildPatientsListState extends State { "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: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -251,9 +260,9 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: Once granted, you cannot revoke access to your patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -261,7 +270,9 @@ class _BuildPatientsListState extends State { "By pressing the \"Approve\" button you accept the above terms.", style: TextStyle( fontWeight: FontWeight.bold, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -277,14 +288,18 @@ class _BuildPatientsListState extends State { "Important Notice: Approved Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), 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(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), SizedBox( @@ -293,9 +308,9 @@ class _BuildPatientsListState extends State { "1. Permanent Access: This access is permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -305,9 +320,9 @@ class _BuildPatientsListState extends State { "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: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -317,9 +332,9 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: You cannot revoke this access to your patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -349,14 +364,16 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Decline", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -375,14 +392,16 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Approve", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -420,7 +439,8 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.patientAccessList.length, diff --git a/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart b/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart index 78acdc24..561755ca 100644 --- a/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart +++ b/Frontend/lib/mih_packages/access_review/package_tile/mih_access_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihAccessTile extends StatefulWidget { final AppUser signedInUser; @@ -31,12 +32,15 @@ class _MihAccessTileState extends State { appName: "Access Controls", appIcon: Icon( MihIcons.accessControl, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart index a3b80b05..49cfe479 100644 --- a/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart +++ b/Frontend/lib/mih_packages/access_review/package_tools/mih_access_requests.dart @@ -1,11 +1,12 @@ +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_single_child_scroll.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_package_tool_body.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; -import '../../../main.dart'; import '../../../mih_services/mih_service_calls.dart'; import '../../../mih_components/mih_layout/mih_action.dart'; import '../../../mih_components/mih_layout/mih_header.dart'; @@ -197,9 +198,9 @@ class _MihAccessRequestState extends State { Icon( MihIcons.accessControl, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(height: 10), Text( @@ -209,9 +210,9 @@ class _MihAccessRequestState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), // const SizedBox(height: 10), @@ -269,9 +270,9 @@ class _MihAccessRequestState extends State { "$errorCode: Error pulling Patients Data\n$baseUrl/queue/patients/\n$errorBody", style: TextStyle( fontSize: 25, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor()), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index 29450b93..a80aefb5 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -39,7 +39,8 @@ class _BiometricCheckState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -110,7 +111,8 @@ class _BiometricCheckState extends State { Widget alertpopUp = MihPackageAlert( alertIcon: Icon( Icons.fingerprint, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 100, ), alertTitle: "Biometric Authentication Error", @@ -121,7 +123,8 @@ class _BiometricCheckState extends State { "Hi there! To jump into the MIH Home Package, you'll need to authenticate yourself with your phones biometrics, please set up biometric authentication (like fingerprint, face ID, pattern or pin) on your device first.\n\nIf you have already set up biometric authentication, press \"Authenticate now\" to try again or press \"Set Up Authentication\" to go to your device settings.", style: TextStyle( fontSize: 15, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 20), @@ -138,14 +141,14 @@ class _BiometricCheckState extends State { ); Navigator.of(context).pop(); }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Set Up Authentication", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -156,13 +159,14 @@ class _BiometricCheckState extends State { Navigator.of(context).pop(); authenticateUser(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Authenticate Now", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -172,7 +176,8 @@ class _BiometricCheckState extends State { ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); showDialog( context: context, @@ -197,8 +202,8 @@ class _BiometricCheckState extends State { Icon( Icons.fingerprint, size: 100, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //spacer const SizedBox(height: 10), @@ -209,9 +214,9 @@ class _BiometricCheckState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), //spacer @@ -220,22 +225,23 @@ class _BiometricCheckState extends State { Icon( Icons.lock, size: 200, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 30), MihButton( onPressed: () { authenticateUser(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Authenticate Now", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/authentication/forgot_password.dart b/Frontend/lib/mih_packages/authentication/forgot_password.dart index bb82d225..a6e6bb00 100644 --- a/Frontend/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/lib/mih_packages/authentication/forgot_password.dart @@ -80,11 +80,13 @@ class _ForgotPasswordState extends State { } Color getPrim() { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } Color getSec() { - return MzansiInnovationHub.of(context)!.theme.primaryColor(); + return MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } void prePassResteWarning() { @@ -95,7 +97,8 @@ class _ForgotPasswordState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Password Reset Confirmation", alertBody: Column( @@ -106,8 +109,8 @@ class _ForgotPasswordState extends State { child: Text( "Before you reset your password, please be aware that you'll receive an email with a link to confirm your identity and set a new password. Make sure to check your inbox, including spam or junk folders. If you don't receive the email within a few minutes, please try resending the reset request.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -122,13 +125,14 @@ class _ForgotPasswordState extends State { Navigator.of(context).pop(); validateInput(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Continue", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -136,7 +140,8 @@ class _ForgotPasswordState extends State { ), ], ), - alertColour: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + alertColour: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -236,9 +241,9 @@ class _ForgotPasswordState extends State { Icon( Icons.lock, size: 100, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), //spacer const SizedBox(height: 10), @@ -248,9 +253,9 @@ class _ForgotPasswordState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), const SizedBox(height: 25), @@ -258,12 +263,12 @@ class _ForgotPasswordState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -286,16 +291,18 @@ class _ForgotPasswordState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Reset Password", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index c8b29aef..aa3e5c61 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -240,12 +240,14 @@ class _RegisterState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -269,7 +271,8 @@ class _RegisterState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -332,9 +335,9 @@ class _RegisterState extends State { Icon( Icons.lock, size: 100, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), //spacer const SizedBox(height: 10), @@ -344,9 +347,9 @@ class _RegisterState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), //spacer @@ -356,12 +359,12 @@ class _RegisterState extends State { formFields: [ //email input MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -375,12 +378,12 @@ class _RegisterState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: passwordController, multiLineInput: false, requiredText: true, @@ -395,12 +398,12 @@ class _RegisterState extends State { //spacer const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: confirmPasswordController, multiLineInput: false, requiredText: true, @@ -431,16 +434,20 @@ class _RegisterState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -448,16 +455,20 @@ class _RegisterState extends State { ), MihButton( onPressed: widget.onTap, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 300, child: Text( "I have an account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/authentication/reset_password.dart b/Frontend/lib/mih_packages/authentication/reset_password.dart index a2651cf9..272445d8 100644 --- a/Frontend/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/lib/mih_packages/authentication/reset_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'; @@ -98,11 +99,13 @@ class _ResetPasswordState extends State { } Color getPrim() { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } Color getSec() { - return MzansiInnovationHub.of(context)!.theme.primaryColor(); + return MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } void loginError() { @@ -214,9 +217,9 @@ class _ResetPasswordState extends State { Icon( Icons.lock, size: 100, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), //spacer const SizedBox(height: 10), @@ -226,9 +229,9 @@ class _ResetPasswordState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), //spacer @@ -237,12 +240,12 @@ class _ResetPasswordState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: passwordController, multiLineInput: false, requiredText: true, @@ -257,12 +260,12 @@ class _ResetPasswordState extends State { //spacer const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: confirmPasswordController, multiLineInput: false, requiredText: true, @@ -288,16 +291,18 @@ class _ResetPasswordState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Reset Password", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 2af687a6..1e86ba77 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -88,11 +88,13 @@ class _SignInState extends State { } Color getPrim() { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } Color getSec() { - return MzansiInnovationHub.of(context)!.theme.primaryColor(); + return MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } void setSandboxProfiles(List tileList) { @@ -212,7 +214,7 @@ class _SignInState extends State { context: context, builder: (context) { return Dialog( - //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Stack( children: [ Container( @@ -220,12 +222,13 @@ class _SignInState extends State { width: 500.0, height: 500, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 5.0), ), child: Column( @@ -235,9 +238,9 @@ class _SignInState extends State { "Sandbox Profiles", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 25.0, fontWeight: FontWeight.bold, ), @@ -247,9 +250,9 @@ class _SignInState extends State { "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -282,7 +285,8 @@ class _SignInState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -304,12 +308,14 @@ class _SignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -336,7 +342,8 @@ class _SignInState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -400,9 +407,9 @@ class _SignInState extends State { Icon( Icons.lock, size: 100, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), //spacer const SizedBox(height: 10), @@ -412,9 +419,9 @@ class _SignInState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), //spacer @@ -423,12 +430,12 @@ class _SignInState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -443,12 +450,12 @@ class _SignInState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: passwordController, multiLineInput: false, requiredText: true, @@ -477,9 +484,11 @@ class _SignInState extends State { 'Forgot Password?', style: TextStyle( fontSize: 15, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontWeight: FontWeight.bold, ), ), @@ -507,17 +516,20 @@ class _SignInState extends State { .formNotFilledCompletely(context); } }, - buttonColor: + buttonColor: MihColors.getGreenColor( MzansiInnovationHub.of(context)! - .theme - .successColor(), + .theme + .mode == + "Dark"), width: 300, child: Text( "Sign In", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -525,17 +537,20 @@ class _SignInState extends State { ), MihButton( onPressed: widget.onTap, - buttonColor: + buttonColor: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + .theme + .mode == + "Dark"), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -570,10 +585,13 @@ class _SignInState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 15, - color: MzansiInnovationHub.of( - context)! - .theme - .secondaryColor()), + color: + MihColors.getSecondaryColor( + MzansiInnovationHub.of( + context)! + .theme + .mode == + "Dark")), ), onTap: () { setState(() { @@ -620,10 +638,11 @@ class _SignInState extends State { "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.", textAlign: TextAlign.center, style: TextStyle( - color: + color: MihColors.getSecondaryColor( MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + .theme + .mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart index 2f1ca93b..0e2ce86a 100644 --- a/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart +++ b/Frontend/lib/mih_packages/calculator/package_tiles/mih_calculator_tile.dart @@ -2,6 +2,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihCalculatorTile extends StatefulWidget { final bool personalSelected; @@ -30,12 +31,15 @@ class _MihCalculatorTileState extends State { appName: "Calculator", appIcon: Icon( MihIcons.calculator, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart index b727be5a..a91104ec 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/currency_exchange_rate.dart @@ -77,7 +77,8 @@ class _CurrencyExchangeRateState extends State { Icon( Icons.currency_exchange, size: 150, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 20), FittedBox( @@ -87,8 +88,8 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -103,9 +104,9 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -117,9 +118,9 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -136,9 +137,9 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -150,9 +151,9 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -187,7 +188,8 @@ class _CurrencyExchangeRateState extends State { textAlign: TextAlign.center, style: TextStyle( fontSize: 25, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), ), @@ -207,7 +209,8 @@ class _CurrencyExchangeRateState extends State { '$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: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.normal, ), ), @@ -218,7 +221,8 @@ class _CurrencyExchangeRateState extends State { '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: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.normal, ), ), @@ -229,7 +233,8 @@ class _CurrencyExchangeRateState extends State { '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: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.normal, ), ), @@ -244,7 +249,8 @@ class _CurrencyExchangeRateState extends State { text: TextSpan( style: TextStyle( fontSize: 15, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.normal, ), children: [ @@ -301,12 +307,12 @@ class _CurrencyExchangeRateState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _fromAmountController, multiLineInput: false, requiredText: true, @@ -346,9 +352,9 @@ class _CurrencyExchangeRateState extends State { text: TextSpan( style: TextStyle( fontSize: 15, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ const TextSpan( @@ -358,9 +364,11 @@ class _CurrencyExchangeRateState extends State { text: "Diclaimer", style: TextStyle( decoration: TextDecoration.underline, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontWeight: FontWeight.bold, ), recognizer: TapGestureRecognizer() @@ -389,16 +397,20 @@ class _CurrencyExchangeRateState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 300, child: Text( "Calculate", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -408,16 +420,20 @@ class _CurrencyExchangeRateState extends State { onPressed: () { clearInput(); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 300, child: Text( "Clear", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -437,7 +453,9 @@ class _CurrencyExchangeRateState extends State { child: Text( "Error pulling Currency Exchange Data.", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart index f71725c4..966ee6c7 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -108,8 +108,8 @@ class _SimpleCalcState extends State { userInput, style: TextStyle( fontSize: 40, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -123,8 +123,8 @@ class _SimpleCalcState extends State { answer, style: TextStyle( fontSize: 30, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold), ), ), @@ -159,16 +159,18 @@ class _SimpleCalcState extends State { answer = '0'; }); }, - buttonColor: const Color.fromRGBO(214, 171, 255, 1), + buttonColor: MihColors.getPurpleColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -187,18 +189,18 @@ class _SimpleCalcState extends State { userInput += buttons[index]; }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .messageTextColor(), + buttonColor: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -216,18 +218,18 @@ class _SimpleCalcState extends State { userInput += buttons[index]; }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .messageTextColor(), + buttonColor: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -256,18 +258,18 @@ class _SimpleCalcState extends State { }); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .messageTextColor(), + buttonColor: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -296,15 +298,17 @@ class _SimpleCalcState extends State { equalPressed(); }); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Icon( Icons.backspace, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ); @@ -320,16 +324,18 @@ class _SimpleCalcState extends State { userInput = answer; }); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -348,18 +354,18 @@ class _SimpleCalcState extends State { equalPressed(); }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 50, height: 50, borderRadius: 5, child: Text( buttons[index], style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart index e5ac3c16..f9269868 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -111,8 +111,8 @@ class _TipCalcState extends State { children: [ FaIcon( FontAwesomeIcons.coins, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), const SizedBox(width: 15), @@ -122,8 +122,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -134,7 +134,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const Divider(), @@ -144,8 +145,8 @@ class _TipCalcState extends State { children: [ FaIcon( FontAwesomeIcons.moneyBills, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), const SizedBox(width: 15), @@ -155,8 +156,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -167,7 +168,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), Text( @@ -176,7 +178,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), if (splitBillController.text == "Yes") const Divider(), @@ -187,8 +190,8 @@ class _TipCalcState extends State { children: [ FaIcon( FontAwesomeIcons.peopleGroup, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), const SizedBox(width: 15), @@ -198,9 +201,9 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -212,8 +215,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), if (splitBillController.text == "Yes") @@ -223,8 +226,8 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), SizedBox(height: 10), @@ -268,10 +271,10 @@ class _TipCalcState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: billAmountController, multiLineInput: false, requiredText: true, @@ -283,10 +286,10 @@ class _TipCalcState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: tipPercentageController, multiLineInput: false, requiredText: true, @@ -300,10 +303,10 @@ class _TipCalcState extends State { MihToggle( hintText: "Split Bill", initialPostion: splitPosition, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (value) { setState(() { splitBillController.text = value ? "Yes" : "No"; @@ -340,12 +343,12 @@ class _TipCalcState extends State { children: [ MihNumericStepper( controller: noPeopleController, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), hintText: "No. People", requiredText: temp == "Yes", minValue: 2, @@ -393,14 +396,16 @@ class _TipCalcState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Calculate", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -410,14 +415,16 @@ class _TipCalcState extends State { onPressed: () { clearInput(); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Clear", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), 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 f551fd20..df5a2f8f 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 @@ -134,24 +134,29 @@ class _BuildPatientsListState extends State { if (access == "APPROVED") { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getGreenColor(context))); + style: TextStyle( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.messageTextColor())); + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else { accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getRedColor(context))); + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } return ListTile( title: Text( line1, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -167,7 +172,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), onTap: () { @@ -179,7 +184,7 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), ); } @@ -234,8 +239,8 @@ class _BuildPatientsListState extends State { subtitle, textAlign: TextAlign.left, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -249,14 +254,15 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "declined"); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Decline", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -266,14 +272,15 @@ class _BuildPatientsListState extends State { onPressed: () { updateAccessAPICall(index, "approved"); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Approve", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -310,7 +317,8 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.accessRequests.length, 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 c5f16642..b6a206b2 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart @@ -89,18 +89,19 @@ class _BuildAppointmentListState extends State { // print("Date: $date"); // print("Appointment Date: $appointDate"); // print("Appointment Hour: $appointHour"); - Color appointmentColor = - MzansiInnovationHub.of(context)!.theme.secondaryColor(); + Color appointmentColor = MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); if (date == appointDate) { if (appointHour < hourNow) { - appointmentColor = - MzansiInnovationHub.of(context)!.theme.messageTextColor(); + appointmentColor = MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else if (appointHour == hourNow) { - appointmentColor = MihColors.getGreenColor(context); + appointmentColor = MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) { - appointmentColor = - MzansiInnovationHub.of(context)!.theme.messageTextColor(); + appointmentColor = MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } return Container( @@ -158,15 +159,19 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Edit Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -174,15 +179,19 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deleteAppointmentConfirmationWindow(index); }, @@ -204,10 +213,10 @@ class _BuildAppointmentListState extends State { children: [ const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -216,10 +225,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.dateController, multiLineInput: false, requiredText: true, @@ -228,10 +237,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.timeController, multiLineInput: false, requiredText: true, @@ -240,10 +249,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -272,15 +281,19 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Edit Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -288,15 +301,19 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deleteAppointmentConfirmationWindow(index); }, @@ -318,10 +335,10 @@ class _BuildAppointmentListState extends State { children: [ const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -330,10 +347,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.dateController, multiLineInput: false, requiredText: true, @@ -342,10 +359,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.timeController, multiLineInput: false, requiredText: true, @@ -354,10 +371,10 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -417,11 +434,12 @@ class _BuildAppointmentListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -450,11 +468,12 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -480,16 +499,18 @@ class _BuildAppointmentListState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart index 1c350404..3fead192 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/patient_queue.dart'; - -import '../../../main.dart'; -import '../../../mih_components/mih_pop_up_messages/mih_warning_message.dart'; -import '../../../mih_config/mih_env.dart'; +import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_warning_message.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_env.dart'; class BuildQueueList extends StatefulWidget { final List patientQueue; @@ -44,7 +44,8 @@ class _BuildQueueListState extends State { title: Text( title, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -121,7 +122,8 @@ class _BuildQueueListState extends State { shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.patientQueue.length, diff --git a/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart b/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart index de6a06c6..7ec7b80d 100644 --- a/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart +++ b/Frontend/lib/mih_packages/calendar/package_tiles/mzansi_calendar_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiCalendarTile extends StatefulWidget { final CalendarArguments arguments; @@ -31,12 +32,15 @@ class _MzansiCalendarTileState extends State { appName: "Calendar", appIcon: Icon( MihIcons.calendar, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index b4542e01..31637f54 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -94,7 +94,8 @@ class _PatientAccessRequestState extends State { Icon( MihIcons.calendar, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -104,7 +105,8 @@ class _PatientAccessRequestState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -115,8 +117,8 @@ class _PatientAccessRequestState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan(text: "Press "), @@ -125,9 +127,9 @@ class _PatientAccessRequestState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan( @@ -150,7 +152,7 @@ class _PatientAccessRequestState extends State { // "No Appointments for $selectedDay", // style: TextStyle( // fontSize: 25, - // color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), + // color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // textAlign: TextAlign.center, // softWrap: true, @@ -186,11 +188,12 @@ class _PatientAccessRequestState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _appointmentTitleController, multiLineInput: false, requiredText: true, @@ -219,11 +222,12 @@ class _PatientAccessRequestState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _appointmentDescriptionIDController, multiLineInput: true, height: 250, @@ -243,14 +247,16 @@ class _PatientAccessRequestState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -354,7 +360,7 @@ class _PatientAccessRequestState extends State { }); }), // Divider( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), Row( mainAxisSize: MainAxisSize.max, @@ -376,9 +382,11 @@ class _PatientAccessRequestState extends State { "Error pulling appointments", style: TextStyle( fontSize: 25, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor()), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark")), textAlign: TextAlign.center, ), ); @@ -399,15 +407,19 @@ class _PatientAccessRequestState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Add Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { addAppointmentWindow(width); }, diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart index df89c31a..6fc9e0de 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_register.dart @@ -160,18 +160,21 @@ class _MihRegisterState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_amber_rounded, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 100, ), alertTitle: "Error While Signing Up", alertBody: Text( "An error occurred while signing up. Please try again later.", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 18, ), ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -258,7 +261,8 @@ class _MihRegisterState extends State { Icon( Icons.lock, size: 100, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //spacer const SizedBox(height: 10), @@ -268,8 +272,8 @@ class _MihRegisterState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), //spacer @@ -279,10 +283,10 @@ class _MihRegisterState extends State { formFields: [ //email input MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -296,10 +300,10 @@ class _MihRegisterState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: passwordController, multiLineInput: false, requiredText: true, @@ -313,10 +317,10 @@ class _MihRegisterState extends State { //spacer const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: confirmPasswordController, multiLineInput: false, requiredText: true, @@ -346,16 +350,16 @@ class _MihRegisterState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -363,16 +367,16 @@ class _MihRegisterState extends State { ), MihButton( onPressed: widget.onExistingUserButtonTap, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "I have an account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart index baf50b96..e016fc4d 100644 --- a/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart +++ b/Frontend/lib/mih_packages/mih_authentication/package_tools/mih_sign_in.dart @@ -9,6 +9,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ 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_text_form_field.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_error_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_services/mih_alert_services.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_authentication_services.dart'; @@ -159,11 +160,13 @@ class _MihSignInState extends State { } Color getPrim() { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } Color getSec() { - return MzansiInnovationHub.of(context)!.theme.primaryColor(); + return MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } void loginError() { @@ -232,16 +235,16 @@ class _MihSignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -255,8 +258,8 @@ class _MihSignInState extends State { Icon( Icons.lock, size: 100, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), //spacer const SizedBox(height: 10), @@ -266,8 +269,8 @@ class _MihSignInState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), //spacer @@ -276,11 +279,12 @@ class _MihSignInState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -294,11 +298,12 @@ class _MihSignInState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: passwordController, multiLineInput: false, requiredText: true, @@ -327,9 +332,11 @@ class _MihSignInState extends State { 'Forgot Password?', style: TextStyle( fontSize: 15, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontWeight: FontWeight.bold, ), ), @@ -357,16 +364,18 @@ class _MihSignInState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Sign In", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -374,16 +383,18 @@ class _MihSignInState extends State { ), MihButton( onPressed: widget.onNewUserButtonTap, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -420,9 +431,11 @@ class _MihSignInState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 15, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark")), ), onTap: () { setState(() { @@ -469,9 +482,11 @@ class _MihSignInState extends State { "NB: These accounts are used for test purposes. Please do not store personal information on these profiles.", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .errorColor(), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart index 5081a062..e562e1a3 100644 --- a/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart +++ b/Frontend/lib/mih_packages/mih_home/components/mih_app_drawer.dart @@ -3,6 +3,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_package_components/mih_circle_avatar.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 '../../../main.dart'; import 'package:supertokens_flutter/supertokens.dart'; @@ -57,9 +58,10 @@ class _MIHAppDrawerState extends State { fileNameController: proPicController, onChange: (_) {}, userSelectedfile: null, - frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + frameColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); } @@ -84,7 +86,7 @@ class _MIHAppDrawerState extends State { // MzansiInnovationHub.of(context)!.theme.logoImage().image, context); return SafeArea( child: Drawer( - //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: LayoutBuilder( builder: (BuildContext context, BoxConstraints constraints) { return Stack( @@ -97,9 +99,9 @@ class _MIHAppDrawerState extends State { children: [ DrawerHeader( decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), child: SizedBox( height: 400, @@ -113,9 +115,11 @@ class _MIHAppDrawerState extends State { "${widget.signedInUser.fname} ${widget.signedInUser.lname}", style: TextStyle( fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), Text( @@ -123,9 +127,11 @@ class _MIHAppDrawerState extends State { style: TextStyle( fontSize: 12, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), Text( @@ -133,9 +139,11 @@ class _MIHAppDrawerState extends State { style: TextStyle( fontSize: 10, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), ], @@ -149,7 +157,7 @@ class _MIHAppDrawerState extends State { // Icon( // Icons.home_outlined, // color: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // const SizedBox(width: 25.0), // Text( @@ -179,18 +187,22 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.policy, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), const SizedBox(width: 25.0), Text( "Privacy Policy", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), ], @@ -208,18 +220,22 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.design_services_rounded, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), const SizedBox(width: 25.0), Text( "Terms of Service", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), ], @@ -237,18 +253,22 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.logout, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), const SizedBox(width: 25.0), Text( "Sign Out", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), ], @@ -303,8 +323,9 @@ class _MIHAppDrawerState extends State { }, child: Icon( MihIcons.mihLogo, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), // IconButton( @@ -324,7 +345,7 @@ class _MIHAppDrawerState extends State { // }, // icon: Icon( // Icons.light_mode, - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: 35, // ), // ), diff --git a/Frontend/lib/mih_packages/mih_home/mih_home.dart b/Frontend/lib/mih_packages/mih_home/mih_home.dart index b59bd32a..a0b2ce0a 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -8,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/notification.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/components/mih_app_drawer.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_business_home.dart'; import 'package:mzansi_innovation_hub/mih_packages/mih_home/package_tools/mih_personal_home.dart'; @@ -117,9 +118,10 @@ class _MihHomeState extends State { fileNameController: proPicController, userSelectedfile: null, // frameColor: frameColor, - frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (_) {}, ), // MIHProfilePicture( @@ -130,7 +132,7 @@ class _MihHomeState extends State { // radius: 21, // drawerMode: false, // editable: false, - // frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // onChange: (newProPic) {}, // ), ), 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 7fe283df..b14b7f4a 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -863,17 +863,21 @@ class _MIHHomeLegacyState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), label: "Delete File", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () {}, ), ], @@ -950,11 +954,13 @@ class _MIHHomeLegacyState extends State { } Color getPrim() { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } Color getSec() { - return MzansiInnovationHub.of(context)!.theme.primaryColor(); + return MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } bool isBusinessUser(AppUser signedInUser) { @@ -991,7 +997,7 @@ class _MIHHomeLegacyState extends State { // radius: 21, // drawerMode: false, // editable: false, - // frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // frameColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // onChange: (newProPic) {}, // ), ), @@ -1021,7 +1027,8 @@ class _MIHHomeLegacyState extends State { child: Icon( Icons.circle, size: 10, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ) ], @@ -1088,10 +1095,10 @@ class _MIHHomeLegacyState extends State { hintText: "Ask Mzansi", prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { print("Search Text: ${searchController.text}"); setState(() { @@ -1166,11 +1173,11 @@ class _MIHHomeLegacyState extends State { child: Placeholder(), // GNav( // //hoverColor: Colors.lightBlueAccent, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // iconSize: 35.0, - // activeColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // activeColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // tabBackgroundColor: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // //gap: 20, // //padding: EdgeInsets.all(15), // tabs: [ 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 4af5036b..eedb5a2d 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -93,7 +93,8 @@ class _MIHProfileGetterState extends State { "Connection Error", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 35, fontWeight: FontWeight.bold, ), @@ -101,7 +102,8 @@ class _MIHProfileGetterState extends State { Icon( Icons.power_off_outlined, size: 150, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), SizedBox( width: 500, @@ -109,8 +111,8 @@ class _MIHProfileGetterState extends State { "Looks like we ran into an issue getting your data.\nPlease check you internet connection and try again.", textAlign: TextAlign.center, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -121,12 +123,14 @@ class _MIHProfileGetterState extends State { onPressed: () { Navigator.of(context).popAndPushNamed("/"); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Refresh", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -142,7 +146,9 @@ class _MIHProfileGetterState extends State { "Error: $error", textAlign: TextAlign.left, style: TextStyle( - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart index 8f03a917..738ad4b1 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_business_home.dart @@ -7,6 +7,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/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.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'; @@ -215,7 +216,7 @@ class _MihBusinessHomeState extends State // Icon( // MihIcons.mihLogo, // size: width / 2, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // const SizedBox(height: 10), // Text( @@ -225,7 +226,7 @@ class _MihBusinessHomeState extends State // style: TextStyle( // fontSize: 30, // fontWeight: FontWeight.bold, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), // const SizedBox(height: 20), @@ -238,10 +239,10 @@ class _MihBusinessHomeState extends State hintText: "Ask Mzansi", prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { Navigator.of(context).pushNamed( '/mzansi-ai', @@ -292,9 +293,9 @@ class _MihBusinessHomeState extends State Icon( MihIcons.mzansiAi, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(height: 10), Text( @@ -304,9 +305,9 @@ class _MihBusinessHomeState extends State style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], diff --git a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart index e83df4de..def04d9f 100644 --- a/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart +++ b/Frontend/lib/mih_packages/mih_home/package_tools/mih_personal_home.dart @@ -8,6 +8,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/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business_user.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'; @@ -171,11 +172,14 @@ class _MihPersonalHomeState extends State appName: "Test", appIcon: Icon( Icons.warning_amber_rounded, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), iconSize: packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ) }); } @@ -267,7 +271,7 @@ class _MihPersonalHomeState extends State // Icon( // MihIcons.mihLogo, // size: 200, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // const SizedBox(height: 10), // Text( @@ -277,7 +281,7 @@ class _MihPersonalHomeState extends State // style: TextStyle( // fontSize: 30, // fontWeight: FontWeight.bold, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), // const SizedBox(height: 20), @@ -290,10 +294,10 @@ class _MihPersonalHomeState extends State hintText: "Ask Mzansi", prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { Navigator.of(context).pushNamed( '/mzansi-ai', @@ -345,9 +349,9 @@ class _MihPersonalHomeState extends State Icon( MihIcons.mzansiAi, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(height: 10), Text( @@ -357,9 +361,9 @@ class _MihPersonalHomeState extends State style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], diff --git a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart index efec3f7e..af830803 100644 --- a/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_ai/package_tiles/mzansi_ai_tile.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiAiTile extends StatefulWidget { final AppUser signedInUser; @@ -35,12 +36,15 @@ class _MzansiAiTileState extends State { appName: "Mzansi AI", appIcon: Icon( MihIcons.mzansiAi, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 777aeff9..6f136666 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 @@ -189,19 +189,23 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.volume_up, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), label: "Read Aloud", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onTap: () { _speakText(snapshot.requireData); }, @@ -222,9 +226,9 @@ class _AiChatState extends State { snapshot.requireData, textAlign: TextAlign.left, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: _chatFrontSize, fontWeight: FontWeight.bold, ), @@ -305,29 +309,37 @@ class _AiChatState extends State { ChatTheme getChatTheme() { return DarkChatTheme( - backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), - inputBackgroundColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputTextColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), - inputTextCursorColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MihColors.getGreenColor(context), - errorColor: MihColors.getRedColor(context), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputBackgroundColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputTextColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputTextCursorColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + errorColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), sentMessageBodyTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', ), receivedMessageBodyTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', ), emptyChatPlaceholderTextStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', @@ -349,13 +361,13 @@ class _AiChatState extends State { child: Container( padding: const EdgeInsets.all(10.0), decoration: BoxDecoration( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 3.0), ), child: Column( @@ -370,9 +382,9 @@ class _AiChatState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -385,13 +397,12 @@ class _AiChatState extends State { child: MihRadioOptions( controller: _modelController, hintText: "AI Model", - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), requiredText: true, radioOptions: [getModel()], ), @@ -445,13 +456,17 @@ class _AiChatState extends State { style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzansiInnovationHub.of(context)! - .theme - .successColor()), + MihColors.getGreenColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark")), ), - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), iconSize: 25, onPressed: () { print("Start TTS now"); @@ -474,12 +489,12 @@ class _AiChatState extends State { width: 300, child: MihNumericStepper( controller: _fontSizeController, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), hintText: "Font Size", requiredText: true, minValue: 1, @@ -697,10 +712,12 @@ class _AiChatState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MihColors.getRedColor(context)), + MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), ), - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), iconSize: 20, onPressed: () { if (_showModelOptions.value == true) { @@ -748,15 +765,19 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.refresh, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "New Chat", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { _resetChat(); }, @@ -764,15 +785,19 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.settings, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Settings", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { if (_showModelOptions.value == true) { setState(() { @@ -803,7 +828,8 @@ class _AiChatState extends State { Icon( MihIcons.mzansiAi, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -813,7 +839,8 @@ class _AiChatState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -824,8 +851,8 @@ class _AiChatState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan( diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart index c9ac8668..f52381ce 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_business_search_resultsList.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class BuildBusinessSearchResultsList extends StatefulWidget { final List businessList; @@ -30,12 +31,14 @@ class _BuildBusinessSearchResultsListState itemCount: widget.businessList.length, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemBuilder: (context, index) { return Material( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: () { Navigator.of(context).pushNamed( @@ -46,9 +49,8 @@ class _BuildBusinessSearchResultsListState ), ); }, - splashColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor() + splashColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") .withOpacity(0.2), borderRadius: BorderRadius.circular(15), child: Padding( diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart index 0d0e606e..9b754421 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_favourite_businesses_list.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/business.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_business_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class BuildFavouriteBusinessesList extends StatefulWidget { final List favouriteBusinesses; @@ -39,7 +40,8 @@ class _BuildFavouriteBusinessesListState } return Material( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: () { Navigator.of(context).pushNamed( @@ -50,9 +52,8 @@ class _BuildFavouriteBusinessesListState ), ); }, - splashColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor() + splashColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") .withOpacity(0.2), borderRadius: BorderRadius.circular(15), child: Padding( diff --git a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart index a94a839f..9e0f940d 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/builders/build_user_search_results_list.dart @@ -2,6 +2,7 @@ import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_personal_profile_preview.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class BuildUserSearchResultsList extends StatefulWidget { final List userList; @@ -25,12 +26,14 @@ class _BuildUserSearchResultsListState itemCount: widget.userList.length, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemBuilder: (context, index) { return Material( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: () { Navigator.of(context).pushNamed( @@ -38,9 +41,8 @@ class _BuildUserSearchResultsListState arguments: widget.userList[index], ); }, - splashColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor() + splashColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") .withOpacity(0.2), borderRadius: BorderRadius.circular(15), child: Padding( diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart index e19c7916..1f534131 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tiles/mzansi_directory_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tile.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiDirectoryTile extends StatefulWidget { final double packageSize; @@ -31,12 +32,15 @@ class _MzansiDirectoryTileState extends State { appName: "Mzansi Directory", appIcon: Icon( MihIcons.mzansiDirectory, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart index dccb5681..8d9a8a0d 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_contacts.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/main.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_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihContacts extends StatefulWidget { const MihContacts({super.key}); @@ -35,9 +36,10 @@ class _MihContactsState extends State { controller: contactSearchController, hintText: "Search Contacts", prefixIcon: Icons.search, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () {}, searchFocusNode: searchFocusNode, ), diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart index a71b6872..6c8898ca 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_favourite_businesses.dart @@ -1,5 +1,4 @@ import 'dart:async'; - import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/bookmarked_business.dart'; @@ -9,6 +8,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_search_bar.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_single_child_scroll.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_directory/builders/build_favourite_businesses_list.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'; @@ -114,9 +114,10 @@ class _MihFavouriteBusinessesState extends State { controller: businessSearchController, hintText: "Search Businesses", prefixIcon: Icons.search, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () {}, searchFocusNode: searchFocusNode, ), @@ -146,9 +147,11 @@ class _MihFavouriteBusinessesState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), const SizedBox(height: 10), Text( @@ -158,9 +161,11 @@ class _MihFavouriteBusinessesState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), ), ], @@ -186,9 +191,9 @@ class _MihFavouriteBusinessesState extends State { Icon( MihIcons.businessProfile, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(height: 10), Text( @@ -198,9 +203,9 @@ class _MihFavouriteBusinessesState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), const SizedBox(height: 25), @@ -211,9 +216,11 @@ class _MihFavouriteBusinessesState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), ), children: [ TextSpan(text: "Use the mzansi search"), diff --git a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart index b09410ea..73cfc4bb 100644 --- a/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart +++ b/Frontend/lib/mih_packages/mzansi_directory/package_tools/mih_search_mzansi.dart @@ -145,16 +145,16 @@ class _MihSearchMzansiState extends State { icon: Icon( Icons.swap_horiz_rounded, size: 35, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { searchPressed(); }, @@ -184,9 +184,9 @@ class _MihSearchMzansiState extends State { ? Icons.filter_list_rounded : Icons.filter_list_off_rounded, size: 35, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -232,16 +232,16 @@ class _MihSearchMzansiState extends State { ); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), elevation: 10, child: Text( "Search", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -293,8 +293,8 @@ class _MihSearchMzansiState extends State { Icon( MihIcons.personalProfile, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -304,9 +304,9 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), const SizedBox(height: 25), @@ -317,9 +317,9 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -328,9 +328,9 @@ class _MihSearchMzansiState extends State { child: Icon( Icons.swap_horiz_rounded, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to search for businesses of Mzansi"), @@ -350,7 +350,7 @@ class _MihSearchMzansiState extends State { // MihIcons.personalProfile, // size: 165, // color: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // const SizedBox(height: 10), // Text( @@ -361,7 +361,7 @@ class _MihSearchMzansiState extends State { // fontSize: 25, // fontWeight: FontWeight.bold, // color: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), // ], @@ -376,8 +376,8 @@ class _MihSearchMzansiState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -387,8 +387,8 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -398,7 +398,9 @@ class _MihSearchMzansiState extends State { child: Text( "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), textAlign: TextAlign.center, ), ); @@ -440,8 +442,8 @@ class _MihSearchMzansiState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 25), Text( @@ -451,8 +453,8 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -468,8 +470,8 @@ class _MihSearchMzansiState extends State { Icon( MihIcons.businessProfile, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -479,9 +481,9 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), const SizedBox(height: 25), @@ -492,9 +494,9 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -503,9 +505,9 @@ class _MihSearchMzansiState extends State { child: Icon( Icons.swap_horiz_rounded, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to search for people of Mzansi"), @@ -521,9 +523,9 @@ class _MihSearchMzansiState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -532,9 +534,9 @@ class _MihSearchMzansiState extends State { child: Icon( Icons.filter_list_rounded, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to filter business types"), @@ -550,7 +552,9 @@ class _MihSearchMzansiState extends State { child: Text( "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), textAlign: TextAlign.center, ), ); 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 1b1cd49c..faabea5b 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 @@ -162,15 +162,19 @@ class _BuildEmployeeListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Employee", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { showDeleteWarning(index); }, @@ -190,10 +194,10 @@ class _BuildEmployeeListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -202,10 +206,10 @@ class _BuildEmployeeListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -256,14 +260,16 @@ class _BuildEmployeeListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -307,7 +313,8 @@ class _BuildEmployeeListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.employees.length, @@ -325,7 +332,8 @@ class _BuildEmployeeListState extends State { subtitle: Text( "${widget.employees[index].username}\n${widget.employees[index].email}\nAccess: ${widget.employees[index].access}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart index 1fa85b75..80f27543 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/builders/build_user_list.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_package_components/mih_button.dart'; @@ -142,12 +143,12 @@ class _BuildUserListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: usernameController, multiLineInput: false, requiredText: true, @@ -156,12 +157,12 @@ class _BuildUserListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -213,16 +214,16 @@ class _BuildUserListState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -256,7 +257,8 @@ class _BuildUserListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.users.length, @@ -271,7 +273,8 @@ class _BuildUserListState extends State { subtitle: Text( "Email: ${hideEmail(widget.users[index].email)}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { 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 bac0f167..4c55e1d8 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 @@ -62,11 +62,13 @@ class _MihAddBookmarkAlertState extends State { @override Widget build(BuildContext context) { return MihPackageAlert( - alertColour: MihColors.getSecondaryColor(context), + alertColour: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getSecondaryColor(context), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Bookmark Business", alertBody: Column( @@ -74,7 +76,8 @@ class _MihAddBookmarkAlertState extends State { Text( "Are you sure you want to save ${widget.business.Name} to your Mzansi Directory?", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, ), ), @@ -88,12 +91,13 @@ class _MihAddBookmarkAlertState extends State { onPressed: () async { Navigator.of(context).pop(); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Cancel", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -104,12 +108,13 @@ class _MihAddBookmarkAlertState extends State { onPressed: () { addBookmark(widget.business.business_id); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Bookmark Business", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart index c678ea60..1b75e44d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/components/mih_business_info_card.dart @@ -35,7 +35,8 @@ class _MihBusinessCardState extends State { RedactedConfiguration getRedactedConfiguration() { return RedactedConfiguration( // redactedColor: Colors.pink, - redactedColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + redactedColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } @@ -52,7 +53,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Making Call", alertBody: Column( @@ -60,15 +62,16 @@ class _MihBusinessCardState extends State { Text( "We couldn't open your phone app to call ${widget.business.contact_no}. To fix this, make sure you have a phone application installed and it's set as your default dialer.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -102,7 +105,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Creating Email", alertBody: Column( @@ -110,15 +114,16 @@ class _MihBusinessCardState extends State { Text( "We couldn't launch your email app to send a message to ${widget.business.bus_email}. To fix this, please confirm that you have an email application installed and that it's set as your default.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -143,7 +148,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -151,15 +157,16 @@ class _MihBusinessCardState extends State { Text( "There was an issue opening maps for ${widget.business.Name}. This usually happens if you don't have a maps app installed or it's not set as your default. Please install one to proceed.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -171,7 +178,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -179,15 +187,16 @@ class _MihBusinessCardState extends State { Text( "There was an issue opening maps for ${widget.business.Name}. This usually happens if you don't have a maps app installed or it's not set as your default. Please install one to proceed.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -211,7 +220,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -219,15 +229,16 @@ class _MihBusinessCardState extends State { Text( "We couldn't open the link to $newUrl. To view this website, please ensure you have a web browser installed and set as your default.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -239,7 +250,8 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -247,15 +259,16 @@ class _MihBusinessCardState extends State { Text( "We couldn't open the link to $newUrl. To view this website, please ensure you have a web browser installed and set as your default.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15, ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }); } @@ -270,12 +283,12 @@ class _MihBusinessCardState extends State { Function()? ontap, ) { return Material( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: InkWell( onTap: ontap, - splashColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor() + splashColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") .withOpacity(0.2), borderRadius: BorderRadius.circular(15), child: Padding( @@ -297,8 +310,8 @@ class _MihBusinessCardState extends State { child: Icon( icon, // size: 35, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ).redacted( @@ -318,9 +331,9 @@ class _MihBusinessCardState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), height: 1.0, ), ).redacted( @@ -333,9 +346,9 @@ class _MihBusinessCardState extends State { style: TextStyle( fontSize: 12, fontWeight: FontWeight.w700, - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ).redacted( context: context, @@ -385,16 +398,16 @@ class _MihBusinessCardState extends State { Widget build(BuildContext context) { // double screenWidth = MediaQuery.of(context).size.width; return Material( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor() + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark") .withValues(alpha: 0.6), borderRadius: BorderRadius.circular(25), elevation: 10, shadowColor: Colors.black, child: Container( decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(10), ), child: Column( @@ -404,7 +417,8 @@ class _MihBusinessCardState extends State { "Call", "Give us a quick call.", Icons.phone, - MihColors.getGreenColor(context), + MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), false, () { // print("Calling ${widget.cellNumber}"); @@ -412,13 +426,15 @@ class _MihBusinessCardState extends State { }, ), Divider( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), _buildContactInfo( "Email", "Send us an email.", Icons.email, - MihColors.getPinkColor(context), + MihColors.getPinkColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), false, () { // print("Emailing ${widget.email}"); @@ -434,14 +450,15 @@ class _MihBusinessCardState extends State { child: Column( children: [ Divider( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), _buildContactInfo( "Location", "Come visit us.", Icons.location_on, - MihColors.getOrangeColor(context), + MihColors.getOrangeColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), false, () { final latitude = double.parse( @@ -463,14 +480,15 @@ class _MihBusinessCardState extends State { child: Column( children: [ Divider( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), _buildContactInfo( "Website", "Find out more about us.", Icons.vpn_lock, - MihColors.getRedColor(context), + MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), false, () { _launchWebsite(widget.business.website); @@ -489,9 +507,9 @@ class _MihBusinessCardState extends State { Padding( padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Divider( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), Container( @@ -499,7 +517,9 @@ class _MihBusinessCardState extends State { "Loading Rating", "Loading your rating.", Icons.star_rate_rounded, - MihColors.getYellowColor(context), + MihColors.getYellowColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), true, null, ), @@ -519,16 +539,18 @@ class _MihBusinessCardState extends State { Padding( padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Divider( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), _buildContactInfo( ratingDisplayTitle, "Let us know how we are doing.", Icons.star_rate_rounded, - MihColors.getYellowColor(context), + MihColors.getYellowColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), false, () { businessReviewRatingWindow( @@ -550,9 +572,9 @@ class _MihBusinessCardState extends State { Padding( padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Divider( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), Container( @@ -560,7 +582,9 @@ class _MihBusinessCardState extends State { "Loading Bookmark", "Loading your bookmark.", Icons.bookmark_add_rounded, - MihColors.getBluishPurpleColor(context), + MihColors.getBluishPurpleColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), true, null, ), @@ -580,9 +604,9 @@ class _MihBusinessCardState extends State { Padding( padding: const EdgeInsets.symmetric(horizontal: 10.0), child: Divider( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), _buildContactInfo( @@ -591,7 +615,9 @@ class _MihBusinessCardState extends State { bookmarkBusiness == null ? Icons.bookmark_add_rounded : Icons.bookmark_remove_rounded, - MihColors.getBluishPurpleColor(context), + MihColors.getBluishPurpleColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), false, () { // _launchWebsite(widget.website); @@ -610,14 +636,14 @@ class _MihBusinessCardState extends State { // Padding( // padding: const EdgeInsets.symmetric(horizontal: 10.0), // child: Divider( - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), // _buildContactInfo( // "Bookmark", // "Save us for later.", // Icons.bookmark_add_rounded, - // MihColors.getBluishPurpleColor(context), + // MihColors.getBluishPurpleColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // () { // // _launchWebsite(widget.website); // print("Saving ${widget.business.Name} to Directory"); @@ -628,7 +654,7 @@ class _MihBusinessCardState extends State { // Padding( // padding: const EdgeInsets.symmetric(horizontal: 10.0), // child: Divider( - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), ], 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 bf12f343..2a935f9a 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 @@ -77,11 +77,13 @@ class _MihDeleteBookmarkAlertState extends State { @override Widget build(BuildContext context) { return MihPackageAlert( - alertColour: MihColors.getSecondaryColor(context), + alertColour: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getSecondaryColor(context), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Remove Bookmark", alertBody: Column( @@ -89,7 +91,8 @@ class _MihDeleteBookmarkAlertState extends State { Text( "Are you sure you want to remove ${widget.business.Name} from your Mzansi Directory?", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, ), ), @@ -103,12 +106,13 @@ class _MihDeleteBookmarkAlertState extends State { onPressed: () async { Navigator.of(context).pop(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Cancel", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -121,12 +125,13 @@ class _MihDeleteBookmarkAlertState extends State { deleteBookmark( widget.bookmarkBusiness!.idbookmarked_businesses); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Remove Business", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), 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 dba24806..1d6e06dd 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 @@ -52,11 +52,13 @@ class _MihReviewBusinessWindowState extends State { showDialog( context: context, builder: (context) => MihPackageAlert( - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Delete Review", alertBody: Column( @@ -64,7 +66,8 @@ class _MihReviewBusinessWindowState extends State { Text( "Are you sure you want to delete this review? This action cannot be undone.", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, ), ), @@ -117,12 +120,14 @@ class _MihReviewBusinessWindowState extends State { } }); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Delete", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -133,12 +138,14 @@ class _MihReviewBusinessWindowState extends State { onPressed: () { Navigator.of(context).pop(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: Text( "Cancel", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -154,9 +161,11 @@ class _MihReviewBusinessWindowState extends State { Color getMissionVisionLimitColor(int limit) { if (_counter.value <= limit) { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else { - return MihColors.getRedColor(context); + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } @@ -300,15 +309,19 @@ class _MihReviewBusinessWindowState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Review", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { showDeleteReviewAlert(); }, @@ -336,9 +349,9 @@ class _MihReviewBusinessWindowState extends State { "Business Rating", textAlign: TextAlign.left, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 18, fontWeight: FontWeight.bold, ), @@ -353,14 +366,18 @@ class _MihReviewBusinessWindowState extends State { filledIcon: Icons.star, emptyIcon: Icons.star_border, halfFilledIcon: Icons.star_half, - filledColor: MihColors.getYellowColor(context), + filledColor: MihColors.getYellowColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), // filledColor: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), - emptyColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - halfFilledColor: MihColors.getYellowColor(context), + emptyColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + halfFilledColor: MihColors.getYellowColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), // MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), @@ -376,11 +393,15 @@ class _MihReviewBusinessWindowState extends State { filledIcon: Icons.star, emptyIcon: Icons.star_border, halfFilledIcon: Icons.star_half, - filledColor: MihColors.getYellowColor(context), - emptyColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - halfFilledColor: MihColors.getYellowColor(context), + 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"), isHalfAllowed: true, initialRating: widget.businessReview != null ? double.parse(_reviewScoreController.text) @@ -402,11 +423,12 @@ class _MihReviewBusinessWindowState extends State { visible: widget.readOnly, child: MihTextFormField( // width: 200, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _reviewReviewerController, multiLineInput: false, requiredText: true, @@ -420,10 +442,10 @@ class _MihReviewBusinessWindowState extends State { const SizedBox(height: 10), MihTextFormField( // width: 200, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _reviewTitleController, multiLineInput: false, requiredText: true, @@ -437,10 +459,10 @@ class _MihReviewBusinessWindowState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _reviewDescriptionController, multiLineInput: true, requiredText: widget.readOnly, @@ -500,16 +522,18 @@ class _MihReviewBusinessWindowState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( widget.businessReview != null ? "Update Review" : "Add Review", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart index 5555eed3..829f797f 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_business_profile_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiBusinessProfileTile extends StatefulWidget { final BusinessArguments arguments; @@ -31,12 +32,15 @@ class _MzansiBusinessProfileTileState extends State { appName: "Business Profile", appIcon: Icon( MihIcons.businessProfile, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart index 35aa1798..68ab758d 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tiles/mzansi_setup_business_profile_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiSetupBusinessProfileTile extends StatefulWidget { final AppUser signedInUser; @@ -32,11 +33,14 @@ class _MzansiSetupBusinessProfileTileState appName: "Set Up Business", appIcon: Icon( MihIcons.businessSetup, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 3be979cf..1e5afb6f 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 @@ -105,7 +105,8 @@ class _MihBusinessDetailsState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Updating Business Details", alertBody: Column( @@ -113,14 +114,15 @@ class _MihBusinessDetailsState extends State { Text( "An error occurred while updating the business details. Please check internet connection and try again.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -253,12 +255,12 @@ class _MihBusinessDetailsState extends State { editable: true, fileNameController: fileNameController, userSelectedfile: imageFile, - frameColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - backgroundColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: (selectedfile) { setState(() { imageFile = selectedfile; @@ -269,12 +271,12 @@ class _MihBusinessDetailsState extends State { Visibility( visible: false, child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: fileNameController, multiLineInput: false, requiredText: true, @@ -284,12 +286,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 20), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: nameController, multiLineInput: false, requiredText: true, @@ -300,12 +302,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: typeController, multiLineInput: false, requiredText: true, @@ -316,12 +318,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -360,21 +362,29 @@ class _MihBusinessDetailsState extends State { showDropDownButton: false, pickerStyle: PickerStyle.bottomSheet, dialogBackgroundColor: + MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), + barrierColor: MihColors.getPrimaryColor( MzansiInnovationHub.of(context)! - .theme - .primaryColor(), - barrierColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + .theme + .mode == + "Dark"), ), Expanded( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), controller: contactController, numberMode: true, multiLineInput: false, @@ -391,12 +401,12 @@ class _MihBusinessDetailsState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: missionVisionController, multiLineInput: true, requiredText: true, @@ -438,12 +448,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: websiteController, multiLineInput: false, requiredText: false, @@ -455,12 +465,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: regController, multiLineInput: false, requiredText: false, @@ -472,12 +482,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: practiceNoController, multiLineInput: false, requiredText: false, @@ -488,12 +498,12 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: vatNoController, multiLineInput: false, requiredText: false, @@ -509,12 +519,16 @@ class _MihBusinessDetailsState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), controller: locationController, multiLineInput: false, requiredText: true, @@ -546,16 +560,20 @@ class _MihBusinessDetailsState extends State { Navigator.of(context).pop(); }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), width: 100, child: Text( "Set", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -574,16 +592,18 @@ class _MihBusinessDetailsState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -602,9 +622,11 @@ class _MihBusinessDetailsState extends State { Color getMissionVisionLimitColor(int limit) { if (_counter.value <= limit) { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else { - return MihColors.getRedColor(context); + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } @@ -688,10 +710,10 @@ class _MihBusinessDetailsState extends State { editable: false, fileNameController: fileNameController, userSelectedfile: imageFile, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (selectedfile) { setState(() { imageFile = selectedfile; @@ -705,9 +727,9 @@ class _MihBusinessDetailsState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -717,9 +739,9 @@ class _MihBusinessDetailsState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.w600, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -747,9 +769,9 @@ class _MihBusinessDetailsState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -779,14 +801,15 @@ class _MihBusinessDetailsState extends State { // Connect with the user editBizProfileWindow(width); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Edit Profile", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -806,17 +829,17 @@ class _MihBusinessDetailsState extends State { // SpeedDialChild( // child: Icon( // Icons.edit, - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // label: "Edit Profile", // labelBackgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // labelStyle: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // onTap: () { // editBizProfileWindow(width); // }, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart index 9f45f030..d2f064b1 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_details_view.dart @@ -75,30 +75,30 @@ class _MihBusinessDetailsViewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - backgroundColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: () {}, ); } else { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ); } } else { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ); } }), @@ -110,9 +110,9 @@ class _MihBusinessDetailsViewState extends State { // fileNameController: fileNameController, // userSelectedfile: imageFile, // frameColor: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // onChange: (selectedfile) { // setState(() { // imageFile = selectedfile; @@ -126,9 +126,9 @@ class _MihBusinessDetailsViewState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -138,9 +138,9 @@ class _MihBusinessDetailsViewState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.w600, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -168,31 +168,34 @@ class _MihBusinessDetailsViewState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), ), const SizedBox(height: 10), - RatingBar.readOnly( - size: 50, - alignment: Alignment.center, - filledIcon: Icons.star, - emptyIcon: Icons.star_border, - halfFilledIcon: Icons.star_half, - filledColor: MihColors.getYellowColor(context), - // MzansiInnovationHub.of(context)!.theme.primaryColor(), - emptyColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - halfFilledColor: MihColors.getYellowColor(context), - // MzansiInnovationHub.of(context)!.theme.primaryColor(), - isHalfAllowed: true, - initialRating: widget.business.rating.isNotEmpty - ? double.parse(widget.business.rating) - : 0, - maxRating: 5, - ), + RatingBar.readOnly( + size: 50, + alignment: Alignment.center, + 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"), + isHalfAllowed: true, + initialRating: widget.business.rating.isNotEmpty + ? double.parse(widget.business.rating) + : 0, + maxRating: 5, + ), const SizedBox(height: 20), SizedBox( width: 700, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart index 96bc0fc0..33330023 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_reviews.dart @@ -76,17 +76,17 @@ class _MihBusinessReviewsState extends State { child: Icon( MihIcons.mihRing, size: 165, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), Icon( Icons.star_rate_rounded, size: 150, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ], ), @@ -98,9 +98,9 @@ class _MihBusinessReviewsState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), // const SizedBox(height: 10), @@ -142,7 +142,7 @@ class _MihBusinessReviewsState extends State { // Icons.star_rate_rounded, // size: 150, // color: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // Text( // "No reviews yet, be the first the review\n${widget.business.Name}", @@ -170,19 +170,23 @@ class _MihBusinessReviewsState extends State { filledIcon: Icons.star, emptyIcon: Icons.star_border, halfFilledIcon: Icons.star_half, - filledColor: MihColors.getYellowColor(context), - // MzansiInnovationHub.of(context)!.theme.primaryColor(), - emptyColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - halfFilledColor: MihColors.getYellowColor(context), - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + 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: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // emptyColor: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // halfFilledColor: - // MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), isHalfAllowed: true, initialRating: double.parse(reviews[index].rating_score), maxRating: 5, diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart index 86120f62..dd129042 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_business_user_search.dart @@ -71,7 +71,8 @@ class _MihBusinessUserSearchState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -81,7 +82,8 @@ class _MihBusinessUserSearchState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -97,7 +99,8 @@ class _MihBusinessUserSearchState extends State { Icon( MihIcons.personalProfile, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -107,7 +110,8 @@ class _MihBusinessUserSearchState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -118,8 +122,8 @@ class _MihBusinessUserSearchState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan( @@ -148,7 +152,7 @@ class _MihBusinessUserSearchState extends State { // "Enter Username or Email to search", // style: TextStyle( // fontSize: 25, - // color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), + // color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")), // textAlign: TextAlign.center, // ), // ); @@ -187,8 +191,10 @@ class _MihBusinessUserSearchState extends State { controller: searchController, hintText: "Search Users", prefixIcon: Icons.search, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { submitUserForm(); }, @@ -224,7 +230,10 @@ class _MihBusinessUserSearchState extends State { child: Text( "$errorCode: Error pulling Patients Data\n/users/search/$userSearch\n$errorBody", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), textAlign: TextAlign.center, ), ); diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart index 6832f576..651d7d21 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/package_tools/mih_my_business_team.dart @@ -1,5 +1,4 @@ import 'dart:convert'; - import 'package:mzansi_innovation_hub/main.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_package_tool_body.dart'; @@ -61,7 +60,8 @@ class _MihMyBusinessTeamState extends State { "", style: TextStyle( fontSize: 25, - color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), textAlign: TextAlign.center, ), ); @@ -105,7 +105,10 @@ class _MihMyBusinessTeamState extends State { child: Text( "$errorCode: Error pulling Patients Data\n${AppEnviroment.baseApiUrl}/business-user/users/${widget.arguments.businessUser!.business_id}\n$errorBody", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), textAlign: TextAlign.center, ), ); 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 b2bbaef8..084014a2 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 @@ -127,7 +127,8 @@ class _MihMyBusinessUserState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Error Updating Business User Details", alertBody: Column( @@ -135,14 +136,15 @@ class _MihMyBusinessUserState extends State { Text( "An error occurred while updating the business User details. Please check internet connection and try again.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -226,20 +228,20 @@ class _MihMyBusinessUserState extends State { editable: false, fileNameController: fileNameController, userSelectedfile: userPicFile, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (_) {}, ), ), Visibility( visible: false, child: MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fileNameController, multiLineInput: false, requiredText: true, @@ -249,10 +251,10 @@ class _MihMyBusinessUserState extends State { ), const SizedBox(height: 20), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: titleTextController, multiLineInput: false, requiredText: true, @@ -264,10 +266,10 @@ class _MihMyBusinessUserState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -279,10 +281,10 @@ class _MihMyBusinessUserState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -294,10 +296,10 @@ class _MihMyBusinessUserState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: accessController, multiLineInput: false, requiredText: true, @@ -338,10 +340,10 @@ class _MihMyBusinessUserState extends State { Visibility( visible: false, child: MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fileNameController, multiLineInput: false, requiredText: true, @@ -359,14 +361,15 @@ class _MihMyBusinessUserState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart index 6e101128..c8ad97fa 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart @@ -258,9 +258,11 @@ class _ProfileBusinessAddState extends State { Color getMissionVisionLimitColor(int limit) { if (_counter.value <= limit) { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else { - return MihColors.getRedColor(context); + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } @@ -297,20 +299,20 @@ class _ProfileBusinessAddState extends State { ), ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), const SizedBox(height: 10.0), MihForm( formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: nameController, multiLineInput: false, requiredText: true, @@ -321,12 +323,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: typeController, multiLineInput: false, requiredText: true, @@ -337,12 +339,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -379,22 +381,21 @@ class _ProfileBusinessAddState extends State { initialSelection: countryCodeController.text, showDropDownButton: false, pickerStyle: PickerStyle.bottomSheet, - dialogBackgroundColor: - MzansiInnovationHub.of(context)! - .theme - .primaryColor(), - barrierColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + dialogBackgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + barrierColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), Expanded( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: contactController, numberMode: true, multiLineInput: false, @@ -410,12 +411,12 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 250, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: missionVisionController, multiLineInput: true, requiredText: true, @@ -457,12 +458,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: websiteController, multiLineInput: false, requiredText: false, @@ -475,12 +476,12 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: regController, multiLineInput: false, requiredText: false, @@ -492,12 +493,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: practiceNoController, multiLineInput: false, requiredText: false, @@ -509,12 +510,12 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: vatNoController, multiLineInput: false, requiredText: false, @@ -530,12 +531,12 @@ class _ProfileBusinessAddState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: locationController, multiLineInput: false, requiredText: true, @@ -566,16 +567,18 @@ class _ProfileBusinessAddState extends State { Navigator.of(context).pop(); }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 100, child: Text( "Set", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -595,17 +598,17 @@ class _ProfileBusinessAddState extends State { ), ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: titleController, multiLineInput: false, requiredText: true, @@ -627,12 +630,12 @@ class _ProfileBusinessAddState extends State { // ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -644,12 +647,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -661,12 +664,12 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 15.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: accessController, multiLineInput: false, requiredText: true, @@ -698,16 +701,16 @@ class _ProfileBusinessAddState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .successColor(), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart index aaa69577..c3d5a754 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_profile_tile.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ 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:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiProfileTile extends StatefulWidget { final AppUser signedInUser; @@ -38,12 +39,15 @@ class _MzansiProfileTileState extends State { appName: "Mzansi Profile", appIcon: Icon( MihIcons.mihLogo, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart index 950858db..1744e842 100644 --- a/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_profile/personal_profile/package_tiles/mzansi_setup_profile_tile.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ 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:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MzansiSetupProfileTile extends StatefulWidget { final AppUser signedInUser; @@ -37,12 +38,15 @@ class _MzansiSetupProfileTileState extends State { appName: "Set Up Profile", appIcon: Icon( MihIcons.profileSetup, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 2a5fa115..bdc49148 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 @@ -54,7 +54,8 @@ class _MihPersonalProfileState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Too Slow, That Username is Taken", alertBody: const Text( @@ -63,7 +64,8 @@ class _MihPersonalProfileState extends State { fontSize: 15, ), ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -194,9 +196,11 @@ class _MihPersonalProfileState extends State { Color getPurposeLimitColor(int limit) { if (_counter.value <= limit) { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else { - return MihColors.getRedColor(context); + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } @@ -227,11 +231,12 @@ class _MihPersonalProfileState extends State { editable: true, fileNameController: proPicController, userSelectedfile: proPic, - frameColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: (selectedImage) { setState(() { proPic = selectedImage; @@ -243,11 +248,12 @@ class _MihPersonalProfileState extends State { Visibility( visible: false, child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: proPicController, multiLineInput: false, requiredText: true, @@ -257,10 +263,10 @@ class _MihPersonalProfileState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: usernameController, multiLineInput: false, requiredText: true, @@ -271,10 +277,10 @@ class _MihPersonalProfileState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -285,10 +291,10 @@ class _MihPersonalProfileState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -300,10 +306,10 @@ class _MihPersonalProfileState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 250, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: purposeController, multiLineInput: true, requiredText: true, @@ -347,10 +353,10 @@ class _MihPersonalProfileState extends State { MihToggle( hintText: "Activate Business Account", initialPostion: businessUser, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (value) { setState(() { businessUser = value; @@ -368,14 +374,16 @@ class _MihPersonalProfileState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -464,10 +472,10 @@ class _MihPersonalProfileState extends State { editable: false, fileNameController: proPicController, userSelectedfile: proPic, - frameColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (selectedImage) { setState(() { proPic = selectedImage; @@ -483,9 +491,9 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -497,9 +505,9 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -509,9 +517,9 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -527,9 +535,9 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -541,16 +549,17 @@ class _MihPersonalProfileState extends State { // Connect with the user editProfileWindow(width); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( widget.arguments.signedInUser.username.isEmpty ? "Set Up Profile" : "Edit Profile", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -570,17 +579,17 @@ class _MihPersonalProfileState extends State { // SpeedDialChild( // child: Icon( // Icons.edit, - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // label: "Edit Profile", // labelBackgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // labelStyle: TextStyle( - // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // color: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // 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 54ff4696..7ec7447d 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 @@ -1,6 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_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_single_child_scroll.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_tool_body.dart'; @@ -67,30 +68,30 @@ class _MihPersonalProfileViewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - backgroundColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + frameColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: () {}, ); } else { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ); } } else { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ); } // return Center( @@ -104,7 +105,7 @@ class _MihPersonalProfileViewState extends State { // .theme // .secondaryColor(), // backgroundColor: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // onChange: (selectedImage) { // setState(() { // proPic = selectedImage; @@ -121,8 +122,8 @@ class _MihPersonalProfileViewState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -134,8 +135,8 @@ class _MihPersonalProfileViewState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -145,8 +146,8 @@ class _MihPersonalProfileViewState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -162,8 +163,8 @@ class _MihPersonalProfileViewState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -175,7 +176,7 @@ class _MihPersonalProfileViewState extends State { // // Connect with the user // }, // buttonColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // width: 300, // child: Text( // widget.user.username.isEmpty @@ -183,7 +184,7 @@ class _MihPersonalProfileViewState extends State { // : "Edit Profile", // style: TextStyle( // color: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontSize: 20, // fontWeight: FontWeight.bold, // ), 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 159e0909..7a7eeac9 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 @@ -39,7 +39,8 @@ class _MihPersonalSettingsState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Are you sure you want to permanently delete your MIH account?", @@ -49,8 +50,8 @@ class _MihPersonalSettingsState extends State { Text( "This action will remove all of your data, and it cannot be recovered. We understand this is a big decision, so please take a moment to double-check.\n\nIf you're certain, please confirm below. If you've changed your mind, you can simply close this window.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -65,14 +66,15 @@ class _MihPersonalSettingsState extends State { MihUserServices.deleteAccount( widget.signedInUser.app_id, context); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -82,14 +84,15 @@ class _MihPersonalSettingsState extends State { onPressed: () { Navigator.pop(context); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Cancel", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -99,7 +102,8 @@ class _MihPersonalSettingsState extends State { ) ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -112,7 +116,8 @@ class _MihPersonalSettingsState extends State { Center( child: FaIcon( FontAwesomeIcons.trashCan, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 150, ), ), @@ -123,7 +128,8 @@ class _MihPersonalSettingsState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 10.0), @@ -131,12 +137,14 @@ class _MihPersonalSettingsState extends State { onPressed: () { deleteAccountPopUp(context); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Delete Account", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), 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 62d48733..da4ea1e3 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 @@ -78,10 +78,10 @@ class _BuildLoyaltyCardListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _nicknameController, multiLineInput: false, requiredText: false, @@ -95,12 +95,12 @@ class _BuildLoyaltyCardListState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _cardNumberController, multiLineInput: false, requiredText: true, @@ -116,16 +116,16 @@ class _BuildLoyaltyCardListState extends State { onPressed: () { openscanner(); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 100, child: Text( "Scan", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -152,14 +152,16 @@ class _BuildLoyaltyCardListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -200,10 +202,12 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MihColors.getGreenColor(context), + alertColour: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), alertIcon: Icon( Icons.favorite, - color: MihColors.getGreenColor(context), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 100, ), alertTitle: "Add to Favourites", @@ -213,8 +217,8 @@ class _BuildLoyaltyCardListState extends State { "Are you sure you want to add this card to your favourites?", style: TextStyle( fontSize: 20, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox( @@ -233,13 +237,14 @@ class _BuildLoyaltyCardListState extends State { ctxt, ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -258,10 +263,12 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), alertIcon: Icon( Icons.favorite_border, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 100, ), alertTitle: "Remove From Favourites", @@ -271,8 +278,8 @@ class _BuildLoyaltyCardListState extends State { "Are you sure you want to remove this card from your favourites?", style: TextStyle( fontSize: 20, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox( @@ -291,13 +298,14 @@ class _BuildLoyaltyCardListState extends State { ctxt, ); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Remove", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -330,23 +338,26 @@ class _BuildLoyaltyCardListState extends State { child: widget.cardList[index].favourite == "" ? Icon( Icons.favorite, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ) : Icon( Icons.favorite_border, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: widget.cardList[index].favourite == "" ? "Add to Favourite" : "Remove from Favourite", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { if (widget.cardList[index].favourite == "") { addToFavCardWindow(context, index); @@ -358,15 +369,19 @@ class _BuildLoyaltyCardListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Edit Card Details", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { setState(() { _cardNumberController.text = widget.cardList[index].card_number; @@ -378,15 +393,19 @@ class _BuildLoyaltyCardListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Card", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deleteCardWindow(context, index); }, @@ -424,7 +443,7 @@ class _BuildLoyaltyCardListState extends State { height: 75, // width: 300, child: BarcodeWidget( - //color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + //color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), barcode: Barcode.code128(), backgroundColor: Colors.white, data: widget.cardList[index].card_number, @@ -446,7 +465,7 @@ class _BuildLoyaltyCardListState extends State { color: Colors.black, fontSize: 25, fontWeight: FontWeight.bold - //MzansiInnovationHub.of(context)!.theme.secondaryColor(), + //MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -528,7 +547,8 @@ class _BuildLoyaltyCardListState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -538,8 +558,8 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -555,7 +575,8 @@ class _BuildLoyaltyCardListState extends State { Icon( MihIcons.mzansiWallet, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -565,8 +586,8 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -577,9 +598,9 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -588,9 +609,9 @@ class _BuildLoyaltyCardListState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to add your first loyalty card"), @@ -612,7 +633,8 @@ class _BuildLoyaltyCardListState extends State { Icon( MihIcons.mzansiWallet, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -622,8 +644,8 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -634,9 +656,9 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -645,9 +667,9 @@ class _BuildLoyaltyCardListState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan( diff --git a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart index d983dbf5..74c2040e 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/components/mih_barcode_scanner.dart @@ -1,8 +1,7 @@ import 'dart:async'; - -import 'package:mzansi_innovation_hub/main.dart'; import 'package:flutter/material.dart'; import 'package:mobile_scanner/mobile_scanner.dart'; +import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_button.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; @@ -106,9 +105,9 @@ class _MihBarcodeScannerState extends State decoration: BoxDecoration( border: Border.all( width: 5, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -126,15 +125,17 @@ class _MihBarcodeScannerState extends State _scannerController.stop(); Navigator.of(context).pop(); }, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 100, height: 50, child: Text( "Cancel", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart b/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart index fbdbddad..83e483aa 100644 --- a/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart +++ b/Frontend/lib/mih_packages/mzansi_wallet/package_tiles/mih_wallet_tile.dart @@ -4,6 +4,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_objects/app_user.dart'; import 'package:flutter/material.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class MihWalletTile extends StatefulWidget { final AppUser signedInUser; @@ -32,12 +33,15 @@ class _MihWalletTileState extends State { appName: "Mzansi Wallet", appIcon: Icon( MihIcons.mzansiWallet, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 879c04cd..2cd705e2 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 @@ -92,18 +92,18 @@ class _MihCardFavouritesState extends State { // child: Icon( // Icons.add, // color: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // label: "Add Loyalty Card", // labelBackgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // labelStyle: TextStyle( // color: - // MzansiInnovationHub.of(context)!.theme.primaryColor(), + // MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MihColors.getGreenColor(context), + // MihColors.getGreenColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // 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 7b717416..0cd5b97a 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 @@ -188,10 +188,10 @@ class _MihCardsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _nicknameController, multiLineInput: false, requiredText: false, @@ -205,12 +205,12 @@ class _MihCardsState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: cardNumberController, multiLineInput: false, requiredText: true, @@ -226,16 +226,16 @@ class _MihCardsState extends State { onPressed: () { openscanner(); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 100, child: Text( "Scan", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -273,14 +273,16 @@ class _MihCardsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -341,10 +343,10 @@ class _MihCardsState extends State { hintText: "Search Cards", // prefixIcon: Icons.search, prefixIcon: Icons.search, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { // print("Search Icon Pressed: ${cardSearchController.text}"); }, @@ -402,17 +404,19 @@ class _MihCardsState extends State { SpeedDialChild( child: Icon( Icons.add, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Add Loyalty Card", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { addCardWindow(context, width); }, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart index cc985d02..0772435e 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart @@ -1,5 +1,4 @@ import 'dart:convert'; - import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_service_calls.dart'; @@ -219,9 +218,10 @@ class _BuildPatientsListState extends State { windowBody: Column( children: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -233,9 +233,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -247,9 +248,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -261,9 +263,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: accessStatusController, multiLineInput: false, requiredText: true, @@ -284,14 +287,18 @@ class _BuildPatientsListState extends State { "Important Notice: Requesting Patient Profile Access", style: TextStyle( fontWeight: FontWeight.bold, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), Text( "You are about to request access to a patient's profile. Please be aware of the following important points:", style: TextStyle( fontWeight: FontWeight.normal, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), SizedBox( @@ -300,7 +307,9 @@ class _BuildPatientsListState extends State { "1. Permanent Access: Once the patient accepts your access request, it will become permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -310,7 +319,9 @@ class _BuildPatientsListState extends State { "2. Shared Information: Any updates you make to the patient's profile will be visible to others who have access to the profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -320,7 +331,9 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: Once granted, you cannot revoke your access to the patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -328,7 +341,9 @@ class _BuildPatientsListState extends State { "By pressing the \"Request Access\" button you accept the above terms.\n", style: TextStyle( fontWeight: FontWeight.bold, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], @@ -361,14 +376,16 @@ class _BuildPatientsListState extends State { noAccessWarning(); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "View Profile", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -395,14 +412,16 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Request Access", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -427,14 +446,16 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Re-apply", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -475,7 +496,8 @@ class _BuildPatientsListState extends State { // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar", "${widget.patients[index].first_name} ${widget.patients[index].last_name}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox( @@ -483,7 +505,8 @@ class _BuildPatientsListState extends State { ), Icon( Icons.star_border_rounded, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ], ); @@ -492,7 +515,8 @@ class _BuildPatientsListState extends State { // "$firstLetterFName$fnameStar $firstLetterLName$lnameStar", "${widget.patients[index].first_name} ${widget.patients[index].last_name}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); } @@ -509,7 +533,8 @@ class _BuildPatientsListState extends State { subtitle: Text( "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { @@ -524,7 +549,8 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); } else { @@ -533,7 +559,8 @@ class _BuildPatientsListState extends State { subtitle: Text( "ID No.: $startedOutPatientIdNo\nMedical Aid No.: $medAidNoStar", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { @@ -547,7 +574,8 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.add, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); } @@ -571,7 +599,8 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.patients.length, 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 ced1f4d0..aed37d40 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 @@ -109,10 +109,10 @@ class _BuildPatientsListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -124,10 +124,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -139,10 +139,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -191,14 +191,16 @@ class _BuildPatientsListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Book Appointment", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -269,10 +271,10 @@ class _BuildPatientsListState extends State { child: Column( children: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -284,10 +286,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -299,10 +301,10 @@ class _BuildPatientsListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -322,14 +324,16 @@ class _BuildPatientsListState extends State { onPressed: () { appointmentPopUp(index, width); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Book Appointment", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -347,16 +351,16 @@ class _BuildPatientsListState extends State { "business", )); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "View Medical Records", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -385,28 +389,33 @@ class _BuildPatientsListState extends State { lastName = widget.patientAccesses[index].lname; accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getGreenColor(context))); + style: TextStyle( + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else if (access == "PENDING") { firstName = "${widget.patientAccesses[index].fname[0]}********"; lastName = "${widget.patientAccesses[index].lname[0]}********"; accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.messageTextColor())); + color: MihColors.getGreyColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } else { firstName = "${widget.patientAccesses[index].fname[0]}********"; lastName = "${widget.patientAccesses[index].lname[0]}********"; accessWithColour = TextSpan( text: "$access\n", - style: TextStyle(color: MihColors.getRedColor(context))); + style: TextStyle( + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"))); } return ListTile( title: Text( "$firstName $lastName", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -435,7 +444,8 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); } @@ -458,7 +468,8 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.patientAccesses.length, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart index 21d51183..b17e794a 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tiles/pat_manager_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PatManagerTile extends StatefulWidget { final PatManagerArguments arguments; @@ -30,12 +31,15 @@ class _PatManagerTileState extends State { appName: "Patient Manager", appIcon: Icon( MihIcons.patientManager, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart index 3dcc5dd0..92ff42a7 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/mih_patient_search.dart @@ -51,8 +51,10 @@ class _MihPatientSearchState extends State { controller: _mihPatientSearchController, hintText: "Search Patient ID/ Aid No.", prefixIcon: Icons.search, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { submitPatientSearch(); }, @@ -92,7 +94,10 @@ class _MihPatientSearchState extends State { child: Text( "Error pulling Patients Data\n$baseUrl/patients/search/$_mihPatientSearchString", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), textAlign: TextAlign.center, ), ); @@ -132,7 +137,8 @@ class _MihPatientSearchState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -142,7 +148,8 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -158,7 +165,8 @@ class _MihPatientSearchState extends State { Icon( MihIcons.patientProfile, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -168,7 +176,8 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -179,8 +188,8 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan( @@ -212,7 +221,7 @@ class _MihPatientSearchState extends State { // style: TextStyle( // fontSize: 25, // color: - // MzansiInnovationHub.of(context)!.theme.messageTextColor()), + // MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")), // textAlign: TextAlign.center, // ), // ), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart index e14a1480..470a5150 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/my_patient_list.dart @@ -51,8 +51,10 @@ class _MyPatientListState extends State { controller: _myPatientSearchController, hintText: "Search Patient ID", prefixIcon: Icons.search, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { setState(() { _myPatientIdSearchString = _myPatientSearchController.text; @@ -94,7 +96,10 @@ class _MyPatientListState extends State { child: Text( "Error pulling Patient Access Data\n$baseUrl/access-requests/business/patient/${widget.business!.business_id}", style: TextStyle( - fontSize: 25, color: MihColors.getRedColor(context)), + fontSize: 25, + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), textAlign: TextAlign.center, ), ); @@ -121,7 +126,8 @@ class _MyPatientListState extends State { Icon( MihIcons.iDontKnow, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -131,7 +137,8 @@ class _MyPatientListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -147,7 +154,8 @@ class _MyPatientListState extends State { Icon( MihIcons.patientProfile, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -157,7 +165,8 @@ class _MyPatientListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -168,8 +177,8 @@ class _MyPatientListState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan(text: "Press "), @@ -178,9 +187,9 @@ class _MyPatientListState extends State { child: Icon( Icons.search, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan( @@ -201,7 +210,7 @@ class _MyPatientListState extends State { // "No Patients matching search", // style: TextStyle( // fontSize: 25, - // color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), + // color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark")), // textAlign: TextAlign.center, // ), // ), 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 b9f50ca5..ac7dfb49 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 @@ -82,7 +82,7 @@ class _WaitingRoomState extends State { }); }), // Divider( - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), Row( mainAxisSize: MainAxisSize.max, @@ -106,9 +106,11 @@ class _WaitingRoomState extends State { "Error pulling appointments", style: TextStyle( fontSize: 25, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor()), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)! + .theme + .mode == + "Dark")), textAlign: TextAlign.center, ), ); @@ -129,15 +131,19 @@ class _WaitingRoomState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Add Appointment", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { // addAppointmentWindow(); appointmentTypeSelection(width); @@ -179,7 +185,8 @@ class _WaitingRoomState extends State { Icon( MihIcons.calendar, size: 165, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), const SizedBox(height: 10), Text( @@ -189,7 +196,8 @@ class _WaitingRoomState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -200,8 +208,8 @@ class _WaitingRoomState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan(text: "Press "), @@ -210,9 +218,9 @@ class _WaitingRoomState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan( @@ -235,7 +243,7 @@ class _WaitingRoomState extends State { // "No Appointments for $selectedDay", // style: TextStyle( // fontSize: 25, - // color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), + // color: MihColors.getGreyColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // textAlign: TextAlign.center, // softWrap: true, @@ -269,9 +277,8 @@ class _WaitingRoomState extends State { question, style: TextStyle( fontSize: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), textAlign: TextAlign.left, ), const SizedBox(height: 15), @@ -280,13 +287,14 @@ class _WaitingRoomState extends State { widget.onIndexChange(1); Navigator.of(context).pop(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Existing Patient", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -298,13 +306,14 @@ class _WaitingRoomState extends State { widget.onIndexChange(2); Navigator.of(context).pop(); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Existing MIH User", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -316,13 +325,14 @@ class _WaitingRoomState extends State { Navigator.pop(context); addAppointmentWindow(width); }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Skeleton Appointment", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -362,11 +372,12 @@ class _WaitingRoomState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _appointmentTitleController, multiLineInput: false, requiredText: true, @@ -396,11 +407,12 @@ class _WaitingRoomState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _appointmentDescriptionIDController, multiLineInput: true, requiredText: true, @@ -419,14 +431,16 @@ class _WaitingRoomState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/add_or_view_patient.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/add_or_view_patient.dart index a3fd7343..ee9e4a1a 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/add_or_view_patient.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/add_or_view_patient.dart @@ -1,7 +1,7 @@ import 'dart:convert'; - import 'package:mzansi_innovation_hub/main.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_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/patients.dart'; @@ -90,7 +90,8 @@ class _AddOrViewPatientState extends State { loading = Container( width: width, height: height, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), child: const Mihloadingcircle(), ); 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 2bc1b4ff..39da94a6 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 @@ -95,10 +95,10 @@ class _ClaimStatementWindowState extends State { MihRadioOptions( controller: _docTypeController, hintText: "Document Type", - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), requiredText: true, radioOptions: const ["Claim", "Statement"], ), @@ -110,14 +110,14 @@ class _ClaimStatementWindowState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), Divider( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10), MihDateField( controller: _serviceDateController, @@ -131,10 +131,10 @@ class _ClaimStatementWindowState extends State { MihRadioOptions( controller: _serviceDescController, hintText: "Serviced Description", - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), requiredText: true, radioOptions: const [ "Consultation", @@ -156,12 +156,12 @@ class _ClaimStatementWindowState extends State { key: const ValueKey('consultation_type_dropdown'), controller: _serviceDescOptionsController, hintText: "Consultation Type", - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), requiredText: true, radioOptions: const [ "General Consultation", @@ -181,12 +181,12 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'procedure_name_field'), // Added key - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _prcedureNameController, multiLineInput: false, requiredText: true, @@ -199,12 +199,12 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'procedure_additional_info_field'), // Added key - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _proceedureAdditionalInfoController, multiLineInput: false, requiredText: true, @@ -224,12 +224,12 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'other_service_description_field'), // Added key - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: _serviceDescOptionsController, multiLineInput: false, requiredText: true, @@ -257,9 +257,9 @@ class _ClaimStatementWindowState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), )), ), const SizedBox(height: 4), @@ -267,10 +267,10 @@ class _ClaimStatementWindowState extends State { controller: _icd10CodeController, hintText: "ICD-10 Search", prefixIcon: Icons.search, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { MIHIcd10CodeApis.getIcd10Codes( _icd10CodeController.text, context) @@ -287,10 +287,10 @@ class _ClaimStatementWindowState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _amountController, multiLineInput: false, requiredText: true, @@ -308,20 +308,20 @@ class _ClaimStatementWindowState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), Divider( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: _preauthNoController, multiLineInput: false, requiredText: false, @@ -384,13 +384,15 @@ class _ClaimStatementWindowState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Generate", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/full_screen_file.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/full_screen_file.dart index 7e3ee1ba..f5be6375 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/full_screen_file.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/full_screen_file.dart @@ -3,6 +3,7 @@ import 'dart:async'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import '../../../../main.dart'; import 'package:syncfusion_flutter_core/theme.dart'; import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart'; @@ -123,7 +124,8 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.arrow_back, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -150,7 +152,8 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.arrow_forward, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -173,7 +176,8 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.zoom_in, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -198,7 +202,8 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.zoom_out, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ), @@ -210,7 +215,7 @@ class _FullScreenFileViewerState extends State { // }, // icon: Icon( // Icons.print, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), // ), IconButton( @@ -230,7 +235,8 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.download, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), ], @@ -245,8 +251,8 @@ class _FullScreenFileViewerState extends State { height: height - 70, child: SfPdfViewerTheme( data: SfPdfViewerThemeData( - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), child: SfPdfViewer.network( widget.arguments.link, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/icd10_search_window.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/icd10_search_window.dart index 842cd8e2..eaffd071 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/components/icd10_search_window.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/components/icd10_search_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_validation_services.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_package_window.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_text_form_field.dart'; @@ -24,8 +25,10 @@ class _ICD10SearchWindowState extends State { return Column( children: [ MihTextFormField( - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: widget.icd10CodeController, multiLineInput: false, requiredText: true, @@ -39,12 +42,15 @@ class _ICD10SearchWindowState extends State { Text( "Search for ICD-10 Codes", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 25, fontWeight: FontWeight.bold, ), ), - Divider(color: MzansiInnovationHub.of(context)!.theme.secondaryColor()), + Divider( + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), BuildICD10CodeList( icd10CodeController: widget.icd10CodeController, icd10codeList: widget.icd10codeList, 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 f3e4683b..6c6e90b2 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,5 +1,4 @@ import 'dart:convert'; - import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:mzansi_innovation_hub/mih_services/mih_alert_services.dart'; @@ -361,9 +360,9 @@ class _PrescripInputState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), @@ -372,10 +371,10 @@ class _PrescripInputState extends State { controller: widget.medicineController, hintText: "Search Medicine", prefixIcon: Icons.search, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + hintColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onPrefixIconTap: () { getMedsPopUp(widget.medicineController); }, @@ -389,9 +388,10 @@ class _PrescripInputState extends State { const SizedBox(height: 10.0), MihNumericStepper( controller: widget.dosageController, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), hintText: "Dosage", requiredText: true, minValue: 1, @@ -401,9 +401,10 @@ class _PrescripInputState extends State { const SizedBox(height: 10.0), MihNumericStepper( controller: widget.timesDailyController, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), hintText: "Times Daily", requiredText: true, minValue: 1, @@ -413,9 +414,10 @@ class _PrescripInputState extends State { const SizedBox(height: 10.0), MihNumericStepper( controller: widget.noDaysController, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), hintText: "No. Days", requiredText: true, minValue: 1, @@ -425,9 +427,10 @@ class _PrescripInputState extends State { const SizedBox(height: 10.0), MihNumericStepper( controller: widget.noRepeatsController, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), hintText: "No.Repeats", requiredText: true, minValue: 0, @@ -462,14 +465,14 @@ class _PrescripInputState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -489,10 +492,12 @@ class _PrescripInputState extends State { width: 550, height: 325, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 3.0), ), child: ListView.separated( @@ -509,23 +514,23 @@ class _PrescripInputState extends State { title: Text( getPerscTitle(index), style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( getPerscSubtitle(index), style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), //onTap: () {}, trailing: IconButton( icon: Icon( Icons.delete_forever_outlined, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), onPressed: () { setState(() { @@ -553,12 +558,14 @@ class _PrescripInputState extends State { ); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Generate", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), 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 d78c47f7..43a747c3 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 @@ -160,15 +160,19 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.download, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Download", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); @@ -182,15 +186,19 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.print, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Print", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { printDocument(url, filePath); }, @@ -200,15 +208,19 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.fullscreen, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Full Screen", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { printDocument(url, filePath); }, @@ -220,15 +232,19 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Document", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deleteFilePopUp(filePath, fileID); }, @@ -305,7 +321,8 @@ class _BuildClaimStatementFileListState physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.files.length, @@ -314,18 +331,20 @@ class _BuildClaimStatementFileListState title: Text( widget.files[index].file_name, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( widget.files[index].insert_date, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), // trailing: Icon( // Icons.arrow_forward, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), onTap: () async { await getFileUrlApiCall(widget.files[index].file_path) @@ -359,14 +378,14 @@ class _BuildClaimStatementFileListState Icon( MihIcons.mihRing, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), Icon( Icons.file_open_outlined, size: 110, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ], ), @@ -378,7 +397,8 @@ class _BuildClaimStatementFileListState style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -391,9 +411,9 @@ class _BuildClaimStatementFileListState style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -402,9 +422,9 @@ class _BuildClaimStatementFileListState child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to generate the first document"), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_file_view.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_file_view.dart index bbc972d5..454ed488 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_file_view.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_file_view.dart @@ -1,9 +1,9 @@ import 'dart:async'; - import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_pop_up_messages/mih_loading_circle.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; import 'package:syncfusion_flutter_core/theme.dart'; import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart'; import 'package:http/http.dart' as http; @@ -118,8 +118,8 @@ class _BuildFileViewState extends State { height: 500, child: SfPdfViewerTheme( data: SfPdfViewerThemeData( - backgroundColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + backgroundColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), child: SfPdfViewer.network( widget.link, 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 aab70bfd..7a42a458 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 @@ -210,15 +210,19 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.download, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Download", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); @@ -233,15 +237,19 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.print, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Print", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { printDocument(url, filePath); }, @@ -252,15 +260,19 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.fullscreen, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Full Screen", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { Navigator.of(context).pushNamed( '/file-veiwer', @@ -278,15 +290,19 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Document", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deleteFilePopUp(filePath, fileID); }, @@ -355,7 +371,8 @@ class _BuildFilesListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.files.length, @@ -364,18 +381,20 @@ class _BuildFilesListState extends State { title: Text( widget.files[index].file_name, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( widget.files[index].insert_date, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), // trailing: Icon( // Icons.arrow_forward, - // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // color: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // ), onTap: () async { await getFileUrlApiCall(widget.files[index].file_path) @@ -409,14 +428,14 @@ class _BuildFilesListState extends State { Icon( MihIcons.mihRing, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), Icon( Icons.file_present, size: 110, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ], ), @@ -428,7 +447,8 @@ class _BuildFilesListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -439,8 +459,8 @@ class _BuildFilesListState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), children: [ TextSpan(text: "Press "), @@ -449,9 +469,9 @@ class _BuildFilesListState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to add "), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_icd10_code_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_icd10_code_list.dart index b531ff41..9412acec 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_icd10_code_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_icd10_code_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_config/mih_env.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/icd10_code.dart.dart'; import 'package:flutter/material.dart'; @@ -29,7 +30,8 @@ class _BuildPatientsListState extends State { title: Text( title, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: RichText( @@ -61,7 +63,8 @@ class _BuildPatientsListState extends State { shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.icd10codeList.length, diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_med_list.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_med_list.dart index c90bdc22..7f0c0db8 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_med_list.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/list_builders/build_med_list.dart @@ -1,6 +1,7 @@ import 'package:mzansi_innovation_hub/main.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/medicine.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class BuildMedicinesList extends StatefulWidget { final TextEditingController contoller; @@ -32,7 +33,8 @@ class _BuildMedicinesListState extends State { return ListView.separated( separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.medicines.length, @@ -42,13 +44,15 @@ class _BuildMedicinesListState extends State { title: Text( widget.medicines[index].name, style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( "${widget.medicines[index].unit} - ${widget.medicines[index].form}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), onTap: () { @@ -60,7 +64,8 @@ class _BuildMedicinesListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ); }, 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 198c3cde..d1649368 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 @@ -1,5 +1,4 @@ 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'; @@ -146,17 +145,19 @@ class _BuildNotesListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Delete Note", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { deletePatientPopUp(selectednote.idpatient_notes); }, @@ -170,9 +171,10 @@ class _BuildNotesListState extends State { children: [ const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: businessNameController, multiLineInput: false, requiredText: true, @@ -181,9 +183,10 @@ class _BuildNotesListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: userNameController, multiLineInput: false, requiredText: true, @@ -192,9 +195,10 @@ class _BuildNotesListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: dateController, multiLineInput: false, requiredText: true, @@ -203,9 +207,10 @@ class _BuildNotesListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: noteTitleController, multiLineInput: false, requiredText: true, @@ -215,9 +220,10 @@ class _BuildNotesListState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 250, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: noteTextController, multiLineInput: true, requiredText: true, @@ -248,7 +254,8 @@ class _BuildNotesListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, itemCount: widget.notes.length, @@ -261,18 +268,21 @@ class _BuildNotesListState extends State { title: Text( "${widget.notes[index].note_name}\n${widget.notes[index].doc_office} - ${widget.notes[index].doctor}", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), subtitle: Text( "${widget.notes[index].insert_date}:\n$notePreview", style: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), //Text(widget.notes[index].note_text), trailing: Icon( Icons.arrow_forward, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), onTap: () { viewNotePopUp(widget.notes[index]); @@ -294,14 +304,14 @@ class _BuildNotesListState extends State { Icon( MihIcons.mihRing, size: 165, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), Icon( Icons.article_outlined, size: 110, - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ], ), @@ -313,7 +323,8 @@ class _BuildNotesListState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), ), const SizedBox(height: 25), @@ -326,9 +337,9 @@ class _BuildNotesListState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.normal, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), children: [ TextSpan(text: "Press "), @@ -337,9 +348,9 @@ class _BuildNotesListState extends State { child: Icon( Icons.menu, size: 20, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), TextSpan(text: " to add the first note"), diff --git a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tiles/patient_profile_tile.dart b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tiles/patient_profile_tile.dart index d377a7a0..2afadc0b 100644 --- a/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tiles/patient_profile_tile.dart +++ b/Frontend/lib/mih_packages/patient_profile/pat_profile/package_tiles/patient_profile_tile.dart @@ -3,6 +3,7 @@ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_ import 'package:mzansi_innovation_hub/mih_components/mih_package_components/mih_icons.dart'; import 'package:mzansi_innovation_hub/mih_components/mih_objects/arguments.dart'; import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/mih_config/mih_colors.dart'; class PatientProfileTile extends StatefulWidget { final PatientViewArguments arguments; @@ -31,12 +32,15 @@ class _PatientProfileTileState extends State { appName: "Patient Profile", appIcon: Icon( MihIcons.patientProfile, - color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); } } 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 7e86e642..c26c0480 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 @@ -127,17 +127,19 @@ class _PatientClaimOrStatementState extends State { SpeedDialChild( child: Icon( Icons.add, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Generate Claim/ Statement", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { 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 e5ab765f..a6489ac9 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 @@ -107,10 +107,10 @@ class _PatientConsultationState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: officeController, multiLineInput: false, requiredText: true, @@ -119,10 +119,10 @@ class _PatientConsultationState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: doctorController, multiLineInput: false, requiredText: true, @@ -131,10 +131,10 @@ class _PatientConsultationState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: dateController, multiLineInput: false, requiredText: true, @@ -143,10 +143,10 @@ class _PatientConsultationState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: titleController, multiLineInput: false, requiredText: true, @@ -158,10 +158,10 @@ class _PatientConsultationState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 250, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: noteTextController, multiLineInput: true, requiredText: true, @@ -211,14 +211,16 @@ class _PatientConsultationState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add Note", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -278,9 +280,11 @@ class _PatientConsultationState extends State { Color getNoteDetailLimitColor() { if (_counter.value <= 512) { - return MzansiInnovationHub.of(context)!.theme.secondaryColor(); + return MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } else { - return MihColors.getRedColor(context); + return MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"); } } @@ -378,17 +382,19 @@ class _PatientConsultationState extends State { SpeedDialChild( child: Icon( Icons.add, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Add Note", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { // 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 79074d99..44a2e485 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 @@ -249,12 +249,12 @@ class _PatientDocumentsState extends State { children: [ Expanded( child: MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: selectedFileController, hintText: "Selected File", requiredText: true, @@ -283,15 +283,15 @@ class _PatientDocumentsState extends State { selectedFileController.text = selectedFile.name; }); }, - buttonColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), child: Text( "Attach", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -311,14 +311,16 @@ class _PatientDocumentsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Add File", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -391,14 +393,15 @@ class _PatientDocumentsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Generate", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -481,15 +484,19 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.attach_file, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Attach Document", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { uploudFilePopUp(width); }, @@ -508,15 +515,19 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.attach_file, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Add Document", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { uploudFilePopUp(width); }, @@ -524,15 +535,19 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.sick_outlined, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Generate Medical Certificate", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { medCertPopUp(); }, @@ -540,15 +555,19 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.medication, - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Generate Prescription", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { 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 3ed76aa4..b86ea5b8 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 @@ -55,9 +55,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -72,9 +73,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -86,9 +88,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -100,9 +103,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: cellController, multiLineInput: false, requiredText: true, @@ -114,9 +118,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -129,9 +134,10 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, height: 100, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: addressController, multiLineInput: true, requiredText: true, @@ -152,9 +158,10 @@ class _PatientInfoState extends State { child: MihToggle( hintText: "Medical Aid", initialPostion: medAidPosition, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), readOnly: true, onChange: (value) { if (value) { @@ -172,8 +179,8 @@ class _PatientInfoState extends State { ), // MihTextFormField( // // width: textFieldWidth, - // fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - // inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + // fillColor: MihColors.getSecondaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + // inputColor: MihColors.getPrimaryColor(MzansiInnovationHub.of(context)!.theme.mode == "Dark"), // controller: medAidController, // multiLineInput: false, // requiredText: true, @@ -195,8 +202,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: medMainMemController, multiLineInput: false, requiredText: true, @@ -211,8 +220,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: medNoController, multiLineInput: false, requiredText: true, @@ -227,8 +238,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: medAidCodeController, multiLineInput: false, requiredText: true, @@ -243,8 +256,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: medNameController, multiLineInput: false, requiredText: true, @@ -259,8 +274,10 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: medSchemeController, multiLineInput: false, requiredText: true, @@ -362,16 +379,16 @@ class _PatientInfoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ]), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), const SizedBox(height: 10), getPatientDetailsField(), const SizedBox(height: 10), @@ -382,16 +399,16 @@ class _PatientInfoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark")), const SizedBox(height: 10), getMedAidDetailsFields(), ], @@ -411,17 +428,19 @@ class _PatientInfoState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), label: "Edit Profile", - labelBackgroundColor: MihColors.getGreenColor(context), + labelBackgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), labelStyle: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontWeight: FontWeight.bold, ), - backgroundColor: MihColors.getGreenColor(context), + backgroundColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onTap: () { 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 2bf97505..0c8b87c1 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 @@ -184,23 +184,22 @@ class _AddPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -211,10 +210,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -225,10 +224,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -239,10 +238,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: cellController, multiLineInput: false, requiredText: true, @@ -253,10 +252,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -269,10 +268,10 @@ class _AddPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 100, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: addressController, multiLineInput: true, requiredText: true, @@ -289,24 +288,23 @@ class _AddPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10.0), MihToggle( hintText: "Medical Aid", initialPostion: medAidPosition, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (value) { if (value) { setState(() { @@ -332,12 +330,12 @@ class _AddPatientState extends State { MihToggle( hintText: "Main Member", initialPostion: medMainMemberPosition, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: (value) { if (value) { setState(() { @@ -354,12 +352,12 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medNoController, multiLineInput: false, requiredText: true, @@ -374,12 +372,12 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medAidCodeController, multiLineInput: false, requiredText: true, @@ -394,12 +392,12 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medNameController, multiLineInput: false, requiredText: true, @@ -414,12 +412,12 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medSchemeController, multiLineInput: false, requiredText: true, @@ -448,14 +446,15 @@ class _AddPatientState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Add", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), 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 989f7328..dc63a53d 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 @@ -203,11 +203,12 @@ class _EditPatientState extends State { width: 700.0, height: (height / 3) * 2, decoration: BoxDecoration( - color: MzansiInnovationHub.of(context)!.theme.primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 5.0), ), child: SingleChildScrollView( @@ -217,18 +218,18 @@ class _EditPatientState extends State { Icon( Icons.warning_amber_rounded, size: 100, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), const SizedBox(height: 15), Text( "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 25.0, fontWeight: FontWeight.bold, ), @@ -239,9 +240,9 @@ class _EditPatientState extends State { child: Text( "This action is permanent! Deleting ${fnameController.text} ${lnameController.text} will remove him\\her from your account. You won't be able to recover it once it's gone.", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -253,9 +254,9 @@ class _EditPatientState extends State { child: Text( "Here's what you'll be deleting:", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20.0, fontWeight: FontWeight.bold, ), @@ -270,9 +271,9 @@ class _EditPatientState extends State { "1) Patient Profile Information.\n2) Patient Notes\n3) Patient Files.", textAlign: TextAlign.left, style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -281,14 +282,16 @@ class _EditPatientState extends State { ), MihButton( onPressed: deletePatientApiCall, - buttonColor: MihColors.getRedColor(context), + buttonColor: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), width: 300, child: Text( "Delete", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -309,7 +312,8 @@ class _EditPatientState extends State { }, icon: Icon( Icons.close, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), size: 35, ), ), @@ -396,23 +400,22 @@ class _EditPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ], ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: idController, multiLineInput: false, requiredText: true, @@ -423,10 +426,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: fnameController, multiLineInput: false, requiredText: true, @@ -437,10 +440,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: lnameController, multiLineInput: false, requiredText: true, @@ -451,10 +454,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: cellController, multiLineInput: false, requiredText: true, @@ -465,10 +468,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: emailController, multiLineInput: false, requiredText: true, @@ -481,10 +484,10 @@ class _EditPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 100, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), controller: addressController, multiLineInput: true, requiredText: true, @@ -501,24 +504,23 @@ class _EditPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), ), ), ), Divider( - color: MzansiInnovationHub.of(context)! - .theme - .secondaryColor()), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark")), const SizedBox(height: 10.0), MihToggle( hintText: "Medical Aid", initialPostion: medAidPosition, - fillColor: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), - secondaryFillColor: - MzansiInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), onChange: (value) { if (value) { setState(() { @@ -544,12 +546,12 @@ class _EditPatientState extends State { MihToggle( hintText: "Main Member", initialPostion: medMainMemberPosition, - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - secondaryFillColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + secondaryFillColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), onChange: (value) { if (value) { setState(() { @@ -566,12 +568,12 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medNoController, multiLineInput: false, requiredText: true, @@ -586,12 +588,12 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medAidCodeController, multiLineInput: false, requiredText: true, @@ -606,12 +608,12 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medNameController, multiLineInput: false, requiredText: true, @@ -626,12 +628,12 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzansiInnovationHub.of(context)! - .theme - .secondaryColor(), - inputColor: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + fillColor: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), + inputColor: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), controller: medSchemeController, multiLineInput: false, requiredText: true, @@ -660,14 +662,15 @@ class _EditPatientState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MihColors.getGreenColor(context), + buttonColor: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), width: 300, child: Text( "Update", style: TextStyle( - color: MzansiInnovationHub.of(context)! - .theme - .primaryColor(), + color: MihColors.getPrimaryColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"), fontSize: 20, fontWeight: FontWeight.bold, ), diff --git a/Frontend/lib/mih_services/mih_alert_services.dart b/Frontend/lib/mih_services/mih_alert_services.dart index 81961075..70a59bc5 100644 --- a/Frontend/lib/mih_services/mih_alert_services.dart +++ b/Frontend/lib/mih_services/mih_alert_services.dart @@ -12,7 +12,8 @@ class MihAlertServices { alertIcon: Icon( Icons.warning_amber_rounded, size: 150, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -20,8 +21,8 @@ class MihAlertServices { Text( "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -30,8 +31,8 @@ class MihAlertServices { RichText( text: TextSpan( style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -40,9 +41,9 @@ class MihAlertServices { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzansiInnovationHub.of(context)! - .theme - .errorColor())), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == + "Dark"))), const TextSpan( text: "Look for fields without the \"(Optional)\" indicator next to them, as these are mandatory."), @@ -51,7 +52,8 @@ class MihAlertServices { ), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -65,7 +67,8 @@ class MihAlertServices { alertIcon: Icon( Icons.check_circle_outline_rounded, size: 150, - color: MihColors.getGreenColor(context), + color: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: title, alertBody: Column( @@ -73,8 +76,8 @@ class MihAlertServices { Text( message, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -82,7 +85,8 @@ class MihAlertServices { const SizedBox(height: 25), ], ), - alertColour: MihColors.getGreenColor(context), + alertColour: MihColors.getGreenColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); @@ -96,7 +100,8 @@ class MihAlertServices { alertIcon: Icon( Icons.warning_amber_rounded, size: 150, - color: MihColors.getRedColor(context), + color: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ), alertTitle: title, alertBody: Column( @@ -104,8 +109,8 @@ class MihAlertServices { Text( message, style: TextStyle( - color: - MzansiInnovationHub.of(context)!.theme.secondaryColor(), + color: MihColors.getSecondaryColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -113,7 +118,8 @@ class MihAlertServices { const SizedBox(height: 25), ], ), - alertColour: MihColors.getRedColor(context), + alertColour: MihColors.getRedColor( + MzansiInnovationHub.of(context)!.theme.mode == "Dark"), ); }, ); From a45917235fe62530ef9c172290aef264b18c7007 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Fri, 15 Aug 2025 11:36:21 +0200 Subject: [PATCH 4/4] flutter docker file verson pull update --- .DS_Store | Bin 10244 -> 10244 bytes Frontend/Dockerfile | 18 +++++++----------- .../macos/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 3 ++- Frontend/macos/Runner/AppDelegate.swift | 6 +++++- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.DS_Store b/.DS_Store index 194e7e8051d3780ad4f1db04fb1e870c0acb5803..64f782f8ee7c76ab90e1878961be948ca1b62867 100644 GIT binary patch delta 54 ycmZn(XbG6$&uG3eU^hRb`DPx0cvjAo;^ds9{QMlo&EcYxxi+&aq@apTU;+T;!4X~n delta 37 qcmZn(XbG6$&uF$WU^hRb*=8Prc-GAwqV-%83uHI5E2MxpGnoMHWegbr diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile index cfedb2a7..1664c3c1 100644 --- a/Frontend/Dockerfile +++ b/Frontend/Dockerfile @@ -6,13 +6,13 @@ FROM debian:latest AS build-env RUN apt-get update --fix-missing -RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback +RUN apt-get install -y curl git wget unzip gdb libstdc++6 libglu1-mesa fonts-droid-fallback +# RUN apt-get install -y curl git wget unzip libgconf-2-4 gdb libstdc++6 libglu1-mesa fonts-droid-fallback RUN apt-get install python3 -y -# RUN apt-get update --fix-missing -# RUN apt-get install python3-Jinja2 + # download Flutter SDK from Flutter Github repo -RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter -#RUN git clone https://github.com/flutter/flutter.git /usr/local/flutter +RUN git clone -b flutter-3.32-candidate.0 https://github.com/flutter/flutter.git /usr/local/flutter +# RUN git clone -b stable https://github.com/flutter/flutter.git /usr/local/flutter # Set flutter environment path ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PATH}" @@ -21,17 +21,13 @@ ENV PATH="/usr/local/flutter/bin:/usr/local/flutter/bin/cache/dart-sdk/bin:${PAT RUN flutter doctor -v # Enable flutter web -RUN flutter channel stable -# RUN flutter upgrade -#RUN flutter pub add web:^0.5.0 +RUN flutter channel flutter-3.32-candidate.0 +# RUN flutter channel stable RUN flutter config --enable-web # Copy files to container and build RUN mkdir /app/ COPY . /app/ -# COPY ./server/MIH_web_server.py /app/build/web/ -# VOLUME ["/app"] - WORKDIR /app # RUN flutter upgrade diff --git a/Frontend/macos/Runner.xcodeproj/project.pbxproj b/Frontend/macos/Runner.xcodeproj/project.pbxproj index b56da1e0..fdf9f49d 100644 --- a/Frontend/macos/Runner.xcodeproj/project.pbxproj +++ b/Frontend/macos/Runner.xcodeproj/project.pbxproj @@ -227,7 +227,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1430; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { diff --git a/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 435ece6f..2a240cb9 100644 --- a/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/Frontend/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ diff --git a/Frontend/macos/Runner/AppDelegate.swift b/Frontend/macos/Runner/AppDelegate.swift index d53ef643..b3c17614 100644 --- a/Frontend/macos/Runner/AppDelegate.swift +++ b/Frontend/macos/Runner/AppDelegate.swift @@ -1,9 +1,13 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } }