Merge pull request #204 from yaso-meth/QOL--Buton-Color-standardisation

QOL--Buton-Color-standardisation

Frontend/lib/mih_components/mih_pop_up_messages/mih_delete_message.dart

@@ -100,7 +100,7 @@ class _MIHDeleteMessageState extends State<MIHDeleteMessage> {
                 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<MIHDeleteMessage> {
                 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<MIHDeleteMessage> {
                 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<MIHDeleteMessage> {
                 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<MIHDeleteMessage> {
                 MihButton(
                   onPressed: widget.onTap,
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzanziInnovationHub.of(context)!.theme.errorColor(),
                   width: 300,
                   child: Text(
                     "Delete",

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

@@ -71,7 +71,7 @@ class _MihAttributesState extends State<MihAttributes> {
                 );
               },
               buttonColor:
-                  MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                  MzanziInnovationHub.of(context)!.theme.successColor(),
               width: 100,
               child: Text(
                 "Visit",

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

@@ -515,9 +515,8 @@ class _MihInfoState extends State<MihInfo> {
                       onPressed: () {
                         MihInstallServices().installMihTrigger(context);
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         getInstallButtonText(),
@@ -538,9 +537,8 @@ class _MihInfoState extends State<MihInfo> {
                           ),
                         );
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "MIH Beginners Guide",

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

@@ -249,7 +249,7 @@ class _BuildPatientsListState extends State<BuildAccessRequestList> {
                       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<BuildAccessRequestList> {
                       updateAccessAPICall(index, "approved");
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Approve",

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

@@ -355,9 +355,8 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           context,
                         );
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.errorColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Decline",
@@ -383,9 +382,8 @@ class _BuildPatientsListState extends State<BuildBusinessAccessList> {
                           context,
                         );
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Approve",

Frontend/lib/mih_packages/authentication/biometric_check.dart

@@ -138,7 +138,7 @@ class _BiometricCheckState extends State<BiometricCheck> {
                   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<BiometricCheck> {
                   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<BiometricCheck> {
                       authenticateUser();
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Authenticate Now",

Frontend/lib/mih_packages/authentication/forgot_password.dart

@@ -122,7 +122,7 @@ class _ForgotPasswordState extends State<ForgotPassword> {
                   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<ForgotPassword> {
                               },
                               buttonColor: MzanziInnovationHub.of(context)!
                                   .theme
-                                  .secondaryColor(),
+                                  .successColor(),
                               width: 300,
                               child: Text(
                                 "Reset Password",

Frontend/lib/mih_packages/authentication/register.dart

@@ -239,8 +239,7 @@ class _RegisterState extends State<Register> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor:
+            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
-                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
             width: 150,
             child: Text(
               "Install MIH",

Frontend/lib/mih_packages/authentication/reset_password.dart

@@ -290,7 +290,7 @@ class _ResetPasswordState extends State<ResetPassword> {
                               },
                               buttonColor: MzanziInnovationHub.of(context)!
                                   .theme
-                                  .secondaryColor(),
+                                  .successColor(),
                               width: 300,
                               child: Text(
                                 "Reset Password",

Frontend/lib/mih_packages/authentication/signin.dart

@@ -305,8 +305,7 @@ class _SignInState extends State<SignIn> {
             onPressed: () {
               MihInstallServices().installMihTrigger(context);
             },
-            buttonColor:
+            buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
-                MzanziInnovationHub.of(context)!.theme.secondaryColor(),
             width: 150,
             child: Text(
               "Install MIH",
@@ -512,7 +511,7 @@ class _SignInState extends State<SignIn> {
                                     buttonColor:
                                         MzanziInnovationHub.of(context)!
                                             .theme
-                                            .secondaryColor(),
+                                            .successColor(),
                                     width: 300,
                                     child: Text(
                                       "Sign In",
@@ -530,7 +529,7 @@ class _SignInState extends State<SignIn> {
                                     buttonColor:
                                         MzanziInnovationHub.of(context)!
                                             .theme
-                                            .successColor(),
+                                            .secondaryColor(),
                                     width: 300,
                                     child: Text(
                                       "Create New Account",

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

@@ -257,9 +257,8 @@ class _BuildEmployeeListState extends State<BuildEmployeeList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Update",

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

@@ -215,7 +215,7 @@ class _BuildUserListState extends State<BuildUserList> {
                           },
                           buttonColor: MzanziInnovationHub.of(context)!
                               .theme
-                              .secondaryColor(),
+                              .successColor(),
                           width: 300,
                           child: Text(
                             "Add",

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

@@ -416,7 +416,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                   ),
                 ],
               ),
-              const SizedBox(height: 15),
+              const SizedBox(height: 25),
               Center(
                 child: MihButton(
                   onPressed: () {
@@ -427,7 +427,7 @@ class _MihBusinessDetailsState extends State<MihBusinessDetails> {
                     }
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzanziInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
                   child: Text(
                     "Update",

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

@@ -375,7 +375,7 @@ class _MihMyBusinessUserState extends State<MihMyBusinessUser> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Update",

Frontend/lib/mih_packages/mzansi_profile/business_profile/profile_business_add.dart

@@ -525,7 +525,7 @@ class _ProfileBusinessAddState extends State<ProfileBusinessAdd> {
                           },
                           buttonColor: MzanziInnovationHub.of(context)!
                               .theme
-                              .secondaryColor(),
+                              .successColor(),
                           width: 300,
                           child: Text(
                             "Add",

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

@@ -382,7 +382,7 @@ class _MihPersonalProfileState extends State<MihPersonalProfile> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Update",

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

@@ -83,7 +83,7 @@ class _MihPersonalSettingsState extends State<MihPersonalSettings> {
                       Navigator.pop(context);
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.errorColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Cancel",

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

@@ -141,9 +141,8 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Update",
@@ -191,9 +190,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       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<BuildLoyaltyCardList> {
                   );
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzanziInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Add",
@@ -238,7 +238,6 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               ),
             ],
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
     );
@@ -250,9 +249,10 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
       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<BuildLoyaltyCardList> {
                   );
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzanziInnovationHub.of(context)!.theme.errorColor(),
                 width: 300,
                 child: Text(
                   "Remove",
@@ -297,7 +297,6 @@ class _BuildLoyaltyCardListState extends State<BuildLoyaltyCardList> {
               ),
             ],
           ),
-          alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
         );
       },
     );

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

@@ -125,9 +125,8 @@ class _MihBarcodeScannerState extends State<MihBarcodeScanner>
                         _scannerController.stop();
                         Navigator.of(context).pop();
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.errorColor(),
-                          .secondaryColor(),
                       width: 100,
                       height: 50,
                       child: Text(

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

@@ -269,9 +269,8 @@ class _MihCardsState extends State<MihCards> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Add",

Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_mih_patient_search_list.dart

@@ -441,7 +441,7 @@ class _BuildPatientsListState extends State<BuildMihPatientSearchList> {
                         },
                         buttonColor: MzanziInnovationHub.of(context)!
                             .theme
-                            .secondaryColor(),
+                            .successColor(),
                         width: 300,
                         child: Text(
                           "Re-apply",

Frontend/lib/mih_packages/patient_profile/pat_manager/list_builders/build_my_patient_list_list.dart

@@ -190,9 +190,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
@@ -323,9 +322,8 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                       onPressed: () {
                         appointmentPopUp(index, width);
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Book Appointment",
@@ -350,8 +348,9 @@ class _BuildPatientsListState extends State<BuildMyPatientListList> {
                                   "business",
                                 ));
                       },
-                      buttonColor:
+                      buttonColor: MzanziInnovationHub.of(context)!
-                          MzanziInnovationHub.of(context)!.theme.successColor(),
+                          .theme
+                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "View Medical Records",

Frontend/lib/mih_packages/patient_profile/pat_manager/package_tools/waiting_room.dart

@@ -223,7 +223,7 @@ class _WaitingRoomState extends State<WaitingRoom> {
                   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<WaitingRoom> {
                   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<WaitingRoom> {
                   addAppointmentWindow(width);
                 },
                 buttonColor:
-                    MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                    MzanziInnovationHub.of(context)!.theme.successColor(),
                 width: 300,
                 child: Text(
                   "Skeleton Appointment",

Frontend/lib/mih_packages/patient_profile/pat_profile/components/claim_statement_window.dart

@@ -384,7 +384,7 @@ class _ClaimStatementWindowState extends State<ClaimStatementWindow> {
                     }
                   },
                   buttonColor:
-                      MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                      MzanziInnovationHub.of(context)!.theme.successColor(),
                   width: 300,
                   child: Text(
                     "Generate",

Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_consultation.dart

@@ -210,9 +210,8 @@ class _PatientConsultationState extends State<PatientConsultation> {
                           MihAlertServices().formNotFilledCompletely(context);
                         }
                       },
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.successColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Add Note",

Frontend/lib/mih_packages/patient_profile/pat_profile/package_tools/patient_documents.dart

@@ -392,7 +392,7 @@ class _PatientDocumentsState extends State<PatientDocuments> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Generate",

Frontend/lib/mih_packages/patient_profile/pat_profile/patient_add.dart

@@ -448,7 +448,7 @@ class _AddPatientState extends State<AddPatient> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Add",

Frontend/lib/mih_packages/patient_profile/pat_profile/patient_edit.dart

@@ -280,9 +280,8 @@ class _EditPatientState extends State<EditPatient> {
                     ),
                     MihButton(
                       onPressed: deletePatientApiCall,
-                      buttonColor: MzanziInnovationHub.of(context)!
+                      buttonColor:
-                          .theme
+                          MzanziInnovationHub.of(context)!.theme.errorColor(),
-                          .secondaryColor(),
                       width: 300,
                       child: Text(
                         "Delete",
@@ -662,7 +661,7 @@ class _EditPatientState extends State<EditPatient> {
                       }
                     },
                     buttonColor:
-                        MzanziInnovationHub.of(context)!.theme.secondaryColor(),
+                        MzanziInnovationHub.of(context)!.theme.successColor(),
                     width: 300,
                     child: Text(
                       "Update",