From 22f4516817ff2e78fd298341c0076c02db91909a Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:30:59 +0200 Subject: [PATCH 01/10] change delete button to red --- .../mih_pop_up_messages/mih_delete_message.dart | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 d9645fe1..b688cef8 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 @@ -100,7 +100,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", @@ -185,7 +185,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", @@ -271,7 +271,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", @@ -356,7 +356,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", @@ -441,7 +441,7 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", From c31fe7c31faa9b9f6aa6e25c9547023b48dedc46 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:32:29 +0200 Subject: [PATCH 02/10] align button color About MIH --- .../about_mih/package_tools/mih_ attributes.dart | 2 +- .../mih_packages/about_mih/package_tools/mih_info.dart | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) 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 2a82e770..0c57bac7 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 @@ -71,7 +71,7 @@ class _MihAttributesState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), 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 6b639552..134bc64d 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 @@ -515,9 +515,8 @@ class _MihInfoState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( getInstallButtonText(), @@ -538,9 +537,8 @@ class _MihInfoState extends State { ), ); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "MIH Beginners Guide", From 53f061421b0faaedfa981e1131ff95d895000f8f Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:34:40 +0200 Subject: [PATCH 03/10] align button color Access Controls --- .../builder/build_access_request_list.dart | 4 ++-- .../builder/build_business_access_list.dart | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) 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 d179d2dd..13ab65e7 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 @@ -249,7 +249,7 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "declined"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Decline", @@ -267,7 +267,7 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "approved"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), 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 fb8e6647..966fbbcd 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 @@ -355,9 +355,8 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Decline", @@ -383,9 +382,8 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Approve", From 5def90553b1f57d338e5a79cb44940767c07e390 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:36:11 +0200 Subject: [PATCH 04/10] align button color Bio Auth --- .../lib/mih_packages/authentication/biometric_check.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index ffe4f403..ae83d7b6 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -138,7 +138,7 @@ class _BiometricCheckState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 300, child: Text( "Set Up Authentication", @@ -156,7 +156,7 @@ class _BiometricCheckState extends State { authenticateUser(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Authenticate Now", @@ -229,7 +229,7 @@ class _BiometricCheckState extends State { authenticateUser(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Authenticate Now", From 16774e8181f00998ec2caeabe405e9c5e8e7d7a3 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:39:45 +0200 Subject: [PATCH 05/10] align button color Auth Package --- .../lib/mih_packages/authentication/forgot_password.dart | 4 ++-- Frontend/lib/mih_packages/authentication/register.dart | 3 +-- .../lib/mih_packages/authentication/reset_password.dart | 2 +- Frontend/lib/mih_packages/authentication/signin.dart | 7 +++---- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Frontend/lib/mih_packages/authentication/forgot_password.dart b/Frontend/lib/mih_packages/authentication/forgot_password.dart index 79a61f3c..203e460a 100644 --- a/Frontend/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/lib/mih_packages/authentication/forgot_password.dart @@ -122,7 +122,7 @@ class _ForgotPasswordState extends State { validateInput(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Continue", @@ -288,7 +288,7 @@ class _ForgotPasswordState extends State { }, buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), width: 300, child: Text( "Reset Password", diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index 75528a0d..6e9ff4d2 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -239,8 +239,7 @@ class _RegisterState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(), width: 150, child: Text( "Install MIH", diff --git a/Frontend/lib/mih_packages/authentication/reset_password.dart b/Frontend/lib/mih_packages/authentication/reset_password.dart index d3ca0af2..a70dfdac 100644 --- a/Frontend/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/lib/mih_packages/authentication/reset_password.dart @@ -290,7 +290,7 @@ class _ResetPasswordState extends State { }, buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), width: 300, child: Text( "Reset Password", diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 37603a20..5d8abf6e 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -305,8 +305,7 @@ class _SignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(), width: 150, child: Text( "Install MIH", @@ -512,7 +511,7 @@ class _SignInState extends State { buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), width: 300, child: Text( "Sign In", @@ -530,7 +529,7 @@ class _SignInState extends State { buttonColor: MzanziInnovationHub.of(context)! .theme - .successColor(), + .secondaryColor(), width: 300, child: Text( "Create New Account", From b7c87e018387ccc5fce9549834b868af8a9a94bc Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:43:11 +0200 Subject: [PATCH 06/10] align button color Biz Prof --- .../business_profile/builders/build_employee_list.dart | 5 ++--- .../business_profile/builders/build_user_list.dart | 2 +- .../business_profile/package_tools/mih_business_details.dart | 4 ++-- .../business_profile/package_tools/mih_my_business_user.dart | 2 +- .../business_profile/profile_business_add.dart | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) 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 da9510d5..9d7bb497 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 @@ -257,9 +257,8 @@ class _BuildEmployeeListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", 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 47b03bf3..92080304 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 @@ -215,7 +215,7 @@ class _BuildUserListState extends State { }, buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), width: 300, child: Text( "Add", 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 46d733a5..0968ce61 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 @@ -416,7 +416,7 @@ class _MihBusinessDetailsState extends State { ), ], ), - const SizedBox(height: 15), + const SizedBox(height: 25), Center( child: MihButton( onPressed: () { @@ -427,7 +427,7 @@ class _MihBusinessDetailsState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", 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 425eae98..c3202f75 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 @@ -375,7 +375,7 @@ class _MihMyBusinessUserState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", 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 8ac8981b..fd0840d8 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 @@ -525,7 +525,7 @@ class _ProfileBusinessAddState extends State { }, buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), width: 300, child: Text( "Add", From 90abb4472501ed0fdeb9578706081c568774180c Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:45:13 +0200 Subject: [PATCH 07/10] align button color personal Prof --- .../personal_profile/package_tools/mih_personal_profile.dart | 2 +- .../personal_profile/package_tools/mih_personal_settings.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 c52de9ee..5ef3261b 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 @@ -382,7 +382,7 @@ class _MihPersonalProfileState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", 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 42f0de70..c1956931 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 @@ -83,7 +83,7 @@ class _MihPersonalSettingsState extends State { Navigator.pop(context); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Cancel", From 676b94a0fe7763b287bf8592e3920e9ea9d6f913 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:50:18 +0200 Subject: [PATCH 08/10] align button color Mzansi Wallet --- .../builder/build_loyalty_card_list.dart | 17 ++++++++--------- .../components/mih_barcode_scanner.dart | 5 ++--- .../mzansi_wallet/package_tools/mih_cards.dart | 5 ++--- 3 files changed, 12 insertions(+), 15 deletions(-) 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 2dc7c927..56c5ea89 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 @@ -141,9 +141,8 @@ class _BuildLoyaltyCardListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", @@ -191,9 +190,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( + alertColour: MzanziInnovationHub.of(context)!.theme.successColor(), alertIcon: Icon( Icons.favorite, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzanziInnovationHub.of(context)!.theme.successColor(), size: 100, ), alertTitle: "Add to Favourites", @@ -224,7 +224,7 @@ class _BuildLoyaltyCardListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add", @@ -238,7 +238,6 @@ class _BuildLoyaltyCardListState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(), ); }, ); @@ -250,9 +249,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( + alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), alertIcon: Icon( Icons.favorite_border, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzanziInnovationHub.of(context)!.theme.errorColor(), size: 100, ), alertTitle: "Remove From Favourites", @@ -283,7 +283,7 @@ class _BuildLoyaltyCardListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Remove", @@ -297,7 +297,6 @@ class _BuildLoyaltyCardListState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(), ); }, ); 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 52a3e683..0daaa88d 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 @@ -125,9 +125,8 @@ class _MihBarcodeScannerState extends State _scannerController.stop(); Navigator.of(context).pop(); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 100, height: 50, child: Text( 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 ab17275a..319936e0 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 @@ -269,9 +269,8 @@ class _MihCardsState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add", From 33f3c6c51f96645bbe2e3cada37e1e219b947f03 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:55:32 +0200 Subject: [PATCH 09/10] align button color Pat Man --- .../build_mih_patient_search_list.dart | 2 +- .../list_builders/build_my_patient_list_list.dart | 15 +++++++-------- .../pat_manager/package_tools/waiting_room.dart | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) 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 cc0e29ae..f76c5fd3 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 @@ -441,7 +441,7 @@ class _BuildPatientsListState extends State { }, buttonColor: MzanziInnovationHub.of(context)! .theme - .secondaryColor(), + .successColor(), 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 a02be830..44ad3c78 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 @@ -190,9 +190,8 @@ class _BuildPatientsListState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Book Appointment", @@ -323,9 +322,8 @@ class _BuildPatientsListState extends State { onPressed: () { appointmentPopUp(index, width); }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Book Appointment", @@ -350,8 +348,9 @@ class _BuildPatientsListState extends State { "business", )); }, - buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + buttonColor: MzanziInnovationHub.of(context)! + .theme + .secondaryColor(), width: 300, child: Text( "View Medical Records", 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 f85e4141..33ec8662 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 @@ -223,7 +223,7 @@ class _WaitingRoomState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Existing Patient", @@ -242,7 +242,7 @@ class _WaitingRoomState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Existing MIH User", @@ -261,7 +261,7 @@ class _WaitingRoomState extends State { addAppointmentWindow(width); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Skeleton Appointment", From 0956ee58dab91b57023dddf403cb7aa780eead34 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Thu, 12 Jun 2025 12:58:16 +0200 Subject: [PATCH 10/10] align button color Pat prof --- .../pat_profile/components/claim_statement_window.dart | 2 +- .../pat_profile/package_tools/patient_consultation.dart | 5 ++--- .../pat_profile/package_tools/patient_documents.dart | 2 +- .../patient_profile/pat_profile/patient_add.dart | 2 +- .../patient_profile/pat_profile/patient_edit.dart | 7 +++---- 5 files changed, 8 insertions(+), 10 deletions(-) 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 03c2cfab..e5e3b2a7 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 @@ -384,7 +384,7 @@ class _ClaimStatementWindowState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Generate", 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 32565f00..991de788 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 @@ -210,9 +210,8 @@ class _PatientConsultationState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add Note", 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 6bc85134..45b80bb8 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 @@ -392,7 +392,7 @@ class _PatientDocumentsState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Generate", 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 b4664261..a35c3a59 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 @@ -448,7 +448,7 @@ class _AddPatientState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), 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 e59e5d01..89611c52 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 @@ -280,9 +280,8 @@ class _EditPatientState extends State { ), MihButton( onPressed: deletePatientApiCall, - buttonColor: MzanziInnovationHub.of(context)! - .theme - .secondaryColor(), + buttonColor: + MzanziInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", @@ -662,7 +661,7 @@ class _EditPatientState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzanziInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update",