From 3535de560dff7913b7b71bf337b9b59481aa0026 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Tue, 15 Jul 2025 13:11:13 +0200 Subject: [PATCH 1/3] Change MzanziInnovationHub to MzansiInnovationHub --- Frontend/lib/main.dart | 12 +- Frontend/lib/main_dev.dart | 2 +- Frontend/lib/main_prod.dart | 2 +- .../mih_components/mih_layout/mih_body.dart | 6 +- .../mih_layout/mih_notification_drawer.dart | 22 +-- .../mih_components/mih_layout/mih_tile.dart | 8 +- .../Example/package_test.dart | 12 +- .../package_tools/package_tool_one.dart | 112 +++++++------- .../package_tools/package_tool_two.dart | 4 +- .../mih_business_profile_preview.dart | 6 +- .../mih_package_components/mih_calendar.dart | 16 +- .../mih_circle_avatar.dart | 2 +- .../mih_date_field.dart | 2 +- .../mih_dropdwn_field.dart | 4 +- .../mih_floating_menu.dart | 6 +- .../mih_image_display.dart | 8 +- .../mih_numeric_stepper.dart | 10 +- .../mih_package_components/mih_package.dart | 2 +- .../mih_package_alert.dart | 6 +- .../mih_package_tile.dart | 2 +- .../mih_package_tool_body.dart | 10 +- .../mih_package_window.dart | 12 +- .../mih_personal_profile_preview.dart | 8 +- .../mih_text_form_field.dart | 10 +- .../mih_time_field.dart | 2 +- .../mih_package_components/mih_toggle.dart | 8 +- .../mih_delete_message.dart | 82 +++++----- .../mih_error_message.dart | 140 +++++++++--------- .../mih_loading_circle.dart | 8 +- .../mih_notification_message.dart | 6 +- .../mih_success_message.dart | 16 +- .../mih_warning_message.dart | 74 ++++----- .../policy_and_terms_text.dart | 4 +- .../package_tile/about_mih_tile.dart | 6 +- .../package_tools/mih_ attributes.dart | 8 +- .../about_mih/package_tools/mih_info.dart | 112 +++++++------- .../builder/build_access_request_list.dart | 26 ++-- .../builder/build_business_access_list.dart | 48 +++--- .../package_tile/mih_access_tile.dart | 6 +- .../package_tools/mih_access_requests.dart | 4 +- .../authentication/auth_check.dart | 4 +- .../authentication/biometric_check.dart | 28 ++-- .../authentication/forgot_password.dart | 28 ++-- .../mih_packages/authentication/register.dart | 34 ++--- .../authentication/reset_password.dart | 22 +-- .../mih_packages/authentication/signin.dart | 52 +++---- .../package_tiles/mih_calculator_tile.dart | 6 +- .../package_tools/currency_exchange_rate.dart | 42 +++--- .../calculator/package_tools/simple_calc.dart | 32 ++-- .../calculator/package_tools/tip_calc.dart | 52 +++---- .../builder/build_access_request_list.dart | 26 ++-- .../builder/build_appointment_list.dart | 92 ++++++------ .../calendar/builder/build_queue_list.dart | 4 +- .../package_tiles/mzansi_calendar_tile.dart | 6 +- .../calendar/package_tools/appointments.dart | 28 ++-- .../package_tools/mih_register.dart | 26 ++-- .../package_tools/mih_sign_in.dart | 38 ++--- .../mih_home/components/mih_app_drawer.dart | 52 +++---- .../lib/mih_packages/mih_home/mih_home.dart | 6 +- .../mih_home/mih_home_legacy.dart | 36 ++--- .../mih_home/mih_profile_getter.dart | 12 +- .../package_tools/mih_business_home.dart | 14 +- .../package_tools/mih_personal_home.dart | 20 +-- .../package_tiles/mzansi_ai_tile.dart | 6 +- .../mzansi_ai/package_tools/ai_chat.dart | 68 ++++----- .../build_business_search_resultsList.dart | 6 +- .../build_user_search_results_list.dart | 6 +- .../package_tiles/mzansi_directory_tile.dart | 6 +- .../package_tools/mih_contacts.dart | 4 +- .../mih_favourite_businesses.dart | 4 +- .../package_tools/mih_search_mzansi.dart | 26 ++-- .../builders/build_employee_list.dart | 26 ++-- .../builders/build_user_list.dart | 18 +-- .../components/mih_business_info_card.dart | 62 ++++---- .../mzansi_business_profile_tile.dart | 6 +- .../mzansi_setup_business_profile_tile.dart | 6 +- .../package_tools/mih_business_details.dart | 92 ++++++------ .../mih_business_details_view.dart | 20 +-- .../mih_business_user_search.dart | 8 +- .../package_tools/mih_my_business_team.dart | 4 +- .../package_tools/mih_my_business_user.dart | 40 ++--- .../profile_business_add.dart | 66 ++++----- .../package_tiles/mzansi_profile_tile.dart | 8 +- .../mzansi_setup_profile_tile.dart | 6 +- .../package_tools/mih_personal_profile.dart | 68 ++++----- .../mih_personal_profile_view.dart | 26 ++-- .../package_tools/mih_personal_settings.dart | 22 +-- .../builder/build_loyalty_card_list.dart | 72 ++++----- .../components/mih_barcode_scanner.dart | 6 +- .../package_tiles/mih_wallet_tile.dart | 6 +- .../package_tools/mih_card_favourites.dart | 8 +- .../package_tools/mih_cards.dart | 30 ++-- .../build_mih_patient_search_list.dart | 56 +++---- .../build_my_patient_list_list.dart | 52 +++---- .../package_tiles/pat_manager_tile.dart | 6 +- .../package_tools/mih_patient_search.dart | 10 +- .../package_tools/my_patient_list.dart | 8 +- .../package_tools/waiting_room.dart | 42 +++--- .../pat_profile/add_or_view_patient.dart | 2 +- .../components/claim_statement_window.dart | 52 +++---- .../components/full_screen_file.dart | 16 +- .../components/icd10_search_window.dart | 8 +- .../pat_profile/components/prescip_input.dart | 40 ++--- .../build_claim_statement_files_list.dart | 42 +++--- .../list_builders/build_file_view.dart | 2 +- .../list_builders/build_files_list.dart | 42 +++--- .../list_builders/build_icd10_code_list.dart | 4 +- .../list_builders/build_med_list.dart | 8 +- .../list_builders/build_notes_list.dart | 36 ++--- .../package_tiles/patient_profile_tile.dart | 6 +- .../patient_claim_or_statement.dart | 8 +- .../package_tools/patient_consultation.dart | 38 ++--- .../package_tools/patient_documents.dart | 50 +++---- .../package_tools/patient_info.dart | 68 ++++----- .../pat_profile/patient_add.dart | 62 ++++---- .../pat_profile/patient_edit.dart | 82 +++++----- .../lib/mih_services/mih_alert_services.dart | 10 +- .../mih_services/mih_install_services.dart | 4 +- 118 files changed, 1488 insertions(+), 1486 deletions(-) diff --git a/Frontend/lib/main.dart b/Frontend/lib/main.dart index a1ef39b8..351f27f0 100644 --- a/Frontend/lib/main.dart +++ b/Frontend/lib/main.dart @@ -3,20 +3,20 @@ import 'mih_config/mih_env.dart'; import 'mih_config/mih_routeGenerator.dart'; import 'mih_config/mih_theme.dart'; -class MzanziInnovationHub extends StatefulWidget { - const MzanziInnovationHub({ +class MzansiInnovationHub extends StatefulWidget { + const MzansiInnovationHub({ super.key, }); @override - State createState() => _MzanziInnovationHubState(); + State createState() => _MzansiInnovationHubState(); // ignore: library_private_types_in_public_api - static _MzanziInnovationHubState? of(BuildContext context) => - context.findAncestorStateOfType<_MzanziInnovationHubState>(); + static _MzansiInnovationHubState? of(BuildContext context) => + context.findAncestorStateOfType<_MzansiInnovationHubState>(); } -class _MzanziInnovationHubState extends State { +class _MzansiInnovationHubState extends State { late MihTheme theme; Color getPrimany() { diff --git a/Frontend/lib/main_dev.dart b/Frontend/lib/main_dev.dart index 851d41f3..560a9477 100644 --- a/Frontend/lib/main_dev.dart +++ b/Frontend/lib/main_dev.dart @@ -26,5 +26,5 @@ void main() async { debugPrint('APP INSTALLED!'); }); FlutterNativeSplash.remove(); - runApp(const MzanziInnovationHub()); + runApp(const MzansiInnovationHub()); } diff --git a/Frontend/lib/main_prod.dart b/Frontend/lib/main_prod.dart index 7e7475aa..51008267 100644 --- a/Frontend/lib/main_prod.dart +++ b/Frontend/lib/main_prod.dart @@ -26,5 +26,5 @@ void main() async { debugPrint('APP INSTALLED!'); }); FlutterNativeSplash.remove(); - runApp(const MzanziInnovationHub()); + runApp(const MzansiInnovationHub()); } diff --git a/Frontend/lib/mih_components/mih_layout/mih_body.dart b/Frontend/lib/mih_components/mih_layout/mih_body.dart index 88fa01ed..43a313f3 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_body.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_body.dart @@ -18,7 +18,7 @@ class _MIHBodyState extends State { //double paddingSize = 10; double getHorizontalPaddingSize(Size screenSize) { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { if (widget.borderOn) { return 10; } else { @@ -46,10 +46,10 @@ class _MIHBodyState extends State { Decoration? getBoader() { if (widget.borderOn) { return BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), 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 82e4e56a..0bdfb342 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_notification_drawer.dart @@ -78,13 +78,13 @@ class _MIHNotificationDrawerState extends State { title: Text( title, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( subtitle, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () {}, @@ -101,7 +101,7 @@ class _MIHNotificationDrawerState extends State { children: [ Icon( Icons.circle_notifications, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), const SizedBox( width: 5, @@ -110,7 +110,7 @@ class _MIHNotificationDrawerState extends State { child: Text( title, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -124,7 +124,7 @@ class _MIHNotificationDrawerState extends State { child: Text( title, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -136,7 +136,7 @@ class _MIHNotificationDrawerState extends State { subtitle: Text( subtitle, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () { @@ -159,7 +159,7 @@ class _MIHNotificationDrawerState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.notifications.length, @@ -198,14 +198,14 @@ class _MIHNotificationDrawerState extends State { Widget build(BuildContext context) { return SafeArea( child: Drawer( - //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), child: SingleChildScrollView( child: Column( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.start, children: [ Container( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), child: Row( mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, @@ -215,7 +215,7 @@ class _MIHNotificationDrawerState extends State { child: Text( "Notifications", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontWeight: FontWeight.bold, @@ -232,7 +232,7 @@ class _MIHNotificationDrawerState extends State { // physics: const NeverScrollableScrollPhysics(), // separatorBuilder: (BuildContext context, index) { // return Divider( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ); // }, // 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 5facf374..372eb544 100644 --- a/Frontend/lib/mih_components/mih_layout/mih_tile.dart +++ b/Frontend/lib/mih_components/mih_layout/mih_tile.dart @@ -83,7 +83,7 @@ class _MIHTileState extends State { child: Material( color: mainC, // shadowColor: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // MzansiInnovationHub.of(context)!.theme.secondaryColor(), // elevation: 5, borderRadius: BorderRadius.circular(80), child: InkWell( @@ -95,9 +95,9 @@ class _MIHTileState extends State { }, // hoverDuration: , splashColor: - MzanziInnovationHub.of(context)!.theme.highlightColor(), + MzansiInnovationHub.of(context)!.theme.highlightColor(), highlightColor: - MzanziInnovationHub.of(context)!.theme.highlightColor(), + MzansiInnovationHub.of(context)!.theme.highlightColor(), child: widget.tileIcon, ), ), @@ -111,7 +111,7 @@ class _MIHTileState extends State { softWrap: true, overflow: TextOverflow.visible, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), 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 e54b27e8..003da094 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 @@ -66,7 +66,7 @@ class _PackageTestState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -75,7 +75,7 @@ class _PackageTestState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -85,7 +85,7 @@ class _PackageTestState extends State { text: TextSpan( style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -94,14 +94,14 @@ class _PackageTestState extends State { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan(text: "Look for fields with an asterisk ("), TextSpan( text: "*", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan( @@ -111,7 +111,7 @@ class _PackageTestState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); 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 9b5c6c8f..2975b567 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 @@ -96,17 +96,17 @@ class _PackageToolOneState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Window", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { // showTestWindow(); }, @@ -158,7 +158,7 @@ class _PackageToolOneState extends State { MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -175,7 +175,7 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -196,13 +196,13 @@ class _PackageToolOneState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), elevation: 10, width: 300, child: Text( "Show Loading", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -221,7 +221,7 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -242,7 +242,7 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -302,7 +302,7 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), Divider( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), thickness: 2, ), const SizedBox(height: 10), @@ -315,7 +315,7 @@ class _PackageToolOneState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -326,7 +326,7 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), Divider( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), thickness: 2, ), const SizedBox(height: 10), @@ -335,11 +335,11 @@ class _PackageToolOneState extends State { formFields: [ MihTextFormField( width: 200, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _textFieldZeroController, multiLineInput: false, requiredText: false, @@ -350,11 +350,11 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _textFieldOneController, multiLineInput: false, requiredText: true, @@ -366,11 +366,11 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _textFieldTwoController, multiLineInput: false, requiredText: true, @@ -383,11 +383,11 @@ class _PackageToolOneState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _textFieldThreeController, multiLineInput: false, requiredText: true, @@ -400,11 +400,11 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihNumericStepper( controller: _textFieldFiveController, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), hintText: "Number Stepper", requiredText: true, minValue: 1, @@ -415,11 +415,11 @@ class _PackageToolOneState extends State { MihToggle( hintText: "Toggle", initialPostion: switchpositioin, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), readOnly: false, onChange: (value) { setState(() { @@ -432,11 +432,11 @@ class _PackageToolOneState extends State { MihRadioOptions( controller: _textFieldSixController, hintText: "Radio Options", - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), requiredText: true, radioOptions: const ["Option 1", "Option 2"], ), @@ -477,11 +477,11 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _textFieldFourController, multiLineInput: true, requiredText: false, @@ -505,7 +505,7 @@ class _PackageToolOneState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), elevation: 10, @@ -513,7 +513,7 @@ class _PackageToolOneState extends State { child: Text( "Submit Form", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -527,7 +527,7 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), Divider( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), thickness: 2, ), const SizedBox(height: 10), @@ -539,9 +539,9 @@ class _PackageToolOneState extends State { prefixAltIcon: MihIcons.mzansiAi, width: 300, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), hintColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { print("Search Icon Pressed: ${_searchController.text}"); }, @@ -553,14 +553,14 @@ class _PackageToolOneState extends State { print("Button Pressed"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), elevation: 10, width: 300, child: Text( "Click Me", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -572,21 +572,21 @@ class _PackageToolOneState extends State { print("Button Pressed"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ Icon( Icons.delete, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), Text( "Click Me", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -602,13 +602,13 @@ class _PackageToolOneState extends State { print("Button Pressed"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Click Me", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -626,7 +626,7 @@ class _PackageToolOneState extends State { icon: Icon( MihIcons.mihLogo, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), ), ), @@ -638,9 +638,9 @@ class _PackageToolOneState extends State { fileNameController: _fileNameController, userSelectedfile: file, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (selectedImage) { setState(() { file = selectedImage; @@ -650,9 +650,9 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _fileNameController, hintText: "Selected Avatar File", requiredText: false, @@ -675,9 +675,9 @@ class _PackageToolOneState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _imagefileController, hintText: "Selected Image File", requiredText: false, @@ -698,18 +698,18 @@ class _PackageToolOneState extends State { child: Icon( Icons.add, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Window", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { showTestWindow(); }, @@ -718,18 +718,18 @@ class _PackageToolOneState extends State { child: Icon( Icons.add, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Show New Full Window", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 ec0e3464..1472fb95 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 @@ -32,7 +32,7 @@ class _PackageToolTwoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox(height: 10), @@ -46,7 +46,7 @@ class _PackageToolTwoState extends State { onPressed: () {}, icon: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), ), ) 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 7b1e8cd9..43ab224f 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 @@ -62,9 +62,9 @@ class _MihBusinessProfilePreviewState extends State { fileNameController: TextEditingController(), userSelectedfile: file, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: () {}, ); } else { @@ -72,7 +72,7 @@ class _MihBusinessProfilePreviewState extends State { MihIcons.iDontKnow, size: profilePictureWidth, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); } } else { 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 53bfdede..daa98710 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_calendar.dart @@ -37,7 +37,7 @@ class _MIHCalendarState extends State { formatButtonDecoration: BoxDecoration( border: Border.fromBorderSide( BorderSide( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), borderRadius: const BorderRadius.all( @@ -61,29 +61,29 @@ class _MIHCalendarState extends State { calendarStyle: CalendarStyle( outsideDaysVisible: false, todayTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), todayDecoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.successColor(), + color: MzansiInnovationHub.of(context)!.theme.successColor(), shape: BoxShape.circle, ), selectedTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), selectedDecoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), shape: BoxShape.circle, ), weekendTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), ), ), daysOfWeekStyle: DaysOfWeekStyle( weekdayStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), weekendStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), ), ), ), diff --git a/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart b/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart index d076c49b..0585adeb 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_circle_avatar.dart @@ -110,7 +110,7 @@ class _MihCircleAvatarState extends State { type: FileType.image, ); // print("Here 1"); - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { // print("Here 2"); if (result == null) return; 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 e89b4608..46a2015b 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 @@ -47,7 +47,7 @@ class _MihDateFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzanziInnovationHub.of(context)!.theme; + final theme = MzansiInnovationHub.of(context)!.theme; return Center( child: SizedBox( width: widget.width, 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 d22f469e..e3a2f5a4 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 @@ -30,7 +30,7 @@ class _MihDropdownFieldState extends State { List> buildMenuOptions(List options) { List> menuList = []; - final theme = MzanziInnovationHub.of(context)!.theme; + final theme = MzansiInnovationHub.of(context)!.theme; for (final i in options) { menuList.add(DropdownMenuEntry( value: i, @@ -59,7 +59,7 @@ class _MihDropdownFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzanziInnovationHub.of(context)!.theme; + final theme = MzansiInnovationHub.of(context)!.theme; return Column( crossAxisAlignment: CrossAxisAlignment.start, 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 3daf5169..cee9c9df 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 @@ -30,10 +30,10 @@ class _MihFloatingMenuState extends State { animatedIcon: widget.animatedIcon, direction: widget.direction ?? SpeedDialDirection.up, activeIcon: Icons.close, - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), activeBackgroundColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), - foregroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), + foregroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 e2ab3c74..a4f9647d 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 @@ -33,7 +33,7 @@ class _MihImageDisplayState extends State { ImageProvider? getImage() { Color dark = const Color(0XFF3A4454); if (widget.imageFile == null) { - if (MzanziInnovationHub.of(context)!.theme.secondaryColor() == dark) { + if (MzansiInnovationHub.of(context)!.theme.secondaryColor() == dark) { print("here in light icon"); return const AssetImage( 'lib/mih_components/mih_package_components/assets/images/i-dont-know-dark.png'); @@ -78,9 +78,9 @@ class _MihImageDisplayState extends State { child: IconButton.filled( style: IconButton.styleFrom( backgroundColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPressed: () async { try { FilePickerResult? result = @@ -88,7 +88,7 @@ class _MihImageDisplayState extends State { type: FileType.image, ); // print("Here 1"); - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { // print("Here 2"); if (result == null) return; 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 59e6a8b6..2efa3c53 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,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:mzansi_innovation_hub/main.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'; @@ -107,8 +108,10 @@ class _MihNumericStepperState extends State { width: 40, child: IconButton.filled( style: ButtonStyle( - backgroundColor: - WidgetStateProperty.all(widget.fillColor), + backgroundColor: WidgetStateProperty.all( + MzansiInnovationHub.of(context)! + .theme + .successColor()), ), color: widget.inputColor, iconSize: 20, @@ -189,8 +192,7 @@ class _MihNumericStepperState extends State { width: 40, child: IconButton.filled( style: ButtonStyle( - backgroundColor: - WidgetStateProperty.all(widget.fillColor), + backgroundColor: WidgetStateProperty.all(), ), color: widget.inputColor, iconSize: 20, diff --git a/Frontend/lib/mih_components/mih_package_components/mih_package.dart b/Frontend/lib/mih_components/mih_package_components/mih_package.dart index 9bd45661..f2727065 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_package.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_package.dart @@ -86,7 +86,7 @@ class _MihPackageState extends State vsync: this, duration: const Duration(milliseconds: 400), ); - if (!MzanziInnovationHub.of(context)!.theme.kIsWeb) { + if (!MzansiInnovationHub.of(context)!.theme.kIsWeb) { // Trigger the peak animation on start (or call this elsewhere) WidgetsBinding.instance.addPostFrameCallback((_) { _peakAnimation(); 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 9791db98..aa6cf0bc 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 @@ -29,7 +29,7 @@ class _MihPackageAlertState extends State { Size? size; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (size!.width / 4) * 2; popUpheight = null; @@ -64,7 +64,7 @@ class _MihPackageAlertState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all(color: widget.alertColour, width: 5.0), ), @@ -101,7 +101,7 @@ class _MihPackageAlertState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), 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 c3d5f5d3..4af1408e 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 @@ -85,7 +85,7 @@ class _MihPackageTileState extends State { // overflow: TextOverflow.visible, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), 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 ca82404d..e4b0fdcd 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 @@ -19,7 +19,7 @@ class MihPackageToolBody extends StatefulWidget { class _MihPackageToolBodyState extends State { late double _innerBodyPadding; double getHorizontalPaddingSize(Size screenSize) { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { if (widget.borderOn) { return widget.innerHorizontalPadding ?? 10; } else { @@ -48,19 +48,19 @@ class _MihPackageToolBodyState extends State { if (widget.borderOn) { _innerBodyPadding = 10.0; return BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 3.0), ); } else { _innerBodyPadding = 0.0; return BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 96f2f2a4..2106dbf6 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 @@ -35,7 +35,7 @@ class _MihPackageWindowState extends State { void checkScreenSize() { // print("screen width: $width"); // print("screen height: $height"); - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { windowTitleSize = 25; horizontralWindowPadding = width / 7; @@ -84,9 +84,9 @@ class _MihPackageWindowState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), ), - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), iconSize: 20, onPressed: () { widget.onWindowTapClose(); @@ -108,7 +108,7 @@ class _MihPackageWindowState extends State { style: TextStyle( fontSize: windowTitleSize, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -165,10 +165,10 @@ class _MihPackageWindowState extends State { insetAnimationDuration: Durations.short1, child: Container( decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), 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 8e7ee029..f2fcd340 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 @@ -48,9 +48,9 @@ class _MihPersonalProfilePreviewState extends State { fileNameController: TextEditingController(), userSelectedfile: file, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: () {}, ); } else { @@ -58,14 +58,14 @@ class _MihPersonalProfilePreviewState extends State { MihIcons.iDontKnow, size: profilePictureWidth, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); } } else { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); } }, 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 986b1d21..cf00e6a3 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 @@ -215,7 +215,7 @@ class _MihTextFormFieldState extends State { widget.borderRadius ?? 8.0), borderSide: field.hasError ? BorderSide( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), width: 2.0, @@ -232,7 +232,7 @@ class _MihTextFormFieldState extends State { widget.borderRadius ?? 8.0), borderSide: BorderSide( color: field.hasError - ? MzanziInnovationHub.of(context)! + ? MzansiInnovationHub.of(context)! .theme .errorColor() : widget.inputColor, @@ -243,7 +243,7 @@ class _MihTextFormFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), width: 3.0, @@ -253,7 +253,7 @@ class _MihTextFormFieldState extends State { borderRadius: BorderRadius.circular( widget.borderRadius ?? 8.0), borderSide: BorderSide( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), width: 3.0, @@ -276,7 +276,7 @@ class _MihTextFormFieldState extends State { field.errorText ?? '', style: TextStyle( fontSize: 12, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), 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 89ddc0ca..c38fd62a 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 @@ -57,7 +57,7 @@ class _MihTimeFieldState extends State { @override Widget build(BuildContext context) { - final theme = MzanziInnovationHub.of(context)!.theme; + final theme = MzansiInnovationHub.of(context)!.theme; return Center( child: SizedBox( width: widget.width, 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 0dd660f6..bdd19659 100644 --- a/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart +++ b/Frontend/lib/mih_components/mih_package_components/mih_toggle.dart @@ -66,11 +66,11 @@ class _MihToggleState extends State { return Colors.grey; } if (states.contains(WidgetState.selected)) { - return MzanziInnovationHub.of(context)! + return MzansiInnovationHub.of(context)! .theme .successColor(); // Outline color when active } - return MzanziInnovationHub.of(context)! + return MzansiInnovationHub.of(context)! .theme .errorColor(); // Outline color when active }, @@ -79,12 +79,12 @@ class _MihToggleState extends State { widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, activeTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MzanziInnovationHub.of(context)!.theme.successColor(), + : MzansiInnovationHub.of(context)!.theme.successColor(), inactiveThumbColor: widget.readOnly == true ? Colors.grey : widget.secondaryFillColor, inactiveTrackColor: widget.readOnly == true ? Colors.grey.shade400 - : MzanziInnovationHub.of(context)!.theme.errorColor(), + : MzansiInnovationHub.of(context)!.theme.errorColor(), // 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 b688cef8..23493ad8 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 @@ -28,7 +28,7 @@ class _MIHDeleteMessageState extends State { late double height; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (width / 4) * 2; popUpheight = null; @@ -59,10 +59,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -73,7 +73,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -81,7 +81,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -91,7 +91,7 @@ class _MIHDeleteMessageState extends State { "This note will be deleted permanently. Are you certain you want to delete it?", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -100,13 +100,13 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -127,7 +127,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -144,10 +144,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -158,7 +158,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -166,7 +166,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -176,7 +176,7 @@ class _MIHDeleteMessageState extends State { "This file will be deleted permanently. Are you certain you want to delete it?", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -185,13 +185,13 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -212,7 +212,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -229,10 +229,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -243,7 +243,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -251,7 +251,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -261,7 +261,7 @@ class _MIHDeleteMessageState extends State { "This team member will be deleted permanently from the business profile. Are you certain you want to delete it?", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -271,13 +271,13 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -298,7 +298,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -315,10 +315,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -329,7 +329,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -337,7 +337,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -347,7 +347,7 @@ class _MIHDeleteMessageState extends State { "This appointment will be deleted permanently from your calendar. Are you certain you want to delete it?", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -356,13 +356,13 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -383,7 +383,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -400,10 +400,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -414,7 +414,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -422,7 +422,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -432,7 +432,7 @@ class _MIHDeleteMessageState extends State { "This Card will be deleted permanently from your Mzansi Wallet. Are you certain you want to delete it?", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -441,13 +441,13 @@ class _MIHDeleteMessageState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -468,7 +468,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), 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 19f6a16b..9bff754d 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 @@ -24,7 +24,7 @@ class _MIHErrorMessageState extends State { Size? size; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (size!.width / 4) * 2; popUpheight = null; @@ -55,10 +55,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -68,14 +68,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 5), Text( "Oops! Looks like some fields are missing.", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -85,7 +85,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -94,7 +94,7 @@ class _MIHErrorMessageState extends State { RichText( text: TextSpan( style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: popUpBodySize, @@ -105,7 +105,7 @@ class _MIHErrorMessageState extends State { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan( @@ -113,7 +113,7 @@ class _MIHErrorMessageState extends State { TextSpan( text: "*", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan( @@ -137,7 +137,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -154,10 +154,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -167,14 +167,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 15), Text( "Password Doesn't Meet Requirements", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -184,7 +184,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -193,7 +193,7 @@ class _MIHErrorMessageState extends State { RichText( text: TextSpan( style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15.0, @@ -205,7 +205,7 @@ class _MIHErrorMessageState extends State { style: TextStyle( fontStyle: FontStyle.italic, fontSize: popUpBodySize, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan( @@ -243,7 +243,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -260,10 +260,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -273,14 +273,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 15), Text( "Let's Fix That Username", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -290,7 +290,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -311,7 +311,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -328,10 +328,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -341,14 +341,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 15), Text( "Oops! Invalid Email", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -358,7 +358,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -379,7 +379,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -396,10 +396,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -409,14 +409,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //SizedBox(height: 15), Text( "Email Already Exists", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -426,7 +426,7 @@ class _MIHErrorMessageState extends State { "An account is already registered with this email address. Please try logging in or use a different email.", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -435,7 +435,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -446,7 +446,7 @@ class _MIHErrorMessageState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -466,7 +466,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -483,10 +483,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -496,14 +496,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //SizedBox(height: 15), Text( "Passwords Don't Match", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -513,7 +513,7 @@ class _MIHErrorMessageState extends State { "The password and confirm password fields do not match. Please make sure they are identical.", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -522,7 +522,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -533,7 +533,7 @@ class _MIHErrorMessageState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -554,7 +554,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -571,10 +571,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -584,14 +584,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //SizedBox(height: 15), Text( "Uh oh! Login attempt unsuccessful.", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -601,7 +601,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -610,7 +610,7 @@ class _MIHErrorMessageState extends State { Text( "Here are some things to keep in mind:", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -621,7 +621,7 @@ class _MIHErrorMessageState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -642,7 +642,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -659,10 +659,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -672,14 +672,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 15), Text( "Internet Connection Lost!", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -689,7 +689,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -698,7 +698,7 @@ class _MIHErrorMessageState extends State { Text( "Here are a few things you can try:", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpSubtitleSize, fontWeight: FontWeight.bold, ), @@ -709,7 +709,7 @@ class _MIHErrorMessageState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -730,7 +730,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -747,10 +747,10 @@ class _MIHErrorMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 5.0), ), child: SingleChildScrollView( @@ -760,14 +760,14 @@ class _MIHErrorMessageState extends State { Icon( Icons.warning_amber_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), //const SizedBox(height: 15), Text( "Location Services Not Enabled", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -777,7 +777,7 @@ class _MIHErrorMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -786,7 +786,7 @@ class _MIHErrorMessageState extends State { // Text( // "Here are a few things you can try:", // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.errorColor(), + // color: MzansiInnovationHub.of(context)!.theme.errorColor(), // fontSize: popUpSubtitleSize, // fontWeight: FontWeight.bold, // ), @@ -797,7 +797,7 @@ class _MIHErrorMessageState extends State { // textAlign: TextAlign.left, // style: TextStyle( // color: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // MzansiInnovationHub.of(context)!.theme.secondaryColor(), // fontSize: popUpBodySize, // fontWeight: FontWeight.bold, // ), @@ -818,7 +818,7 @@ class _MIHErrorMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), 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 98206878..1a37c03d 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 @@ -20,7 +20,7 @@ class _MihloadingcircleState extends State { late double height; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = 250; popUpheight = 250; @@ -58,18 +58,18 @@ class _MihloadingcircleState extends State { // width: 250, // height: 275, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), width: 5.0), ), child: Column( mainAxisSize: MainAxisSize.min, children: [ GifView.asset( - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .loadingImageLocation(), height: 200, 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 5cdb83d5..31a44246 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 @@ -30,7 +30,7 @@ class _MIHNotificationMessageState extends State Size? size; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (size!.width / 4) * 2; popUpheight = 90; @@ -131,8 +131,8 @@ class _MIHNotificationMessageState extends State void initState() { super.initState(); setState(() { - primary = MzanziInnovationHub.of(context)!.theme.primaryColor(); - secondary = MzanziInnovationHub.of(context)!.theme.errorColor(); + primary = MzansiInnovationHub.of(context)!.theme.primaryColor(); + secondary = MzansiInnovationHub.of(context)!.theme.errorColor(); }); _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 4a71e6d0..ab685b6e 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 @@ -28,7 +28,7 @@ class _MIHSuccessMessageState extends State { late Size? size; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (size!.width / 4) * 2; popUpheight = null; @@ -59,10 +59,10 @@ class _MIHSuccessMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.successColor(), + color: MzansiInnovationHub.of(context)!.theme.successColor(), width: 5.0), ), child: Column( @@ -71,14 +71,14 @@ class _MIHSuccessMessageState extends State { Icon( Icons.check_circle_outline_rounded, size: popUpIconSize, - color: MzanziInnovationHub.of(context)!.theme.successColor(), + color: MzansiInnovationHub.of(context)!.theme.successColor(), ), //const SizedBox(height: 15), Text( "Success!", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.successColor(), + color: MzansiInnovationHub.of(context)!.theme.successColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -89,7 +89,7 @@ class _MIHSuccessMessageState extends State { message, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -101,13 +101,13 @@ class _MIHSuccessMessageState extends State { Navigator.pop(context); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Dismiss", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 16f7e3a0..b6b002ca 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 @@ -25,7 +25,7 @@ class _MIHDeleteMessageState extends State { late double height; void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (width / 4) * 2; popUpheight = null; @@ -56,10 +56,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -70,7 +70,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -78,7 +78,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -88,7 +88,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -109,7 +109,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -126,10 +126,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -140,7 +140,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -148,7 +148,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -158,7 +158,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -179,7 +179,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -196,10 +196,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -210,7 +210,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -218,7 +218,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -228,7 +228,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -249,7 +249,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -266,10 +266,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -280,7 +280,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -288,7 +288,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -298,7 +298,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -319,7 +319,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -336,10 +336,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -350,7 +350,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -358,7 +358,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -368,7 +368,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -389,7 +389,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -406,10 +406,10 @@ class _MIHDeleteMessageState extends State { width: popUpWidth, height: popUpheight, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -420,7 +420,7 @@ class _MIHDeleteMessageState extends State { Icons.warning_amber_rounded, size: popUpIconSize, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //const SizedBox(height: 15), Text( @@ -428,7 +428,7 @@ class _MIHDeleteMessageState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpTitleSize, fontWeight: FontWeight.bold, ), @@ -438,7 +438,7 @@ class _MIHDeleteMessageState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, fontWeight: FontWeight.bold, ), @@ -459,7 +459,7 @@ class _MIHDeleteMessageState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), 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 304bb957..9154b0cc 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 @@ -30,7 +30,7 @@ class PolicyAndTermsText { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -427,7 +427,7 @@ class PolicyAndTermsText { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), 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 7b41c20e..87480ad5 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 @@ -27,12 +27,12 @@ class _AboutMihTileState extends State { appName: "About MIH", appIcon: Icon( MihIcons.aboutMih, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 b96de189..e5e09c41 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,7 +35,7 @@ class _MihAttributesState extends State { icon, // size: 125, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -71,12 +71,12 @@ class _MihAttributesState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 100, child: Text( "Visit", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -110,7 +110,7 @@ class _MihAttributesState extends State { children: [ Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), 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 134bc64d..ed4f9dd8 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 @@ -48,7 +48,7 @@ class _MihInfoState extends State { bio += "6 Year of banking experience with one of the big 5 banks of South Africa."; ImageProvider logoFrame = - MzanziInnovationHub.of(context)!.theme.altLogoFrame(); + MzansiInnovationHub.of(context)!.theme.altLogoFrame(); return Wrap( alignment: WrapAlignment.center, crossAxisAlignment: WrapCrossAlignment.center, @@ -63,7 +63,7 @@ class _MihInfoState extends State { children: [ CircleAvatar( backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), 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'), @@ -231,12 +231,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.youtube, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 175, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -247,12 +247,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.tiktok, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -263,12 +263,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.twitch, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -279,12 +279,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.threads, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -295,12 +295,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.whatsapp, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -311,12 +311,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.instagram, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== @@ -328,12 +328,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.xTwitter, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -344,12 +344,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.linkedin, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -360,12 +360,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.facebook, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -376,12 +376,12 @@ class _MihInfoState extends State { tileIcon: Center( child: FaIcon( FontAwesomeIcons.reddit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), size: 200, ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== socials.add(MIHTile( @@ -393,19 +393,19 @@ class _MihInfoState extends State { child: Text( "KICK", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, fontSize: 100, ), ), // FaIcon( // FontAwesomeIcons.tv, - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // size: 200, // ), ), - p: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - s: MzanziInnovationHub.of(context)!.theme.primaryColor(), + p: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + s: MzansiInnovationHub.of(context)!.theme.primaryColor(), )); //================================================================== return socials; @@ -426,10 +426,10 @@ class _MihInfoState extends State { return "Install MIH (Play Store)"; } else if (isWebIos) { return "Install MIH (PWA)"; - } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() == + } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Android") { return "Update MIH (Play Store)"; - } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "iOS") { + } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "iOS") { return "Update MIH (App Store)"; } else { return "Install MIH (PWA)"; @@ -464,7 +464,7 @@ class _MihInfoState extends State { child: Icon( MihIcons.mihLogo, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -479,7 +479,7 @@ class _MihInfoState extends State { ), ), Text( - "MIH App Version: ${MzanziInnovationHub.of(context)!.theme.getLatestVersion()}", + "MIH App Version: ${MzansiInnovationHub.of(context)!.theme.getLatestVersion()}", style: const TextStyle( fontWeight: FontWeight.normal, fontSize: 15, @@ -516,12 +516,12 @@ class _MihInfoState extends State { MihInstallServices().installMihTrigger(context); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( getInstallButtonText(), style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -538,12 +538,12 @@ class _MihInfoState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "MIH Beginners Guide", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -587,17 +587,17 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.vpn_lock, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - Web", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { shareMIHLink( context, @@ -609,17 +609,17 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.apple, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - iOS", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { shareMIHLink( context, @@ -631,17 +631,17 @@ class _MihInfoState extends State { SpeedDialChild( child: Icon( Icons.android, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "MIH - Android", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 13ab65e7..5d598163 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,25 +132,25 @@ class _BuildPatientsListState extends State { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.successColor())); + color: MzansiInnovationHub.of(context)!.theme.successColor())); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.messageTextColor())); + MzansiInnovationHub.of(context)!.theme.messageTextColor())); } else { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor())); + color: MzansiInnovationHub.of(context)!.theme.errorColor())); } return ListTile( title: Text( line1, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -166,7 +166,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), onTap: () { @@ -178,13 +178,13 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), ); } void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (width / 4) * 2; popUpheight = null; @@ -234,7 +234,7 @@ class _BuildPatientsListState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -249,12 +249,12 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "declined"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Decline", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -267,12 +267,12 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "approved"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Approve", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -311,7 +311,7 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 966fbbcd..25b7c2c9 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,25 +85,25 @@ class _BuildPatientsListState extends State { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.successColor())); + color: MzansiInnovationHub.of(context)!.theme.successColor())); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.messageTextColor())); + MzansiInnovationHub.of(context)!.theme.messageTextColor())); } else { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor())); + color: MzansiInnovationHub.of(context)!.theme.errorColor())); } return ListTile( title: Text( line1, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -118,7 +118,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), onTap: () { @@ -126,13 +126,13 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), ); } void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (width / 4) * 2; popUpheight = null; @@ -195,7 +195,7 @@ class _BuildPatientsListState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -213,7 +213,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), Text( @@ -221,7 +221,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), SizedBox( @@ -230,7 +230,7 @@ class _BuildPatientsListState extends State { "1. Permanent Access: Once you accepts this access request, it will become permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -242,7 +242,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -254,7 +254,7 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: Once granted, you cannot revoke access to your patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -265,7 +265,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), ], @@ -282,7 +282,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), Text( @@ -290,7 +290,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), SizedBox( @@ -299,7 +299,7 @@ class _BuildPatientsListState extends State { "1. Permanent Access: This access is permanent.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -311,7 +311,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -323,7 +323,7 @@ class _BuildPatientsListState extends State { "3. Irreversible Access: You cannot revoke this access to your patient's profile.", style: TextStyle( fontWeight: FontWeight.normal, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -356,12 +356,12 @@ class _BuildPatientsListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Decline", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -383,12 +383,12 @@ class _BuildPatientsListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Approve", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -428,7 +428,7 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 76969c04..78acdc24 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 @@ -31,12 +31,12 @@ class _MihAccessTileState extends State { appName: "Access Controls", appIcon: Icon( MihIcons.accessControl, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 7e99b766..5eb6cfb1 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 @@ -191,7 +191,7 @@ class _MihAccessRequestState extends State { "No Request have been made.", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .messageTextColor()), textAlign: TextAlign.center, @@ -208,7 +208,7 @@ class _MihAccessRequestState extends State { "$errorCode: Error pulling Patients Data\n$baseUrl/queue/patients/\n$errorBody", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor()), textAlign: TextAlign.center, diff --git a/Frontend/lib/mih_packages/authentication/auth_check.dart b/Frontend/lib/mih_packages/authentication/auth_check.dart index 1ba0e1d8..5aed287b 100644 --- a/Frontend/lib/mih_packages/authentication/auth_check.dart +++ b/Frontend/lib/mih_packages/authentication/auth_check.dart @@ -46,9 +46,9 @@ class _AuthCheckState extends State { // SchedulerBinding.instance.platformDispatcher.platformBrightness; // bool isDarkMode = brightness == Brightness.dark; // if (isDarkMode) { - // MzanziInnovationHub.of(context)!.theme.mode = "Dark"; + // MzansiInnovationHub.of(context)!.theme.mode = "Dark"; // } else { - // MzanziInnovationHub.of(context)!.theme.mode = "Light"; + // MzansiInnovationHub.of(context)!.theme.mode = "Light"; // } super.initState(); } diff --git a/Frontend/lib/mih_packages/authentication/biometric_check.dart b/Frontend/lib/mih_packages/authentication/biometric_check.dart index ae83d7b6..194b8d93 100644 --- a/Frontend/lib/mih_packages/authentication/biometric_check.dart +++ b/Frontend/lib/mih_packages/authentication/biometric_check.dart @@ -38,7 +38,7 @@ class _BiometricCheckState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -109,7 +109,7 @@ class _BiometricCheckState extends State { Widget alertpopUp = MihPackageAlert( alertIcon: Icon( Icons.fingerprint, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 100, ), alertTitle: "Biometric Authentication Error", @@ -120,7 +120,7 @@ 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: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox(height: 20), @@ -138,13 +138,13 @@ class _BiometricCheckState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 300, child: Text( "Set Up Authentication", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -156,13 +156,13 @@ class _BiometricCheckState extends State { authenticateUser(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Authenticate Now", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -172,7 +172,7 @@ class _BiometricCheckState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); showDialog( context: context, @@ -198,7 +198,7 @@ class _BiometricCheckState extends State { Icons.fingerprint, size: 100, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //spacer const SizedBox(height: 10), @@ -209,7 +209,7 @@ class _BiometricCheckState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -221,7 +221,7 @@ class _BiometricCheckState extends State { Icons.lock, size: 200, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 30), MihButton( @@ -229,12 +229,12 @@ class _BiometricCheckState extends State { authenticateUser(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Authenticate Now", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -274,7 +274,7 @@ class _BiometricCheckState extends State { @override Widget build(BuildContext context) { - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") { + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { return MIHProfileGetter( personalSelected: widget.personalSelected, ); diff --git a/Frontend/lib/mih_packages/authentication/forgot_password.dart b/Frontend/lib/mih_packages/authentication/forgot_password.dart index 203e460a..e91ded04 100644 --- a/Frontend/lib/mih_packages/authentication/forgot_password.dart +++ b/Frontend/lib/mih_packages/authentication/forgot_password.dart @@ -79,11 +79,11 @@ class _ForgotPasswordState extends State { } Color getPrim() { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } Color getSec() { - return MzanziInnovationHub.of(context)!.theme.primaryColor(); + return MzansiInnovationHub.of(context)!.theme.primaryColor(); } void prePassResteWarning() { @@ -94,7 +94,7 @@ class _ForgotPasswordState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), alertTitle: "Password Reset Confirmation", alertBody: Column( @@ -106,7 +106,7 @@ class _ForgotPasswordState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15.0, fontWeight: FontWeight.bold, ), @@ -122,13 +122,13 @@ class _ForgotPasswordState extends State { validateInput(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Continue", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -136,7 +136,7 @@ class _ForgotPasswordState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, ); @@ -223,7 +223,7 @@ class _ForgotPasswordState extends State { child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric( vertical: 25, horizontal: width * 0.2) @@ -236,7 +236,7 @@ class _ForgotPasswordState extends State { Icon( Icons.lock, size: 100, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -248,7 +248,7 @@ class _ForgotPasswordState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -258,10 +258,10 @@ class _ForgotPasswordState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -286,14 +286,14 @@ class _ForgotPasswordState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Reset Password", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, diff --git a/Frontend/lib/mih_packages/authentication/register.dart b/Frontend/lib/mih_packages/authentication/register.dart index 6e9ff4d2..5413e022 100644 --- a/Frontend/lib/mih_packages/authentication/register.dart +++ b/Frontend/lib/mih_packages/authentication/register.dart @@ -231,7 +231,7 @@ class _RegisterState extends State { Widget getSecondaryActionButton() { return Visibility( - visible: MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web", + visible: MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web", child: MIHAction( icon: Padding( padding: const EdgeInsets.all(10.0), @@ -239,12 +239,12 @@ class _RegisterState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(), + buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -268,7 +268,7 @@ class _RegisterState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -320,7 +320,7 @@ class _RegisterState extends State { child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), @@ -331,7 +331,7 @@ class _RegisterState extends State { Icon( Icons.lock, size: 100, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -343,7 +343,7 @@ class _RegisterState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -355,10 +355,10 @@ class _RegisterState extends State { formFields: [ //email input MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -374,10 +374,10 @@ class _RegisterState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: passwordController, @@ -394,10 +394,10 @@ class _RegisterState extends State { //spacer const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: confirmPasswordController, @@ -430,14 +430,14 @@ class _RegisterState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -447,14 +447,14 @@ class _RegisterState extends State { ), MihButton( onPressed: widget.onTap, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 300, child: Text( "I have an account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, diff --git a/Frontend/lib/mih_packages/authentication/reset_password.dart b/Frontend/lib/mih_packages/authentication/reset_password.dart index a70dfdac..a2651cf9 100644 --- a/Frontend/lib/mih_packages/authentication/reset_password.dart +++ b/Frontend/lib/mih_packages/authentication/reset_password.dart @@ -98,11 +98,11 @@ class _ResetPasswordState extends State { } Color getPrim() { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } Color getSec() { - return MzanziInnovationHub.of(context)!.theme.primaryColor(); + return MzansiInnovationHub.of(context)!.theme.primaryColor(); } void loginError() { @@ -203,7 +203,7 @@ class _ResetPasswordState extends State { child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), @@ -214,7 +214,7 @@ class _ResetPasswordState extends State { Icon( Icons.lock, size: 100, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -226,7 +226,7 @@ class _ResetPasswordState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -237,10 +237,10 @@ class _ResetPasswordState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: passwordController, @@ -257,10 +257,10 @@ class _ResetPasswordState extends State { //spacer const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: confirmPasswordController, @@ -288,14 +288,14 @@ class _ResetPasswordState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Reset Password", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, diff --git a/Frontend/lib/mih_packages/authentication/signin.dart b/Frontend/lib/mih_packages/authentication/signin.dart index 16a2fbdb..385aebe9 100644 --- a/Frontend/lib/mih_packages/authentication/signin.dart +++ b/Frontend/lib/mih_packages/authentication/signin.dart @@ -87,11 +87,11 @@ class _SignInState extends State { } Color getPrim() { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } Color getSec() { - return MzanziInnovationHub.of(context)!.theme.primaryColor(); + return MzansiInnovationHub.of(context)!.theme.primaryColor(); } void setSandboxProfiles(List tileList) { @@ -211,7 +211,7 @@ class _SignInState extends State { context: context, builder: (context) { return Dialog( - //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), child: Stack( children: [ Container( @@ -219,10 +219,10 @@ class _SignInState extends State { width: 500.0, height: 500, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 5.0), @@ -234,7 +234,7 @@ class _SignInState extends State { "Sandbox Profiles", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 25.0, @@ -246,7 +246,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15.0, @@ -281,7 +281,7 @@ class _SignInState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -295,7 +295,7 @@ class _SignInState extends State { Widget getSecondaryActionButton() { return Visibility( - visible: MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web", + visible: MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web", child: MIHAction( icon: Padding( padding: const EdgeInsets.all(10.0), @@ -303,12 +303,12 @@ class _SignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(), + buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -335,7 +335,7 @@ class _SignInState extends State { child: FittedBox( child: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -387,7 +387,7 @@ class _SignInState extends State { child: SingleChildScrollView( physics: const BouncingScrollPhysics(), child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), @@ -399,7 +399,7 @@ class _SignInState extends State { Icon( Icons.lock, size: 100, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -411,7 +411,7 @@ class _SignInState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -422,10 +422,10 @@ class _SignInState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -442,10 +442,10 @@ class _SignInState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: passwordController, @@ -476,7 +476,7 @@ class _SignInState extends State { 'Forgot Password?', style: TextStyle( fontSize: 15, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontWeight: FontWeight.bold, @@ -507,14 +507,14 @@ class _SignInState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Sign In", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -525,14 +525,14 @@ class _SignInState extends State { MihButton( onPressed: widget.onTap, buttonColor: - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -569,7 +569,7 @@ class _SignInState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 15, - color: MzanziInnovationHub.of( + color: MzansiInnovationHub.of( context)! .theme .secondaryColor()), @@ -620,7 +620,7 @@ class _SignInState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15.0, 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 60d96feb..2f1ca93b 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 @@ -30,12 +30,12 @@ class _MihCalculatorTileState extends State { appName: "Calculator", appIcon: Icon( MihIcons.calculator, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 61f2dac7..d00de2f7 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 @@ -76,7 +76,7 @@ class _CurrencyExchangeRateState extends State { Icon( Icons.currency_exchange, size: 150, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 20), FittedBox( @@ -87,7 +87,7 @@ class _CurrencyExchangeRateState extends State { fontSize: 30, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -102,7 +102,7 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -116,7 +116,7 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -135,7 +135,7 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -149,7 +149,7 @@ class _CurrencyExchangeRateState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -186,7 +186,7 @@ class _CurrencyExchangeRateState extends State { textAlign: TextAlign.center, style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.bold, ), ), @@ -206,7 +206,7 @@ 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: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.normal, ), ), @@ -217,7 +217,7 @@ 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: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.normal, ), ), @@ -228,7 +228,7 @@ 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: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.normal, ), ), @@ -243,7 +243,7 @@ class _CurrencyExchangeRateState extends State { text: TextSpan( style: TextStyle( fontSize: 15, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.normal, ), children: [ @@ -290,7 +290,7 @@ class _CurrencyExchangeRateState extends State { } else if (snapshot.connectionState == ConnectionState.done) { return MihSingleChildScroll( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), @@ -300,10 +300,10 @@ class _CurrencyExchangeRateState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: _fromAmountController, @@ -345,7 +345,7 @@ class _CurrencyExchangeRateState extends State { text: TextSpan( style: TextStyle( fontSize: 15, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), ), @@ -357,7 +357,7 @@ class _CurrencyExchangeRateState extends State { text: "Diclaimer", style: TextStyle( decoration: TextDecoration.underline, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontWeight: FontWeight.bold, @@ -388,14 +388,14 @@ class _CurrencyExchangeRateState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Calculate", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -407,14 +407,14 @@ class _CurrencyExchangeRateState extends State { onPressed: () { clearInput(); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .errorColor(), width: 300, child: Text( "Clear", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -437,7 +437,7 @@ class _CurrencyExchangeRateState extends State { "Error pulling Currency Exchange Data.", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.errorColor()), + color: MzansiInnovationHub.of(context)!.theme.errorColor()), 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 aa7ed8fb..054fb93f 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/simple_calc.dart @@ -87,7 +87,7 @@ class _SimpleCalcState extends State { // print("height: $height"); // print("newheight: $newheight"); double calcWidth = 500; - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { if (height < 700) { calcWidth = 300; } @@ -108,7 +108,7 @@ class _SimpleCalcState extends State { style: TextStyle( fontSize: 40, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -123,7 +123,7 @@ class _SimpleCalcState extends State { style: TextStyle( fontSize: 30, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontWeight: FontWeight.bold), ), ), @@ -165,7 +165,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -186,7 +186,7 @@ class _SimpleCalcState extends State { userInput += buttons[index]; }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .messageTextColor(), width: 50, @@ -195,7 +195,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -215,7 +215,7 @@ class _SimpleCalcState extends State { userInput += buttons[index]; }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .messageTextColor(), width: 50, @@ -224,7 +224,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -255,7 +255,7 @@ class _SimpleCalcState extends State { }); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .messageTextColor(), width: 50, @@ -264,7 +264,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -296,13 +296,13 @@ class _SimpleCalcState extends State { }); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 50, height: 50, borderRadius: 5, child: Icon( Icons.backspace, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), @@ -320,7 +320,7 @@ class _SimpleCalcState extends State { userInput = answer; }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 50, @@ -329,7 +329,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -350,7 +350,7 @@ class _SimpleCalcState extends State { equalPressed(); }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 50, @@ -359,7 +359,7 @@ class _SimpleCalcState extends State { child: Text( buttons[index], style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 2eee56d6..3ec8ffed 100644 --- a/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart +++ b/Frontend/lib/mih_packages/calculator/package_tools/tip_calc.dart @@ -111,7 +111,7 @@ class _TipCalcState extends State { FaIcon( FontAwesomeIcons.coins, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), size: 35, ), const SizedBox(width: 15), @@ -122,7 +122,7 @@ class _TipCalcState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -133,7 +133,7 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const Divider(), @@ -144,7 +144,7 @@ class _TipCalcState extends State { FaIcon( FontAwesomeIcons.moneyBills, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), size: 35, ), const SizedBox(width: 15), @@ -155,7 +155,7 @@ class _TipCalcState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -166,7 +166,7 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), Text( @@ -175,7 +175,7 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 30, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), if (splitBillController.text == "Yes") const Divider(), @@ -187,7 +187,7 @@ class _TipCalcState extends State { FaIcon( FontAwesomeIcons.peopleGroup, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), size: 35, ), const SizedBox(width: 15), @@ -197,7 +197,7 @@ class _TipCalcState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -212,7 +212,7 @@ class _TipCalcState extends State { fontSize: 30, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), if (splitBillController.text == "Yes") @@ -223,7 +223,7 @@ class _TipCalcState extends State { fontSize: 30, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), SizedBox(height: 10), @@ -257,7 +257,7 @@ class _TipCalcState extends State { Widget getBody(double width) { return MihSingleChildScroll( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -268,9 +268,9 @@ class _TipCalcState extends State { formFields: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: billAmountController, multiLineInput: false, requiredText: true, @@ -283,9 +283,9 @@ class _TipCalcState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: tipPercentageController, multiLineInput: false, requiredText: true, @@ -300,9 +300,9 @@ class _TipCalcState extends State { hintText: "Split Bill", initialPostion: splitPosition, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (value) { setState(() { splitBillController.text = value ? "Yes" : "No"; @@ -339,10 +339,10 @@ class _TipCalcState extends State { children: [ MihNumericStepper( controller: noPeopleController, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), hintText: "No. People", @@ -352,10 +352,10 @@ class _TipCalcState extends State { validationOn: true, ), // MihTextFormField( - // fillColor: MzanziInnovationHub.of(context)! + // fillColor: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), - // inputColor: MzanziInnovationHub.of(context)! + // inputColor: MzansiInnovationHub.of(context)! // .theme // .primaryColor(), // controller: noPeopleController, @@ -392,14 +392,14 @@ class _TipCalcState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Calculate", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -412,12 +412,12 @@ class _TipCalcState extends State { clearInput(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Clear", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 d5d365be..e0072c8e 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,25 +134,25 @@ class _BuildPatientsListState extends State { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.successColor())); + color: MzansiInnovationHub.of(context)!.theme.successColor())); } else if (access == "PENDING") { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.messageTextColor())); + MzansiInnovationHub.of(context)!.theme.messageTextColor())); } else { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor())); + color: MzansiInnovationHub.of(context)!.theme.errorColor())); } return ListTile( title: Text( line1, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -168,7 +168,7 @@ class _BuildPatientsListState extends State { // Text( // subtitle, // style: TextStyle( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), onTap: () { @@ -180,13 +180,13 @@ class _BuildPatientsListState extends State { }, // trailing: Icon( // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), ); } void checkScreenSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { setState(() { popUpWidth = (width / 4) * 2; popUpheight = null; @@ -236,7 +236,7 @@ class _BuildPatientsListState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: popUpBodySize, //fontWeight: FontWeight.bold, ), @@ -251,12 +251,12 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "declined"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Decline", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -269,12 +269,12 @@ class _BuildPatientsListState extends State { updateAccessAPICall(index, "approved"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Approve", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -313,7 +313,7 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 a8f0f68d..786eb960 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_appointment_list.dart @@ -65,7 +65,7 @@ class _BuildAppointmentListState extends State { late double height; double getPaddingSize() { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { return (width / 10); } else { return 0.0; @@ -89,18 +89,18 @@ class _BuildAppointmentListState extends State { // print("Appointment Date: $appointDate"); // print("Appointment Hour: $appointHour"); Color appointmentColor = - MzanziInnovationHub.of(context)!.theme.secondaryColor(); + MzansiInnovationHub.of(context)!.theme.secondaryColor(); if (date == appointDate) { if (appointHour < hourNow) { appointmentColor = - MzanziInnovationHub.of(context)!.theme.messageTextColor(); + MzansiInnovationHub.of(context)!.theme.messageTextColor(); } else if (appointHour == hourNow) { appointmentColor = - MzanziInnovationHub.of(context)!.theme.successColor(); + MzansiInnovationHub.of(context)!.theme.successColor(); } } else if (DateTime.parse(appointDate).isBefore(DateTime.parse(date))) { appointmentColor = - MzanziInnovationHub.of(context)!.theme.messageTextColor(); + MzansiInnovationHub.of(context)!.theme.messageTextColor(); } return Container( @@ -158,17 +158,17 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -176,17 +176,17 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deleteAppointmentConfirmationWindow(index); }, @@ -201,7 +201,7 @@ class _BuildAppointmentListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -209,9 +209,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -221,9 +221,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.dateController, multiLineInput: false, requiredText: true, @@ -233,9 +233,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.timeController, multiLineInput: false, requiredText: true, @@ -245,9 +245,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -276,17 +276,17 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { appointmentUpdateWindow(index, bodyWidth); }, @@ -294,17 +294,17 @@ class _BuildAppointmentListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deleteAppointmentConfirmationWindow(index); }, @@ -319,7 +319,7 @@ class _BuildAppointmentListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -327,9 +327,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -339,9 +339,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.dateController, multiLineInput: false, requiredText: true, @@ -351,9 +351,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.timeController, multiLineInput: false, requiredText: true, @@ -363,9 +363,9 @@ class _BuildAppointmentListState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -416,7 +416,7 @@ class _BuildAppointmentListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -425,11 +425,11 @@ class _BuildAppointmentListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.titleController, multiLineInput: false, requiredText: true, @@ -458,11 +458,11 @@ class _BuildAppointmentListState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.descriptionIDController, multiLineInput: true, height: 250, @@ -488,14 +488,14 @@ class _BuildAppointmentListState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 f24e3802..1c350404 100644 --- a/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart +++ b/Frontend/lib/mih_packages/calendar/builder/build_queue_list.dart @@ -44,7 +44,7 @@ class _BuildQueueListState extends State { title: Text( title, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -121,7 +121,7 @@ class _BuildQueueListState extends State { shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 3555bc98..de6a06c6 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 @@ -31,12 +31,12 @@ class _MzansiCalendarTileState extends State { appName: "Calendar", appIcon: Icon( MihIcons.calendar, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } diff --git a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart index 8e66516f..e2ea3fa9 100644 --- a/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart +++ b/Frontend/lib/mih_packages/calendar/package_tools/appointments.dart @@ -90,7 +90,7 @@ class _PatientAccessRequestState extends State { "No Appointments for $selectedDay", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), ), textAlign: TextAlign.center, softWrap: true, @@ -117,7 +117,7 @@ class _PatientAccessRequestState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -126,11 +126,11 @@ class _PatientAccessRequestState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _appointmentTitleController, multiLineInput: false, requiredText: true, @@ -159,11 +159,11 @@ class _PatientAccessRequestState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _appointmentDescriptionIDController, multiLineInput: true, height: 250, @@ -183,14 +183,14 @@ class _PatientAccessRequestState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -296,7 +296,7 @@ class _PatientAccessRequestState extends State { }); }), // Divider( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), Row( mainAxisSize: MainAxisSize.max, @@ -318,7 +318,7 @@ class _PatientAccessRequestState extends State { "Error pulling appointments", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor()), textAlign: TextAlign.center, @@ -341,17 +341,17 @@ class _PatientAccessRequestState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 76a6ebdc..3e8371b4 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 @@ -233,7 +233,7 @@ class _MihRegisterState extends State { child: MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -243,7 +243,7 @@ class _MihRegisterState extends State { Icon( Icons.lock, size: 100, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //spacer const SizedBox(height: 10), @@ -254,7 +254,7 @@ class _MihRegisterState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), //spacer @@ -265,9 +265,9 @@ class _MihRegisterState extends State { //email input MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: emailController, multiLineInput: false, requiredText: true, @@ -282,9 +282,9 @@ class _MihRegisterState extends State { //password input MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: passwordController, multiLineInput: false, requiredText: true, @@ -299,9 +299,9 @@ class _MihRegisterState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: confirmPasswordController, multiLineInput: false, requiredText: true, @@ -331,14 +331,14 @@ class _MihRegisterState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -348,14 +348,14 @@ class _MihRegisterState extends State { ), MihButton( onPressed: widget.onExistingUserButtonTap, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 300, child: Text( "I have an account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 473f49ec..7f75000a 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 @@ -159,11 +159,11 @@ class _MihSignInState extends State { } Color getPrim() { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } Color getSec() { - return MzanziInnovationHub.of(context)!.theme.primaryColor(); + return MzansiInnovationHub.of(context)!.theme.primaryColor(); } void loginError() { @@ -209,7 +209,7 @@ class _MihSignInState extends State { child: MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: AutofillGroup( @@ -222,7 +222,7 @@ class _MihSignInState extends State { mainAxisAlignment: MainAxisAlignment.end, children: [ Visibility( - visible: MzanziInnovationHub.of(context)! + visible: MzansiInnovationHub.of(context)! .theme .getPlatform() == "Web", @@ -232,14 +232,14 @@ class _MihSignInState extends State { onPressed: () { MihInstallServices().installMihTrigger(context); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 150, child: Text( "Install MIH", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -256,7 +256,7 @@ class _MihSignInState extends State { Icons.lock, size: 100, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), //spacer const SizedBox(height: 10), @@ -267,7 +267,7 @@ class _MihSignInState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), //spacer @@ -276,11 +276,11 @@ class _MihSignInState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: emailController, multiLineInput: false, requiredText: true, @@ -294,11 +294,11 @@ class _MihSignInState extends State { const SizedBox(height: 10), //password input MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: passwordController, multiLineInput: false, requiredText: true, @@ -326,7 +326,7 @@ class _MihSignInState extends State { 'Forgot Password?', style: TextStyle( fontSize: 15, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontWeight: FontWeight.bold, @@ -356,14 +356,14 @@ class _MihSignInState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Sign In", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -373,14 +373,14 @@ class _MihSignInState extends State { ), MihButton( onPressed: widget.onNewUserButtonTap, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 300, child: Text( "Create New Account", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -417,7 +417,7 @@ class _MihSignInState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 15, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), ), @@ -465,7 +465,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor(), fontSize: 15.0, 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 9eb4b479..a30d3c0f 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 @@ -57,9 +57,9 @@ class _MIHAppDrawerState extends State { fileNameController: proPicController, onChange: (_) {}, userSelectedfile: null, - frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), // MIHProfilePicture( // profilePictureFile: widget.propicFile, @@ -69,7 +69,7 @@ class _MIHAppDrawerState extends State { // radius: 27, // drawerMode: true, // editable: false, - // frameColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // frameColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), // onChange: (newProPic) {}, // ), @@ -79,7 +79,7 @@ class _MIHAppDrawerState extends State { // children: [ // CircleAvatar( // backgroundColor: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // backgroundImage: widget.propicFile, // //'https://media.licdn.com/dms/image/D4D03AQGd1-QhjtWWpA/profile-displayphoto-shrink_400_400/0/1671698053061?e=2147483647&v=beta&t=a3dJI5yxs5-KeXjj10LcNCFuC9IOfa8nNn3k_Qyr0CA'), // radius: 27, @@ -110,10 +110,10 @@ class _MIHAppDrawerState extends State { @override Widget build(BuildContext context) { // precacheImage( - // MzanziInnovationHub.of(context)!.theme.logoImage().image, context); + // MzansiInnovationHub.of(context)!.theme.logoImage().image, context); return SafeArea( child: Drawer( - //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + //backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), child: LayoutBuilder( builder: (BuildContext context, BoxConstraints constraints) { return Stack( @@ -126,7 +126,7 @@ class _MIHAppDrawerState extends State { children: [ DrawerHeader( decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -142,7 +142,7 @@ class _MIHAppDrawerState extends State { "${widget.signedInUser.fname} ${widget.signedInUser.lname}", style: TextStyle( fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), @@ -152,7 +152,7 @@ class _MIHAppDrawerState extends State { style: TextStyle( fontSize: 12, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), @@ -162,7 +162,7 @@ class _MIHAppDrawerState extends State { style: TextStyle( fontSize: 10, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), @@ -178,14 +178,14 @@ class _MIHAppDrawerState extends State { // Icon( // Icons.home_outlined, // color: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // const SizedBox(width: 25.0), // Text( // "Home", // style: TextStyle( // //fontWeight: FontWeight.bold, - // color: MzanziInnovationHub.of(context)! + // color: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), // ), @@ -208,7 +208,7 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.policy, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -217,7 +217,7 @@ class _MIHAppDrawerState extends State { "Privacy Policy", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -237,7 +237,7 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.design_services_rounded, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -246,7 +246,7 @@ class _MIHAppDrawerState extends State { "Terms of Service", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -266,7 +266,7 @@ class _MIHAppDrawerState extends State { children: [ Icon( Icons.logout, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -275,7 +275,7 @@ class _MIHAppDrawerState extends State { "Sign Out", style: TextStyle( //fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -310,15 +310,15 @@ class _MIHAppDrawerState extends State { child: InkWell( onTap: () { setState(() { - if (MzanziInnovationHub.of(context)?.theme.mode == + if (MzansiInnovationHub.of(context)?.theme.mode == "Dark") { //darkm = !darkm; - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .changeTheme(ThemeMode.light); //print("Dark Mode: $darkm"); } else { //darkm = !darkm; - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .changeTheme(ThemeMode.dark); //print("Dark Mode: $darkm"); } @@ -333,19 +333,19 @@ class _MIHAppDrawerState extends State { child: Icon( MihIcons.mihLogo, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), ), // IconButton( // onPressed: () { // setState(() { - // if (MzanziInnovationHub.of(context)?.theme.mode == "Dark") { + // if (MzansiInnovationHub.of(context)?.theme.mode == "Dark") { // //darkm = !darkm; - // MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.light); + // MzansiInnovationHub.of(context)!.changeTheme(ThemeMode.light); // //print("Dark Mode: $darkm"); // } else { // //darkm = !darkm; - // MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.dark); + // MzansiInnovationHub.of(context)!.changeTheme(ThemeMode.dark); // //print("Dark Mode: $darkm"); // } // Navigator.of(context).popAndPushNamed('/'); @@ -353,7 +353,7 @@ class _MIHAppDrawerState extends State { // }, // icon: Icon( // Icons.light_mode, - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // 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 c6c55c4b..b59bd32a 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home.dart @@ -117,9 +117,9 @@ class _MihHomeState extends State { fileNameController: proPicController, userSelectedfile: null, // frameColor: frameColor, - frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (_) {}, ), // MIHProfilePicture( @@ -130,7 +130,7 @@ class _MihHomeState extends State { // radius: 21, // drawerMode: false, // editable: false, - // frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // 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 8ee7050d..d6639fcb 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_home_legacy.dart @@ -86,7 +86,7 @@ class _MIHHomeLegacyState extends State { // ); void setAppsNewPersonal(List tileList) { - ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); + ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); if (widget.signedInUser.fname == "") { tileList.add(MIHTile( @@ -128,8 +128,8 @@ class _MIHHomeLegacyState extends State { } void setAppsPersonal(List tileList) { - ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); - ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage(); + ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); + ImageProvider aiLogo = MzansiInnovationHub.of(context)!.theme.aiLogoImage(); tileList.add(MIHTile( videoID: "P2bM9eosJ_A", onTap: () { @@ -355,7 +355,7 @@ class _MIHHomeLegacyState extends State { } void setAppsBusiness(List tileList) { - ImageProvider aiLogo = MzanziInnovationHub.of(context)!.theme.aiLogoImage(); + ImageProvider aiLogo = MzansiInnovationHub.of(context)!.theme.aiLogoImage(); tileList.add(MIHTile( videoID: "NWyJZq2ZYOM", onTap: () { @@ -866,18 +866,18 @@ class _MIHHomeLegacyState extends State { child: Icon( Icons.delete, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete File", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () {}, ), ], @@ -954,11 +954,11 @@ class _MIHHomeLegacyState extends State { } Color getPrim() { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } Color getSec() { - return MzanziInnovationHub.of(context)!.theme.primaryColor(); + return MzansiInnovationHub.of(context)!.theme.primaryColor(); } bool isBusinessUser(AppUser signedInUser) { @@ -995,7 +995,7 @@ class _MIHHomeLegacyState extends State { // radius: 21, // drawerMode: false, // editable: false, - // frameColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // frameColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // onChange: (newProPic) {}, // ), ), @@ -1025,7 +1025,7 @@ class _MIHHomeLegacyState extends State { child: Icon( Icons.circle, size: 10, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), ) ], @@ -1093,9 +1093,9 @@ class _MIHHomeLegacyState extends State { prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), hintColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { print("Search Text: ${searchController.text}"); setState(() { @@ -1170,11 +1170,11 @@ class _MIHHomeLegacyState extends State { child: Placeholder(), // GNav( // //hoverColor: Colors.lightBlueAccent, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // iconSize: 35.0, - // activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // activeColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), // tabBackgroundColor: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // MzansiInnovationHub.of(context)!.theme.secondaryColor(), // //gap: 20, // //padding: EdgeInsets.all(15), // tabs: [ @@ -1220,7 +1220,7 @@ class _MIHHomeLegacyState extends State { } Future refreshNotifications() async { - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") { + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.location.reload(); } else { var responseNotification = await http.get(Uri.parse( 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 811dd798..9929d6e7 100644 --- a/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart +++ b/Frontend/lib/mih_packages/mih_home/mih_profile_getter.dart @@ -92,7 +92,7 @@ class _MIHProfileGetterState extends State { "Connection Error", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 35, fontWeight: FontWeight.bold, ), @@ -100,7 +100,7 @@ class _MIHProfileGetterState extends State { Icon( Icons.power_off_outlined, size: 150, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), SizedBox( width: 500, @@ -109,7 +109,7 @@ class _MIHProfileGetterState extends State { textAlign: TextAlign.center, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -121,12 +121,12 @@ class _MIHProfileGetterState extends State { Navigator.of(context).popAndPushNamed("/"); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Refresh", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -143,7 +143,7 @@ class _MIHProfileGetterState extends State { textAlign: TextAlign.left, style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), 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 5b1efdf5..ca33bd45 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 @@ -139,7 +139,7 @@ class _MihBusinessHomeState extends State } EdgeInsets getPadding(double width, double height) { - if (MzanziInnovationHub.of(context)!.theme.screenType == "mobile") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "mobile") { double mobilePadding = 10; return EdgeInsets.only( left: mobilePadding, @@ -216,7 +216,7 @@ class _MihBusinessHomeState extends State // Icon( // MihIcons.mihLogo, // size: width / 2, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // const SizedBox(height: 10), // Text( @@ -226,7 +226,7 @@ class _MihBusinessHomeState extends State // style: TextStyle( // fontSize: 30, // fontWeight: FontWeight.bold, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), // const SizedBox(height: 20), @@ -238,8 +238,8 @@ class _MihBusinessHomeState extends State prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { Navigator.of(context).pushNamed( '/mzansi-ai', @@ -289,7 +289,7 @@ class _MihBusinessHomeState extends State Icon( MihIcons.mzansiAi, size: 165, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -301,7 +301,7 @@ class _MihBusinessHomeState extends State style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), 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 a9818458..d92c4e97 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 @@ -171,11 +171,11 @@ class _MihPersonalHomeState extends State appName: "Test", appIcon: Icon( Icons.warning_amber_rounded, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), iconSize: packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ) }); } @@ -183,7 +183,7 @@ class _MihPersonalHomeState extends State } EdgeInsets getPadding(double width, double height) { - if (MzanziInnovationHub.of(context)!.theme.screenType == "mobile") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "mobile") { double mobilePadding = 10; return EdgeInsets.only( left: mobilePadding, @@ -261,7 +261,7 @@ class _MihPersonalHomeState extends State // Icon( // MihIcons.mihLogo, // size: 200, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // const SizedBox(height: 10), // Text( @@ -271,7 +271,7 @@ class _MihPersonalHomeState extends State // style: TextStyle( // fontSize: 30, // fontWeight: FontWeight.bold, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), // const SizedBox(height: 20), @@ -283,8 +283,8 @@ class _MihPersonalHomeState extends State prefixIcon: Icons.search, prefixAltIcon: MihIcons.mzansiAi, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { Navigator.of(context).pushNamed( '/mzansi-ai', @@ -335,7 +335,7 @@ class _MihPersonalHomeState extends State Icon( MihIcons.mzansiAi, size: 165, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -347,7 +347,7 @@ class _MihPersonalHomeState extends State style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), 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 46075a46..efec3f7e 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 @@ -35,12 +35,12 @@ class _MzansiAiTileState extends State { appName: "Mzansi AI", appIcon: Icon( MihIcons.mzansiAi, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 0f19824f..67dfa582 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 @@ -187,21 +187,21 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.volume_up, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), label: "Read Aloud", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { _speakText(snapshot.requireData); }, @@ -222,7 +222,7 @@ class _AiChatState extends State { snapshot.requireData, textAlign: TextAlign.left, style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: _chatFrontSize, @@ -305,29 +305,29 @@ class _AiChatState extends State { ChatTheme getChatTheme() { return DarkChatTheme( - backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), inputBackgroundColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputTextColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputTextColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), inputTextCursorColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.successColor(), - errorColor: MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.successColor(), + errorColor: MzansiInnovationHub.of(context)!.theme.errorColor(), sentMessageBodyTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', ), receivedMessageBodyTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', ), emptyChatPlaceholderTextStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), fontSize: _chatFrontSize, fontWeight: FontWeight.w500, fontFamily: 'Segoe UI', @@ -350,10 +350,10 @@ class _AiChatState extends State { padding: const EdgeInsets.all(10.0), decoration: BoxDecoration( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 3.0), @@ -370,7 +370,7 @@ class _AiChatState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -385,11 +385,11 @@ class _AiChatState extends State { child: MihRadioOptions( controller: _modelController, hintText: "AI Model", - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .primaryColor(), requiredText: true, @@ -445,11 +445,11 @@ class _AiChatState extends State { style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzanziInnovationHub.of(context)! + MzansiInnovationHub.of(context)! .theme .successColor()), ), - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), iconSize: 25, @@ -474,10 +474,10 @@ class _AiChatState extends State { width: 300, child: MihNumericStepper( controller: _fontSizeController, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), hintText: "Font Size", @@ -696,10 +696,10 @@ class _AiChatState extends State { child: IconButton.filled( style: ButtonStyle( backgroundColor: WidgetStateProperty.all( - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), ), color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), iconSize: 20, onPressed: () { if (_showModelOptions.value == true) { @@ -747,17 +747,17 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.refresh, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "New Chat", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { _resetChat(); }, @@ -765,17 +765,17 @@ class _AiChatState extends State { SpeedDialChild( child: Icon( Icons.settings, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Settings", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { if (_showModelOptions.value == true) { setState(() { 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 39b69ca0..02b918c3 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 @@ -27,12 +27,12 @@ class _BuildBusinessSearchResultsListState itemCount: widget.businessList.length, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemBuilder: (context, index) { return Material( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), child: InkWell( onTap: () { Navigator.of(context).pushNamed( @@ -40,7 +40,7 @@ class _BuildBusinessSearchResultsListState arguments: widget.businessList[index], ); }, - splashColor: MzanziInnovationHub.of(context)! + splashColor: MzansiInnovationHub.of(context)! .theme .secondaryColor() .withOpacity(0.2), 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 84f7d84c..a94a839f 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 @@ -25,12 +25,12 @@ class _BuildUserSearchResultsListState itemCount: widget.userList.length, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemBuilder: (context, index) { return Material( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), child: InkWell( onTap: () { Navigator.of(context).pushNamed( @@ -38,7 +38,7 @@ class _BuildUserSearchResultsListState arguments: widget.userList[index], ); }, - splashColor: MzanziInnovationHub.of(context)! + splashColor: MzansiInnovationHub.of(context)! .theme .secondaryColor() .withOpacity(0.2), 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 f37eae32..601ef5d9 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 @@ -27,12 +27,12 @@ class _MzansiDirectoryTileState extends State { appName: "Mzansi Directory", appIcon: Icon( MihIcons.mzansiDirectory, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 22d57c0e..dccb5681 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 @@ -36,8 +36,8 @@ class _MihContactsState extends State { hintText: "Search Contacts", prefixIcon: Icons.search, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 ca16cfc3..76c53e22 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 @@ -37,8 +37,8 @@ class _MihFavouriteBusinessesState extends State { hintText: "Search Businesses", prefixIcon: Icons.search, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () {}, searchFocusNode: searchFocusNode, ), 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 3d2bda46..b36bbadf 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 @@ -85,12 +85,12 @@ class _MihSearchMzansiState extends State { Icons.display_settings, size: 35, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), )) ], fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { if (userSearch) { setState(() { @@ -169,7 +169,7 @@ class _MihSearchMzansiState extends State { MihIcons.personalProfile, size: 165, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 10), Text( @@ -180,7 +180,7 @@ class _MihSearchMzansiState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -196,7 +196,7 @@ class _MihSearchMzansiState extends State { MihIcons.iDontKnow, size: 165, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 10), Text( @@ -207,7 +207,7 @@ class _MihSearchMzansiState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -218,7 +218,7 @@ class _MihSearchMzansiState extends State { "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.errorColor()), + color: MzansiInnovationHub.of(context)!.theme.errorColor()), textAlign: TextAlign.center, ), ); @@ -260,7 +260,7 @@ class _MihSearchMzansiState extends State { MihIcons.iDontKnow, size: 165, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 10), Text( @@ -271,7 +271,7 @@ class _MihSearchMzansiState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -286,7 +286,7 @@ class _MihSearchMzansiState extends State { MihIcons.businessProfile, size: 165, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), const SizedBox(height: 10), Text( @@ -297,7 +297,7 @@ class _MihSearchMzansiState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -308,7 +308,7 @@ class _MihSearchMzansiState extends State { "Error pulling Patients Data\n/users/search/${mzansiSearchController.text}", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.errorColor()), + color: MzansiInnovationHub.of(context)!.theme.errorColor()), 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 9d7bb497..aed810a9 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 @@ -161,17 +161,17 @@ class _BuildEmployeeListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Employee", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { showDeleteWarning(index); }, @@ -182,7 +182,7 @@ class _BuildEmployeeListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -192,9 +192,9 @@ class _BuildEmployeeListState extends State { formFields: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -204,9 +204,9 @@ class _BuildEmployeeListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -258,12 +258,12 @@ class _BuildEmployeeListState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -309,7 +309,7 @@ class _BuildEmployeeListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.employees.length, @@ -327,7 +327,7 @@ class _BuildEmployeeListState extends State { subtitle: Text( "${widget.employees[index].username}\n${widget.employees[index].email}\nAccess: ${widget.employees[index].access}", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), 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 92080304..1fa85b75 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 @@ -133,7 +133,7 @@ class _BuildUserListState extends State { windowTitle: "Add Employee", windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -142,10 +142,10 @@ class _BuildUserListState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: usernameController, @@ -156,10 +156,10 @@ class _BuildUserListState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -213,14 +213,14 @@ class _BuildUserListState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -256,7 +256,7 @@ class _BuildUserListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.users.length, @@ -271,7 +271,7 @@ class _BuildUserListState extends State { subtitle: Text( "Email: ${hideEmail(widget.users[index].email)}", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () { 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 02bf1290..e3d0c840 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,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Making Call", alertBody: Column( @@ -43,7 +43,7 @@ class _MihBusinessCardState extends State { Text( "We couldn't open your phone app to call ${widget.cellNumber}. To fix this, make sure you have a phone application installed and it's set as your default dialer.", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -51,7 +51,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -85,7 +85,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Creating Email", alertBody: Column( @@ -93,7 +93,7 @@ class _MihBusinessCardState extends State { Text( "We couldn't launch your email app to send a message to ${widget.email}. To fix this, please confirm that you have an email application installed and that it's set as your default.", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -101,7 +101,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -126,7 +126,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -134,7 +134,7 @@ class _MihBusinessCardState extends State { Text( "There was an issue opening maps for ${widget.businessName}. 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -143,7 +143,7 @@ class _MihBusinessCardState extends State { ], ), alertColour: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -155,7 +155,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Creating Maps", alertBody: Column( @@ -163,7 +163,7 @@ class _MihBusinessCardState extends State { Text( "There was an issue opening maps for ${widget.businessName}. 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -171,7 +171,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -195,7 +195,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -203,7 +203,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -212,7 +212,7 @@ class _MihBusinessCardState extends State { ], ), alertColour: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -224,7 +224,7 @@ class _MihBusinessCardState extends State { alertIcon: Icon( Icons.warning_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Opening Website", alertBody: Column( @@ -232,7 +232,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15, @@ -240,7 +240,7 @@ class _MihBusinessCardState extends State { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }); } @@ -254,10 +254,10 @@ class _MihBusinessCardState extends State { Function()? ontap, ) { return Material( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), child: InkWell( onTap: ontap, - splashColor: MzanziInnovationHub.of(context)! + splashColor: MzansiInnovationHub.of(context)! .theme .primaryColor() .withOpacity(0.2), @@ -278,7 +278,7 @@ class _MihBusinessCardState extends State { child: Icon( icon, size: 35, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), ), SizedBox(width: 20), @@ -293,7 +293,7 @@ class _MihBusinessCardState extends State { style: TextStyle( fontSize: 20, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), height: 1.0, @@ -304,7 +304,7 @@ class _MihBusinessCardState extends State { style: TextStyle( fontSize: 12, fontWeight: FontWeight.w700, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), ), @@ -322,7 +322,7 @@ class _MihBusinessCardState extends State { @override Widget build(BuildContext context) { return Material( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor() .withValues(alpha: 0.6), @@ -331,7 +331,7 @@ class _MihBusinessCardState extends State { shadowColor: Colors.black, child: Container( decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), borderRadius: BorderRadius.circular(10), ), child: Column( @@ -348,7 +348,7 @@ class _MihBusinessCardState extends State { }, ), Divider( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), _buildContactInfo( "Email", @@ -365,7 +365,7 @@ class _MihBusinessCardState extends State { }, ), Divider( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), _buildContactInfo( "Location", @@ -385,7 +385,7 @@ class _MihBusinessCardState extends State { Visibility( visible: widget.website != null && widget.website! != "", child: Divider( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), ), Visibility( @@ -403,7 +403,7 @@ class _MihBusinessCardState extends State { // Padding( // padding: const EdgeInsets.symmetric(horizontal: 10.0), // child: Divider( - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // ), // ), // _buildContactInfo( @@ -419,7 +419,7 @@ class _MihBusinessCardState extends State { // Padding( // padding: const EdgeInsets.symmetric(horizontal: 10.0), // child: Divider( - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // ), // ), // _buildContactInfo( @@ -436,7 +436,7 @@ class _MihBusinessCardState extends State { // Padding( // padding: const EdgeInsets.symmetric(horizontal: 10.0), // child: Divider( - // color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.primaryColor(), // ), // ), ], 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 2d2bb147..5555eed3 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 @@ -31,12 +31,12 @@ class _MzansiBusinessProfileTileState extends State { appName: "Business Profile", appIcon: Icon( MihIcons.businessProfile, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 5bc339fd..4e905377 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 @@ -32,11 +32,11 @@ class _MzansiSetupBusinessProfileTileState appName: "Setup Business", appIcon: Icon( MihIcons.profileSetup, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 0647b4ca..82c23ea7 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 @@ -103,7 +103,7 @@ class _MihBusinessDetailsState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Updating Business Details", alertBody: Column( @@ -111,7 +111,7 @@ class _MihBusinessDetailsState extends State { Text( "An error occurred while updating the business details. Please check internet connection and try again.", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -119,7 +119,7 @@ class _MihBusinessDetailsState extends State { ], ), alertColour: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); @@ -207,7 +207,7 @@ class _MihBusinessDetailsState extends State { }, windowBody: MihSingleChildScroll( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : EdgeInsets.symmetric(horizontal: width * 0), @@ -223,10 +223,10 @@ class _MihBusinessDetailsState extends State { editable: true, fileNameController: fileNameController, userSelectedfile: imageFile, - frameColor: MzanziInnovationHub.of(context)! + frameColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - backgroundColor: MzanziInnovationHub.of(context)! + backgroundColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), onChange: (selectedfile) { @@ -239,10 +239,10 @@ class _MihBusinessDetailsState extends State { Visibility( visible: false, child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: fileNameController, @@ -254,10 +254,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 20), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: nameController, @@ -270,10 +270,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: typeController, @@ -297,10 +297,10 @@ class _MihBusinessDetailsState extends State { // ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -314,10 +314,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: contactController, @@ -330,10 +330,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: websiteController, @@ -348,10 +348,10 @@ class _MihBusinessDetailsState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: missionVisionController, @@ -395,10 +395,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: regController, @@ -411,10 +411,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: practiceNoController, @@ -428,10 +428,10 @@ class _MihBusinessDetailsState extends State { ), const SizedBox(height: 10), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: vatNoController, @@ -448,10 +448,10 @@ class _MihBusinessDetailsState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: locationController, @@ -485,14 +485,14 @@ class _MihBusinessDetailsState extends State { Navigator.of(context).pop(); }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 100, child: Text( "Set", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -513,14 +513,14 @@ class _MihBusinessDetailsState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -541,9 +541,9 @@ class _MihBusinessDetailsState extends State { Color getMissionVisionLimitColor(int limit) { if (_counter.value <= limit) { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzanziInnovationHub.of(context)!.theme.errorColor(); + return MzansiInnovationHub.of(context)!.theme.errorColor(); } } @@ -611,7 +611,7 @@ class _MihBusinessDetailsState extends State { MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -624,9 +624,9 @@ class _MihBusinessDetailsState extends State { fileNameController: fileNameController, userSelectedfile: imageFile, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (selectedfile) { setState(() { imageFile = selectedfile; @@ -640,7 +640,7 @@ class _MihBusinessDetailsState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -652,7 +652,7 @@ class _MihBusinessDetailsState extends State { // style: TextStyle( // fontSize: 15, // fontWeight: FontWeight.bold, - // color: MzanziInnovationHub.of(context)! + // color: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), // ), @@ -669,7 +669,7 @@ class _MihBusinessDetailsState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -696,12 +696,12 @@ class _MihBusinessDetailsState extends State { editBizProfileWindow(width); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Edit Profile", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -723,17 +723,17 @@ class _MihBusinessDetailsState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Profile", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 a7558b4e..b4d7271d 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 @@ -53,7 +53,7 @@ class _MihBusinessDetailsViewState extends State { MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -71,10 +71,10 @@ class _MihBusinessDetailsViewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: MzanziInnovationHub.of(context)! + frameColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - backgroundColor: MzanziInnovationHub.of(context)! + backgroundColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), onChange: () {}, @@ -83,7 +83,7 @@ class _MihBusinessDetailsViewState extends State { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ); @@ -92,7 +92,7 @@ class _MihBusinessDetailsViewState extends State { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ); @@ -106,9 +106,9 @@ class _MihBusinessDetailsViewState extends State { // fileNameController: fileNameController, // userSelectedfile: imageFile, // frameColor: - // MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // MzansiInnovationHub.of(context)!.theme.secondaryColor(), // backgroundColor: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // onChange: (selectedfile) { // setState(() { // imageFile = selectedfile; @@ -122,7 +122,7 @@ class _MihBusinessDetailsViewState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -134,7 +134,7 @@ class _MihBusinessDetailsViewState extends State { // style: TextStyle( // fontSize: 15, // fontWeight: FontWeight.bold, - // color: MzanziInnovationHub.of(context)! + // color: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), // ), @@ -151,7 +151,7 @@ class _MihBusinessDetailsViewState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), 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 14abf077..49cfbeb8 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 @@ -66,7 +66,7 @@ class _MihBusinessUserSearchState extends State { "Enter Username or Email to search", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), textAlign: TextAlign.center, ), ); @@ -105,8 +105,8 @@ class _MihBusinessUserSearchState extends State { controller: searchController, hintText: "Search Users", prefixIcon: Icons.search, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { submitUserForm(); }, @@ -144,7 +144,7 @@ class _MihBusinessUserSearchState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), 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 275fcf24..610b5a88 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 @@ -60,7 +60,7 @@ class _MihMyBusinessTeamState extends State { "", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), textAlign: TextAlign.center, ), ); @@ -106,7 +106,7 @@ class _MihMyBusinessTeamState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), 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 3116a16c..43e55009 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 @@ -128,7 +128,7 @@ class _MihMyBusinessUserState extends State { return MihPackageAlert( alertIcon: Icon( Icons.warning_rounded, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Error Updating Business User Details", alertBody: Column( @@ -136,7 +136,7 @@ class _MihMyBusinessUserState extends State { Text( "An error occurred while updating the business User details. Please check internet connection and try again.", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -144,7 +144,7 @@ class _MihMyBusinessUserState extends State { ], ), alertColour: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); @@ -215,7 +215,7 @@ class _MihMyBusinessUserState extends State { Widget getBody(double width) { return MihSingleChildScroll( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -231,9 +231,9 @@ class _MihMyBusinessUserState extends State { fileNameController: fileNameController, userSelectedfile: userPicFile, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (_) {}, ), ), @@ -241,9 +241,9 @@ class _MihMyBusinessUserState extends State { visible: false, child: MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fileNameController, multiLineInput: false, requiredText: true, @@ -266,9 +266,9 @@ class _MihMyBusinessUserState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: titleTextController, multiLineInput: false, requiredText: true, @@ -280,9 +280,9 @@ class _MihMyBusinessUserState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -295,9 +295,9 @@ class _MihMyBusinessUserState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -310,9 +310,9 @@ class _MihMyBusinessUserState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: accessController, multiLineInput: false, requiredText: true, @@ -354,9 +354,9 @@ class _MihMyBusinessUserState extends State { visible: false, child: MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fileNameController, multiLineInput: false, requiredText: true, @@ -375,12 +375,12 @@ class _MihMyBusinessUserState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 7d20fd8c..95306c6c 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 @@ -243,9 +243,9 @@ class _ProfileBusinessAddState extends State { Color getMissionVisionLimitColor(int limit) { if (_counter.value <= limit) { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzanziInnovationHub.of(context)!.theme.errorColor(); + return MzansiInnovationHub.of(context)!.theme.errorColor(); } } @@ -269,7 +269,7 @@ class _ProfileBusinessAddState extends State { child: SingleChildScrollView( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -282,7 +282,7 @@ class _ProfileBusinessAddState extends State { ), ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), @@ -290,10 +290,10 @@ class _ProfileBusinessAddState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: nameController, @@ -306,10 +306,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: typeController, @@ -333,10 +333,10 @@ class _ProfileBusinessAddState extends State { // ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: emailController, @@ -349,10 +349,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: contactController, @@ -365,10 +365,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: websiteController, @@ -383,10 +383,10 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( height: 250, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: missionVisionController, @@ -431,10 +431,10 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: regController, @@ -447,10 +447,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: practiceNoController, @@ -464,10 +464,10 @@ class _ProfileBusinessAddState extends State { const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: vatNoController, @@ -484,10 +484,10 @@ class _ProfileBusinessAddState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: locationController, @@ -519,14 +519,14 @@ class _ProfileBusinessAddState extends State { Navigator.of(context).pop(); }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 100, child: Text( "Set", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -548,7 +548,7 @@ class _ProfileBusinessAddState extends State { ), ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), @@ -565,10 +565,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: fnameController, @@ -581,10 +581,10 @@ class _ProfileBusinessAddState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: lnameController, @@ -618,14 +618,14 @@ class _ProfileBusinessAddState extends State { .formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 5a79efb5..aaa69577 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 @@ -24,7 +24,7 @@ class MzansiProfileTile extends StatefulWidget { class _MzansiProfileTileState extends State { @override Widget build(BuildContext context) { - // ImageProvider logo = MzanziInnovationHub.of(context)!.theme.logoImage(); + // ImageProvider logo = MzansiInnovationHub.of(context)!.theme.logoImage(); return MihPackageTile( onTap: () { Navigator.of(context).pushNamed( @@ -38,12 +38,12 @@ class _MzansiProfileTileState extends State { appName: "Mzansi Profile", appIcon: Icon( MihIcons.mihLogo, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 da8a90ec..45aa48d3 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 @@ -37,12 +37,12 @@ class _MzansiSetupProfileTileState extends State { appName: "Setup Profile", appIcon: Icon( MihIcons.profileSetup, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 61404c32..b335d65f 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: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Too Slow, That Username is Taken", alertBody: const Text( @@ -63,7 +63,7 @@ class _MihPersonalProfileState extends State { fontSize: 15, ), ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); @@ -189,9 +189,9 @@ class _MihPersonalProfileState extends State { Color getPurposeLimitColor(int limit) { if (_counter.value <= limit) { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzanziInnovationHub.of(context)!.theme.errorColor(); + return MzansiInnovationHub.of(context)!.theme.errorColor(); } } @@ -206,7 +206,7 @@ class _MihPersonalProfileState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : EdgeInsets.symmetric(horizontal: width * 0), child: Column( @@ -222,11 +222,11 @@ class _MihPersonalProfileState extends State { editable: true, fileNameController: proPicController, userSelectedfile: proPic, - frameColor: MzanziInnovationHub.of(context)! + frameColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (selectedImage) { setState(() { proPic = selectedImage; @@ -238,11 +238,11 @@ class _MihPersonalProfileState extends State { Visibility( visible: false, child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: proPicController, multiLineInput: false, requiredText: true, @@ -253,9 +253,9 @@ class _MihPersonalProfileState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: usernameController, multiLineInput: false, requiredText: true, @@ -267,9 +267,9 @@ class _MihPersonalProfileState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -281,9 +281,9 @@ class _MihPersonalProfileState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -296,9 +296,9 @@ class _MihPersonalProfileState extends State { MihTextFormField( height: 250, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: purposeController, multiLineInput: true, requiredText: true, @@ -343,9 +343,9 @@ class _MihPersonalProfileState extends State { hintText: "Activate Business Account", initialPostion: businessUser, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (value) { setState(() { businessUser = value; @@ -364,12 +364,12 @@ class _MihPersonalProfileState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -442,7 +442,7 @@ class _MihPersonalProfileState extends State { MihSingleChildScroll( child: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -456,9 +456,9 @@ class _MihPersonalProfileState extends State { fileNameController: proPicController, userSelectedfile: proPic, frameColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (selectedImage) { setState(() { proPic = selectedImage; @@ -474,7 +474,7 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 35, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -488,7 +488,7 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -500,7 +500,7 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -518,7 +518,7 @@ class _MihPersonalProfileState extends State { style: TextStyle( fontSize: 15, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -533,14 +533,14 @@ class _MihPersonalProfileState extends State { editProfileWindow(width); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( widget.arguments.signedInUser.username.isEmpty ? "Set Up Profile" : "Edit Profile", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -562,17 +562,17 @@ class _MihPersonalProfileState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Profile", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 8f0822f5..da26939c 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 @@ -49,7 +49,7 @@ class _MihPersonalProfileViewState extends State { double profilePictureWidth = 150; return MihSingleChildScroll( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -67,10 +67,10 @@ class _MihPersonalProfileViewState extends State { editable: false, fileNameController: TextEditingController(), userSelectedfile: file, - frameColor: MzanziInnovationHub.of(context)! + frameColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - backgroundColor: MzanziInnovationHub.of(context)! + backgroundColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), onChange: () {}, @@ -79,7 +79,7 @@ class _MihPersonalProfileViewState extends State { return Icon( MihIcons.iDontKnow, size: profilePictureWidth, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ); @@ -88,7 +88,7 @@ class _MihPersonalProfileViewState extends State { return Icon( MihIcons.mihRing, size: profilePictureWidth, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ); @@ -100,11 +100,11 @@ class _MihPersonalProfileViewState extends State { // editable: false, // fileNameController: proPicController, // userSelectedfile: proPic, - // frameColor: MzanziInnovationHub.of(context)! + // frameColor: MzansiInnovationHub.of(context)! // .theme // .secondaryColor(), // backgroundColor: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // onChange: (selectedImage) { // setState(() { // proPic = selectedImage; @@ -122,7 +122,7 @@ class _MihPersonalProfileViewState extends State { fontSize: 35, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -135,7 +135,7 @@ class _MihPersonalProfileViewState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -146,7 +146,7 @@ class _MihPersonalProfileViewState extends State { fontSize: 15, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -163,7 +163,7 @@ class _MihPersonalProfileViewState extends State { fontSize: 15, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -175,7 +175,7 @@ class _MihPersonalProfileViewState extends State { // // Connect with the user // }, // buttonColor: - // MzanziInnovationHub.of(context)!.theme.successColor(), + // MzansiInnovationHub.of(context)!.theme.successColor(), // width: 300, // child: Text( // widget.user.username.isEmpty @@ -183,7 +183,7 @@ class _MihPersonalProfileViewState extends State { // : "Edit Profile", // style: TextStyle( // color: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // 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 5b07cc0a..a14d7877 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 @@ -38,7 +38,7 @@ class _MihPersonalSettingsState extends State { alertIcon: Icon( Icons.warning_amber_rounded, size: 100, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Are you sure you want to permanently delete your MIH account?", @@ -49,7 +49,7 @@ class _MihPersonalSettingsState extends State { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -65,12 +65,12 @@ class _MihPersonalSettingsState extends State { widget.signedInUser.app_id, context); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -83,12 +83,12 @@ class _MihPersonalSettingsState extends State { Navigator.pop(context); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Cancel", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -100,7 +100,7 @@ class _MihPersonalSettingsState extends State { ) ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); @@ -113,7 +113,7 @@ class _MihPersonalSettingsState extends State { Center( child: FaIcon( FontAwesomeIcons.trashCan, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), size: 150, ), ), @@ -124,7 +124,7 @@ class _MihPersonalSettingsState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox(height: 10.0), @@ -132,12 +132,12 @@ class _MihPersonalSettingsState extends State { onPressed: () { deleteAccountPopUp(context); }, - buttonColor: MzanziInnovationHub.of(context)!.theme.errorColor(), + buttonColor: MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete Account", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 b4855643..7a1640d6 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 @@ -63,7 +63,7 @@ class _BuildLoyaltyCardListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : EdgeInsets.symmetric(horizontal: width * 0), child: Column( @@ -73,9 +73,9 @@ class _BuildLoyaltyCardListState extends State { formFields: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _nicknameController, multiLineInput: false, requiredText: false, @@ -89,10 +89,10 @@ class _BuildLoyaltyCardListState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: _cardNumberController, @@ -110,14 +110,14 @@ class _BuildLoyaltyCardListState extends State { onPressed: () { openscanner(); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 100, child: Text( "Scan", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -147,12 +147,12 @@ class _BuildLoyaltyCardListState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -195,10 +195,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MzanziInnovationHub.of(context)!.theme.successColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.successColor(), alertIcon: Icon( Icons.favorite, - color: MzanziInnovationHub.of(context)!.theme.successColor(), + color: MzansiInnovationHub.of(context)!.theme.successColor(), size: 100, ), alertTitle: "Add to Favourites", @@ -209,7 +209,7 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 20, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox( @@ -229,13 +229,13 @@ class _BuildLoyaltyCardListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -254,10 +254,10 @@ class _BuildLoyaltyCardListState extends State { barrierDismissible: false, builder: (context) { return MihPackageAlert( - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), alertIcon: Icon( Icons.favorite_border, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 100, ), alertTitle: "Remove From Favourites", @@ -268,7 +268,7 @@ class _BuildLoyaltyCardListState extends State { style: TextStyle( fontSize: 20, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox( @@ -288,13 +288,13 @@ class _BuildLoyaltyCardListState extends State { ); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Remove", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -328,24 +328,24 @@ class _BuildLoyaltyCardListState extends State { ? Icon( Icons.favorite, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ) : Icon( Icons.favorite_border, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: widget.cardList[index].favourite == "" ? "Add to Favourite" : "Remove from Favourite", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { if (widget.cardList[index].favourite == "") { addToFavCardWindow(context, index); @@ -357,17 +357,17 @@ class _BuildLoyaltyCardListState extends State { SpeedDialChild( child: Icon( Icons.edit, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Card Details", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { setState(() { _cardNumberController.text = widget.cardList[index].card_number; @@ -379,17 +379,17 @@ class _BuildLoyaltyCardListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Card", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deleteCardWindow(context, index); }, @@ -427,7 +427,7 @@ class _BuildLoyaltyCardListState extends State { height: 75, // width: 300, child: BarcodeWidget( - //color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + //color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), barcode: Barcode.code128(), backgroundColor: Colors.white, data: widget.cardList[index].card_number, @@ -449,7 +449,7 @@ class _BuildLoyaltyCardListState extends State { color: Colors.black, fontSize: 25, fontWeight: FontWeight.bold - //MzanziInnovationHub.of(context)!.theme.secondaryColor(), + //MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -465,7 +465,7 @@ class _BuildLoyaltyCardListState extends State { } double getHorizontalPaddingSize(Size screenSize) { - if (MzanziInnovationHub.of(context)!.theme.screenType == "desktop") { + if (MzansiInnovationHub.of(context)!.theme.screenType == "desktop") { return screenSize.width / 10; } else { return 20; @@ -531,7 +531,7 @@ class _BuildLoyaltyCardListState extends State { // physics: const NeverScrollableScrollPhysics(), // separatorBuilder: (BuildContext context, int index) { // return Divider( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ); // }, // itemCount: widget.cardList.length, 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 0daaa88d..0e6abcc6 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 @@ -105,7 +105,7 @@ class _MihBarcodeScannerState extends State decoration: BoxDecoration( border: Border.all( width: 5, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -126,13 +126,13 @@ class _MihBarcodeScannerState extends State Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 100, height: 50, child: Text( "Cancel", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 e8c9df87..fbdbddad 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 @@ -32,12 +32,12 @@ class _MihWalletTileState extends State { appName: "Mzansi Wallet", appIcon: Icon( MihIcons.mzansiWallet, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 4327d6e3..97f909a4 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 @@ -90,18 +90,18 @@ class _MihCardFavouritesState extends State { // child: Icon( // Icons.add, // color: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // ), // label: "Add Loyalty Card", // labelBackgroundColor: - // MzanziInnovationHub.of(context)!.theme.successColor(), + // MzansiInnovationHub.of(context)!.theme.successColor(), // labelStyle: TextStyle( // color: - // MzanziInnovationHub.of(context)!.theme.primaryColor(), + // MzansiInnovationHub.of(context)!.theme.primaryColor(), // fontWeight: FontWeight.bold, // ), // backgroundColor: - // MzanziInnovationHub.of(context)!.theme.successColor(), + // MzansiInnovationHub.of(context)!.theme.successColor(), // 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 f9511f04..cb8fbdcf 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 @@ -102,7 +102,7 @@ class _MihCardsState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : EdgeInsets.symmetric(horizontal: width * 0), child: Column( @@ -187,9 +187,9 @@ class _MihCardsState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _nicknameController, multiLineInput: false, requiredText: false, @@ -203,10 +203,10 @@ class _MihCardsState extends State { children: [ Flexible( child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: cardNumberController, @@ -224,14 +224,14 @@ class _MihCardsState extends State { onPressed: () { openscanner(); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 100, child: Text( "Scan", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -272,12 +272,12 @@ class _MihCardsState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -341,9 +341,9 @@ class _MihCardsState extends State { // prefixIcon: Icons.search, prefixIcon: Icons.search, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), hintColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { // print("Search Icon Pressed: ${cardSearchController.text}"); }, @@ -400,18 +400,18 @@ class _MihCardsState extends State { child: Icon( Icons.add, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Loyalty Card", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 f76c5fd3..94aac274 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 @@ -222,8 +222,8 @@ class _BuildPatientsListState extends State { children: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -236,8 +236,8 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -250,8 +250,8 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -264,8 +264,8 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: accessStatusController, multiLineInput: false, requiredText: true, @@ -287,7 +287,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), Text( @@ -295,7 +295,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), SizedBox( @@ -305,7 +305,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), ), @@ -316,7 +316,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), ), @@ -327,7 +327,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.normal, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), ), @@ -336,7 +336,7 @@ class _BuildPatientsListState extends State { style: TextStyle( fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), ), ), ], @@ -369,14 +369,14 @@ class _BuildPatientsListState extends State { noAccessWarning(); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "View Profile", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -405,14 +405,14 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Request Access", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -439,14 +439,14 @@ class _BuildPatientsListState extends State { context, ); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Re-apply", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -488,7 +488,7 @@ class _BuildPatientsListState extends State { Text( "$firstLetterFName$fnameStar $firstLetterLName$lnameStar", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), const SizedBox( @@ -496,7 +496,7 @@ class _BuildPatientsListState extends State { ), Icon( Icons.star_border_rounded, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ], ); @@ -504,7 +504,7 @@ class _BuildPatientsListState extends State { return Text( "$firstLetterFName$fnameStar $firstLetterLName$lnameStar", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ); } @@ -518,7 +518,7 @@ class _BuildPatientsListState extends State { subtitle: Text( "ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: $medAidNoStar", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () { @@ -533,7 +533,7 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ); } else { @@ -542,7 +542,7 @@ class _BuildPatientsListState extends State { subtitle: Text( "ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: $medAidNoStar", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () { @@ -556,7 +556,7 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.add, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ); } @@ -580,7 +580,7 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 44ad3c78..3ca74ae4 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 @@ -99,7 +99,7 @@ class _BuildPatientsListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.056) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -109,9 +109,9 @@ class _BuildPatientsListState extends State { formFields: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -124,9 +124,9 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -139,9 +139,9 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -191,12 +191,12 @@ class _BuildPatientsListState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Book Appointment", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -263,16 +263,16 @@ class _BuildPatientsListState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( children: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -285,9 +285,9 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -300,9 +300,9 @@ class _BuildPatientsListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -323,12 +323,12 @@ class _BuildPatientsListState extends State { appointmentPopUp(index, width); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Book Appointment", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -348,14 +348,14 @@ class _BuildPatientsListState extends State { "business", )); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), width: 300, child: Text( "View Medical Records", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -387,7 +387,7 @@ class _BuildPatientsListState extends State { accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.successColor())); + color: MzansiInnovationHub.of(context)!.theme.successColor())); } else if (access == "PENDING") { firstName = "${widget.patientAccesses[index].fname[0]}********"; lastName = "${widget.patientAccesses[index].lname[0]}********"; @@ -395,21 +395,21 @@ class _BuildPatientsListState extends State { text: "$access\n", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.messageTextColor())); + MzansiInnovationHub.of(context)!.theme.messageTextColor())); } else { firstName = "${widget.patientAccesses[index].fname[0]}********"; lastName = "${widget.patientAccesses[index].lname[0]}********"; accessWithColour = TextSpan( text: "$access\n", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.errorColor())); + color: MzansiInnovationHub.of(context)!.theme.errorColor())); } return ListTile( title: Text( "$firstName $lastName", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -438,7 +438,7 @@ class _BuildPatientsListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ); } @@ -461,7 +461,7 @@ class _BuildPatientsListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 c0273ddb..21d51183 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 @@ -30,12 +30,12 @@ class _PatManagerTileState extends State { appName: "Patient Manager", appIcon: Icon( MihIcons.patientManager, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 b3c83ec3..7f362826 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 @@ -48,8 +48,8 @@ class _MihPatientSearchState extends State { controller: _mihPatientSearchController, hintText: "Search Patient ID/ Aid No.", prefixIcon: Icons.search, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { submitPatientSearch(); }, @@ -91,7 +91,7 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), textAlign: TextAlign.center, ), ); @@ -133,7 +133,7 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.messageTextColor()), + MzansiInnovationHub.of(context)!.theme.messageTextColor()), textAlign: TextAlign.center, ), ), @@ -147,7 +147,7 @@ class _MihPatientSearchState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.messageTextColor()), + MzansiInnovationHub.of(context)!.theme.messageTextColor()), 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 e0e9a789..b5898c15 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 @@ -49,8 +49,8 @@ class _MyPatientListState extends State { controller: _myPatientSearchController, hintText: "Search Patient ID", prefixIcon: Icons.search, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - hintColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + hintColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { setState(() { _myPatientIdSearchString = _myPatientSearchController.text; @@ -94,7 +94,7 @@ class _MyPatientListState extends State { style: TextStyle( fontSize: 25, color: - MzanziInnovationHub.of(context)!.theme.errorColor()), + MzansiInnovationHub.of(context)!.theme.errorColor()), textAlign: TextAlign.center, ), ); @@ -121,7 +121,7 @@ class _MyPatientListState extends State { "No Patients matching search", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor()), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor()), 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 33ec8662..8affdaee 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 @@ -80,7 +80,7 @@ class _WaitingRoomState extends State { }); }), // Divider( - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), Row( mainAxisSize: MainAxisSize.max, @@ -104,7 +104,7 @@ class _WaitingRoomState extends State { "Error pulling appointments", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor()), textAlign: TextAlign.center, @@ -127,17 +127,17 @@ class _WaitingRoomState extends State { SpeedDialChild( child: Icon( Icons.add, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Appointment", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { // addAppointmentWindow(); appointmentTypeSelection(width); @@ -177,7 +177,7 @@ class _WaitingRoomState extends State { "No Appointments for $selectedDay", style: TextStyle( fontSize: 25, - color: MzanziInnovationHub.of(context)!.theme.messageTextColor(), + color: MzansiInnovationHub.of(context)!.theme.messageTextColor(), ), textAlign: TextAlign.center, softWrap: true, @@ -211,7 +211,7 @@ class _WaitingRoomState extends State { question, style: TextStyle( fontSize: 20, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), textAlign: TextAlign.left, @@ -223,13 +223,13 @@ class _WaitingRoomState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Existing Patient", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -242,13 +242,13 @@ class _WaitingRoomState extends State { Navigator.of(context).pop(); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Existing MIH User", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -261,13 +261,13 @@ class _WaitingRoomState extends State { addAppointmentWindow(width); }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Skeleton Appointment", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -298,7 +298,7 @@ class _WaitingRoomState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -307,11 +307,11 @@ class _WaitingRoomState extends State { formKey: _formKey, formFields: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _appointmentTitleController, multiLineInput: false, requiredText: true, @@ -341,11 +341,11 @@ class _WaitingRoomState extends State { const SizedBox(height: 10), MihTextFormField( height: 250, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _appointmentDescriptionIDController, multiLineInput: true, requiredText: true, @@ -364,14 +364,14 @@ class _WaitingRoomState extends State { MihAlertServices().formNotFilledCompletely(context); } }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 e2483119..a3fd7343 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 @@ -90,7 +90,7 @@ class _AddOrViewPatientState extends State { loading = Container( width: width, height: height, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 e5e3b2a7..89e867dd 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 @@ -83,7 +83,7 @@ class _ClaimStatementWindowState extends State { Widget getWindowBody(double width) { return Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -95,9 +95,9 @@ class _ClaimStatementWindowState extends State { controller: _docTypeController, hintText: "Document Type", fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), requiredText: true, radioOptions: const ["Claim", "Statement"], ), @@ -110,13 +110,13 @@ class _ClaimStatementWindowState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), Divider( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor()), + MzansiInnovationHub.of(context)!.theme.secondaryColor()), const SizedBox(height: 10), MihDateField( controller: _serviceDateController, @@ -131,9 +131,9 @@ class _ClaimStatementWindowState extends State { controller: _serviceDescController, hintText: "Serviced Description", fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), requiredText: true, radioOptions: const [ "Consultation", @@ -155,10 +155,10 @@ class _ClaimStatementWindowState extends State { key: const ValueKey('consultation_type_dropdown'), controller: _serviceDescOptionsController, hintText: "Consultation Type", - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - secondaryFillColor: MzanziInnovationHub.of(context)! + secondaryFillColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), requiredText: true, @@ -180,10 +180,10 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'procedure_name_field'), // Added key - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: _prcedureNameController, @@ -198,10 +198,10 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'procedure_additional_info_field'), // Added key - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: _proceedureAdditionalInfoController, @@ -223,10 +223,10 @@ class _ClaimStatementWindowState extends State { MihTextFormField( key: const ValueKey( 'other_service_description_field'), // Added key - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: _serviceDescOptionsController, @@ -256,7 +256,7 @@ class _ClaimStatementWindowState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), )), @@ -267,9 +267,9 @@ class _ClaimStatementWindowState extends State { hintText: "ICD-10 Search", prefixIcon: Icons.search, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), hintColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { MIHIcd10CodeApis.getIcd10Codes( _icd10CodeController.text, context) @@ -287,9 +287,9 @@ class _ClaimStatementWindowState extends State { const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _amountController, multiLineInput: false, requiredText: true, @@ -308,19 +308,19 @@ class _ClaimStatementWindowState extends State { fontSize: 25, fontWeight: FontWeight.bold, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), Divider( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor()), + MzansiInnovationHub.of(context)!.theme.secondaryColor()), const SizedBox(height: 10), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: _preauthNoController, multiLineInput: false, requiredText: false, @@ -384,13 +384,13 @@ class _ClaimStatementWindowState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Generate", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 dce41b9e..7e3ee1ba 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 @@ -123,7 +123,7 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.arrow_back, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -150,7 +150,7 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.arrow_forward, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -173,7 +173,7 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.zoom_in, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -198,7 +198,7 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.zoom_out, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ), @@ -210,14 +210,14 @@ class _FullScreenFileViewerState extends State { // }, // icon: Icon( // Icons.print, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), // ), IconButton( iconSize: 30, padding: const EdgeInsets.all(0), onPressed: () { - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") { + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open( widget.arguments.link, // '${AppEnviroment.baseFileUrl}/mih/$filePath', @@ -230,7 +230,7 @@ class _FullScreenFileViewerState extends State { }, icon: Icon( Icons.download, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), ], @@ -246,7 +246,7 @@ class _FullScreenFileViewerState extends State { child: SfPdfViewerTheme( data: SfPdfViewerThemeData( backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), 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 e851737f..842cd8e2 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 @@ -24,8 +24,8 @@ class _ICD10SearchWindowState extends State { return Column( children: [ MihTextFormField( - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: widget.icd10CodeController, multiLineInput: false, requiredText: true, @@ -39,12 +39,12 @@ class _ICD10SearchWindowState extends State { Text( "Search for ICD-10 Codes", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 25, fontWeight: FontWeight.bold, ), ), - Divider(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()), + Divider(color: MzansiInnovationHub.of(context)!.theme.secondaryColor()), 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 255165cf..d637be0b 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 @@ -360,7 +360,7 @@ class _PrescripInputState extends State { style: TextStyle( fontSize: 18, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -372,9 +372,9 @@ class _PrescripInputState extends State { hintText: "Search Medicine", prefixIcon: Icons.search, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), hintColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onPrefixIconTap: () { getMedsPopUp(widget.medicineController); }, @@ -389,8 +389,8 @@ class _PrescripInputState extends State { MihNumericStepper( controller: widget.dosageController, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), hintText: "Dosage", requiredText: true, minValue: 1, @@ -401,8 +401,8 @@ class _PrescripInputState extends State { MihNumericStepper( controller: widget.timesDailyController, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), hintText: "Times Daily", requiredText: true, minValue: 1, @@ -413,8 +413,8 @@ class _PrescripInputState extends State { MihNumericStepper( controller: widget.noDaysController, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), hintText: "No. Days", requiredText: true, minValue: 1, @@ -425,8 +425,8 @@ class _PrescripInputState extends State { MihNumericStepper( controller: widget.noRepeatsController, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), hintText: "No.Repeats", requiredText: true, minValue: 0, @@ -462,13 +462,13 @@ class _PrescripInputState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 300, child: Text( "Add", style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontSize: 20, fontWeight: FontWeight.bold, ), @@ -488,10 +488,10 @@ class _PrescripInputState extends State { width: 550, height: 325, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 3.0), ), child: ListView.separated( @@ -509,14 +509,14 @@ class _PrescripInputState extends State { getPerscTitle(index), style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( getPerscSubtitle(index), style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), //onTap: () {}, @@ -524,7 +524,7 @@ class _PrescripInputState extends State { icon: Icon( Icons.delete_forever_outlined, color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), onPressed: () { setState(() { @@ -552,12 +552,12 @@ class _PrescripInputState extends State { ); } }, - buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(), + buttonColor: MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Generate", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), 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 1d05cea5..858ba93e 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 @@ -158,18 +158,18 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.download, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Download", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") { + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); } else { nativeFileDownload(url); @@ -181,16 +181,16 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.print, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Print", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { printDocument(url, filePath); }, @@ -200,16 +200,16 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.fullscreen, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Full Screen", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { printDocument(url, filePath); }, @@ -221,17 +221,17 @@ class _BuildClaimStatementFileListState SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Document", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deleteFilePopUp(filePath, fileID); }, @@ -308,7 +308,7 @@ class _BuildClaimStatementFileListState physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.files.length, @@ -317,18 +317,18 @@ class _BuildClaimStatementFileListState title: Text( widget.files[index].file_name, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( widget.files[index].insert_date, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), // trailing: Icon( // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), onTap: () async { await getFileUrlApiCall(widget.files[index].file_path) 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 d703cc6d..bbc972d5 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 @@ -119,7 +119,7 @@ class _BuildFileViewState extends State { child: SfPdfViewerTheme( data: SfPdfViewerThemeData( backgroundColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), 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 070a4e9a..c24ea631 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 @@ -208,18 +208,18 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.download, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Download", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { - if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "Web") { + if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Web") { html.window.open(url, 'download'); } else { nativeFileDownload(url); @@ -232,17 +232,17 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.print, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Print", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { printDocument(url, filePath); }, @@ -253,16 +253,16 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.fullscreen, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Full Screen", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), - backgroundColor: MzanziInnovationHub.of(context)!.theme.successColor(), + backgroundColor: MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { Navigator.of(context).pushNamed( '/file-veiwer', @@ -280,17 +280,17 @@ class _BuildFilesListState extends State { SpeedDialChild( child: Icon( Icons.delete, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Document", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deleteFilePopUp(filePath, fileID); }, @@ -359,7 +359,7 @@ class _BuildFilesListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.files.length, @@ -368,18 +368,18 @@ class _BuildFilesListState extends State { title: Text( widget.files[index].file_name, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( widget.files[index].insert_date, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), // trailing: Icon( // Icons.arrow_forward, - // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + // color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // ), onTap: () async { await getFileUrlApiCall(widget.files[index].file_path) 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 425adf7c..b531ff41 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 @@ -29,7 +29,7 @@ class _BuildPatientsListState extends State { title: Text( title, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: RichText( @@ -61,7 +61,7 @@ class _BuildPatientsListState extends State { shrinkWrap: true, separatorBuilder: (BuildContext context, index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, 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 531157b5..c90bdc22 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 @@ -32,7 +32,7 @@ class _BuildMedicinesListState extends State { return ListView.separated( separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.medicines.length, @@ -42,13 +42,13 @@ class _BuildMedicinesListState extends State { title: Text( widget.medicines[index].name, style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( "${widget.medicines[index].unit} - ${widget.medicines[index].form}", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), onTap: () { @@ -60,7 +60,7 @@ class _BuildMedicinesListState extends State { }, trailing: Icon( Icons.arrow_forward, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ); }, 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 e9244b01..da33b4e8 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 @@ -145,18 +145,18 @@ class _BuildNotesListState extends State { child: Icon( Icons.delete, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Delete Note", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { deletePatientPopUp(selectednote.idpatient_notes); }, @@ -171,8 +171,8 @@ class _BuildNotesListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: businessNameController, multiLineInput: false, requiredText: true, @@ -182,8 +182,8 @@ class _BuildNotesListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: userNameController, multiLineInput: false, requiredText: true, @@ -193,8 +193,8 @@ class _BuildNotesListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: dateController, multiLineInput: false, requiredText: true, @@ -204,8 +204,8 @@ class _BuildNotesListState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: noteTitleController, multiLineInput: false, requiredText: true, @@ -216,8 +216,8 @@ class _BuildNotesListState extends State { MihTextFormField( height: 250, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: noteTextController, multiLineInput: true, requiredText: true, @@ -248,7 +248,7 @@ class _BuildNotesListState extends State { physics: const NeverScrollableScrollPhysics(), separatorBuilder: (BuildContext context, int index) { return Divider( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ); }, itemCount: widget.notes.length, @@ -261,18 +261,18 @@ class _BuildNotesListState extends State { title: Text( "${widget.notes[index].note_name}\n${widget.notes[index].doc_office} - ${widget.notes[index].doctor}", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), subtitle: Text( "${widget.notes[index].insert_date}:\n$notePreview", style: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), ), //Text(widget.notes[index].note_text), trailing: Icon( Icons.arrow_forward, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), ), onTap: () { viewNotePopUp(widget.notes[index]); 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 659cdbdd..d377a7a0 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 @@ -31,12 +31,12 @@ class _PatientProfileTileState extends State { appName: "Patient Profile", appIcon: Icon( MihIcons.patientProfile, - color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + color: MzansiInnovationHub.of(context)!.theme.secondaryColor(), // size: widget.packageSize, ), iconSize: widget.packageSize, - primaryColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - secondaryColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + primaryColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + secondaryColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), ); } } 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 8d46a8a0..121b76e0 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,18 +127,18 @@ class _PatientClaimOrStatementState extends State { child: Icon( Icons.add, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Claim/ Statement", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 991de788..73be9846 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 @@ -97,7 +97,7 @@ class _PatientConsultationState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -107,9 +107,9 @@ class _PatientConsultationState extends State { formFields: [ MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: officeController, multiLineInput: false, requiredText: true, @@ -119,9 +119,9 @@ class _PatientConsultationState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: doctorController, multiLineInput: false, requiredText: true, @@ -131,9 +131,9 @@ class _PatientConsultationState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: dateController, multiLineInput: false, requiredText: true, @@ -143,9 +143,9 @@ class _PatientConsultationState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: titleController, multiLineInput: false, requiredText: true, @@ -158,9 +158,9 @@ class _PatientConsultationState extends State { MihTextFormField( height: 250, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: noteTextController, multiLineInput: true, requiredText: true, @@ -211,12 +211,12 @@ class _PatientConsultationState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add Note", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -278,9 +278,9 @@ class _PatientConsultationState extends State { Color getNoteDetailLimitColor() { if (_counter.value <= 512) { - return MzanziInnovationHub.of(context)!.theme.secondaryColor(); + return MzansiInnovationHub.of(context)!.theme.secondaryColor(); } else { - return MzanziInnovationHub.of(context)!.theme.errorColor(); + return MzansiInnovationHub.of(context)!.theme.errorColor(); } } @@ -379,18 +379,18 @@ class _PatientConsultationState extends State { child: Icon( Icons.add, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Note", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 45b80bb8..914e9e80 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 @@ -234,7 +234,7 @@ class _PatientDocumentsState extends State { }, windowBody: Padding( padding: - MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.05) : const EdgeInsets.symmetric(horizontal: 0), child: Column( @@ -248,10 +248,10 @@ class _PatientDocumentsState extends State { children: [ Expanded( child: MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: selectedFileController, @@ -282,13 +282,13 @@ class _PatientDocumentsState extends State { selectedFileController.text = selectedFile.name; }); }, - buttonColor: MzanziInnovationHub.of(context)! + buttonColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), child: Text( "Attach", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -311,12 +311,12 @@ class _PatientDocumentsState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add File", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -392,12 +392,12 @@ class _PatientDocumentsState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Generate", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -482,17 +482,17 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.attach_file, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Attach Document", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { uploudFilePopUp(width); }, @@ -511,17 +511,17 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.attach_file, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Add Document", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { uploudFilePopUp(width); }, @@ -529,17 +529,17 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.sick_outlined, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Medical Certificate", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), onTap: () { medCertPopUp(); }, @@ -547,17 +547,17 @@ class _PatientDocumentsState extends State { SpeedDialChild( child: Icon( Icons.medication, - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Generate Prescription", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 3dcc10e0..6ee31cd5 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,8 +55,8 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -72,8 +72,8 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -86,8 +86,8 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -100,8 +100,8 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: cellController, multiLineInput: false, requiredText: true, @@ -114,8 +114,8 @@ class _PatientInfoState extends State { child: MihTextFormField( // width: textFieldWidth, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: emailController, multiLineInput: false, requiredText: true, @@ -129,8 +129,8 @@ class _PatientInfoState extends State { // width: textFieldWidth, height: 100, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: addressController, multiLineInput: true, requiredText: true, @@ -151,9 +151,9 @@ class _PatientInfoState extends State { child: MihToggle( hintText: "Medical Aid", initialPostion: medAidPosition, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), readOnly: true, onChange: (value) { if (value) { @@ -171,8 +171,8 @@ class _PatientInfoState extends State { ), // MihTextFormField( // // width: textFieldWidth, - // fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - // inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + // fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + // inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), // controller: medAidController, // multiLineInput: false, // requiredText: true, @@ -194,8 +194,8 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: medMainMemController, multiLineInput: false, requiredText: true, @@ -210,8 +210,8 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: medNoController, multiLineInput: false, requiredText: true, @@ -226,8 +226,8 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: medAidCodeController, multiLineInput: false, requiredText: true, @@ -242,8 +242,8 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: medNameController, multiLineInput: false, requiredText: true, @@ -258,8 +258,8 @@ class _PatientInfoState extends State { width: textFieldWidth, child: MihTextFormField( // width: textFieldWidth, - fillColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(), - inputColor: MzanziInnovationHub.of(context)!.theme.primaryColor(), + fillColor: MzansiInnovationHub.of(context)!.theme.secondaryColor(), + inputColor: MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: medSchemeController, multiLineInput: false, requiredText: true, @@ -361,14 +361,14 @@ class _PatientInfoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), ), ]), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10), @@ -381,14 +381,14 @@ class _PatientInfoState extends State { style: TextStyle( fontSize: 25, fontWeight: FontWeight.bold, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), ), ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10), @@ -411,18 +411,18 @@ class _PatientInfoState extends State { child: Icon( Icons.edit, color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), ), label: "Edit Profile", labelBackgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), labelStyle: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), fontWeight: FontWeight.bold, ), backgroundColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), 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 a35c3a59..387666f9 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 @@ -166,7 +166,7 @@ class _AddPatientState extends State { Widget displayForm(double width) { return SingleChildScrollView( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -183,7 +183,7 @@ class _AddPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -191,15 +191,15 @@ class _AddPatientState extends State { ], ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -211,9 +211,9 @@ class _AddPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -225,9 +225,9 @@ class _AddPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -239,9 +239,9 @@ class _AddPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: cellController, multiLineInput: false, requiredText: true, @@ -253,9 +253,9 @@ class _AddPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: emailController, multiLineInput: false, requiredText: true, @@ -269,9 +269,9 @@ class _AddPatientState extends State { MihTextFormField( height: 100, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: addressController, multiLineInput: true, requiredText: true, @@ -288,14 +288,14 @@ class _AddPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), ), ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), @@ -303,9 +303,9 @@ class _AddPatientState extends State { hintText: "Medical Aid", initialPostion: medAidPosition, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (value) { if (value) { setState(() { @@ -331,10 +331,10 @@ class _AddPatientState extends State { MihToggle( hintText: "Main Member", initialPostion: medMainMemberPosition, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - secondaryFillColor: MzanziInnovationHub.of(context)! + secondaryFillColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), onChange: (value) { @@ -353,10 +353,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medNoController, @@ -373,10 +373,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medAidCodeController, @@ -393,10 +393,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medNameController, @@ -413,10 +413,10 @@ class _AddPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medSchemeController, @@ -448,12 +448,12 @@ class _AddPatientState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Add", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, 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 89611c52..66952acc 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 @@ -202,11 +202,11 @@ class _EditPatientState extends State { width: 700.0, height: (height / 3) * 2, decoration: BoxDecoration( - color: MzanziInnovationHub.of(context)!.theme.primaryColor(), + color: MzansiInnovationHub.of(context)!.theme.primaryColor(), borderRadius: BorderRadius.circular(25.0), border: Border.all( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), width: 5.0), ), child: SingleChildScrollView( @@ -216,7 +216,7 @@ class _EditPatientState extends State { Icon( Icons.warning_amber_rounded, size: 100, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -225,7 +225,7 @@ class _EditPatientState extends State { "Are you sure you want to delete this?", textAlign: TextAlign.center, style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 25.0, @@ -238,7 +238,7 @@ 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: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15.0, @@ -252,7 +252,7 @@ class _EditPatientState extends State { child: Text( "Here's what you'll be deleting:", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 20.0, @@ -269,7 +269,7 @@ class _EditPatientState extends State { "1) Patient Profile Information.\n2) Patient Notes\n3) Patient Files.", textAlign: TextAlign.left, style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), fontSize: 15.0, @@ -281,12 +281,12 @@ class _EditPatientState extends State { MihButton( onPressed: deletePatientApiCall, buttonColor: - MzanziInnovationHub.of(context)!.theme.errorColor(), + MzansiInnovationHub.of(context)!.theme.errorColor(), width: 300, child: Text( "Delete", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, @@ -309,7 +309,7 @@ class _EditPatientState extends State { }, icon: Icon( Icons.close, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), size: 35, ), ), @@ -379,7 +379,7 @@ class _EditPatientState extends State { Widget displayForm(double width) { return SingleChildScrollView( child: Padding( - padding: MzanziInnovationHub.of(context)!.theme.screenType == "desktop" + padding: MzansiInnovationHub.of(context)!.theme.screenType == "desktop" ? EdgeInsets.symmetric(horizontal: width * 0.2) : EdgeInsets.symmetric(horizontal: width * 0.075), child: Column( @@ -396,7 +396,7 @@ class _EditPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), @@ -404,15 +404,15 @@ class _EditPatientState extends State { ], ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: idController, multiLineInput: false, requiredText: true, @@ -424,9 +424,9 @@ class _EditPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: fnameController, multiLineInput: false, requiredText: true, @@ -438,9 +438,9 @@ class _EditPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: lnameController, multiLineInput: false, requiredText: true, @@ -452,9 +452,9 @@ class _EditPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: cellController, multiLineInput: false, requiredText: true, @@ -466,9 +466,9 @@ class _EditPatientState extends State { const SizedBox(height: 10.0), MihTextFormField( fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: emailController, multiLineInput: false, requiredText: true, @@ -482,9 +482,9 @@ class _EditPatientState extends State { MihTextFormField( height: 100, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), inputColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), controller: addressController, multiLineInput: true, requiredText: true, @@ -501,14 +501,14 @@ class _EditPatientState extends State { style: TextStyle( fontWeight: FontWeight.bold, fontSize: 25.0, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor(), ), ), ), Divider( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .secondaryColor()), const SizedBox(height: 10.0), @@ -516,9 +516,9 @@ class _EditPatientState extends State { hintText: "Medical Aid", initialPostion: medAidPosition, fillColor: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), secondaryFillColor: - MzanziInnovationHub.of(context)!.theme.primaryColor(), + MzansiInnovationHub.of(context)!.theme.primaryColor(), onChange: (value) { if (value) { setState(() { @@ -544,10 +544,10 @@ class _EditPatientState extends State { MihToggle( hintText: "Main Member", initialPostion: medMainMemberPosition, - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - secondaryFillColor: MzanziInnovationHub.of(context)! + secondaryFillColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), onChange: (value) { @@ -566,10 +566,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medNoController, @@ -586,10 +586,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medAidCodeController, @@ -606,10 +606,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medNameController, @@ -626,10 +626,10 @@ class _EditPatientState extends State { ), const SizedBox(height: 10.0), MihTextFormField( - fillColor: MzanziInnovationHub.of(context)! + fillColor: MzansiInnovationHub.of(context)! .theme .secondaryColor(), - inputColor: MzanziInnovationHub.of(context)! + inputColor: MzansiInnovationHub.of(context)! .theme .primaryColor(), controller: medSchemeController, @@ -661,12 +661,12 @@ class _EditPatientState extends State { } }, buttonColor: - MzanziInnovationHub.of(context)!.theme.successColor(), + MzansiInnovationHub.of(context)!.theme.successColor(), width: 300, child: Text( "Update", style: TextStyle( - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .primaryColor(), fontSize: 20, diff --git a/Frontend/lib/mih_services/mih_alert_services.dart b/Frontend/lib/mih_services/mih_alert_services.dart index 8f9e2a64..431834cc 100644 --- a/Frontend/lib/mih_services/mih_alert_services.dart +++ b/Frontend/lib/mih_services/mih_alert_services.dart @@ -11,7 +11,7 @@ class MihAlertServices { alertIcon: Icon( Icons.warning_amber_rounded, size: 150, - color: MzanziInnovationHub.of(context)!.theme.errorColor(), + color: MzansiInnovationHub.of(context)!.theme.errorColor(), ), alertTitle: "Oops! Looks like some fields are missing.", alertBody: Column( @@ -20,7 +20,7 @@ class MihAlertServices { "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: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -30,7 +30,7 @@ class MihAlertServices { text: TextSpan( style: TextStyle( color: - MzanziInnovationHub.of(context)!.theme.secondaryColor(), + MzansiInnovationHub.of(context)!.theme.secondaryColor(), fontSize: 15, fontWeight: FontWeight.bold, ), @@ -39,7 +39,7 @@ class MihAlertServices { text: "Here's a quick tip: ", style: TextStyle( fontStyle: FontStyle.italic, - color: MzanziInnovationHub.of(context)! + color: MzansiInnovationHub.of(context)! .theme .errorColor())), const TextSpan( @@ -50,7 +50,7 @@ class MihAlertServices { ), ], ), - alertColour: MzanziInnovationHub.of(context)!.theme.errorColor(), + alertColour: MzansiInnovationHub.of(context)!.theme.errorColor(), ); }, ); diff --git a/Frontend/lib/mih_services/mih_install_services.dart b/Frontend/lib/mih_services/mih_install_services.dart index bc2cbdfb..f8aafa28 100644 --- a/Frontend/lib/mih_services/mih_install_services.dart +++ b/Frontend/lib/mih_services/mih_install_services.dart @@ -31,7 +31,7 @@ class MihInstallServices { "https://apps.apple.com/za/app/mzansi-innovation-hub/id6743310890", ), ); - } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() == + } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "Android") { //Installed Android App launchSocialUrl( @@ -39,7 +39,7 @@ class MihInstallServices { "https://play.google.com/store/apps/details?id=za.co.mzansiinnovationhub.mih", ), ); - } else if (MzanziInnovationHub.of(context)!.theme.getPlatform() == "iOS") { + } else if (MzansiInnovationHub.of(context)!.theme.getPlatform() == "iOS") { launchSocialUrl( Uri.parse( "https://apps.apple.com/za/app/mzansi-innovation-hub/id6743310890", From 3f0ed5d7ae0b93d4207d922f58c8714bb5c845bb Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Tue, 15 Jul 2025 13:42:33 +0200 Subject: [PATCH 2/3] cahnge colors with numeric stepper --- .../mih_package_components/mih_numeric_stepper.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 2efa3c53..d4077f04 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 @@ -111,7 +111,7 @@ class _MihNumericStepperState extends State { backgroundColor: WidgetStateProperty.all( MzansiInnovationHub.of(context)! .theme - .successColor()), + .errorColor()), ), color: widget.inputColor, iconSize: 20, @@ -192,7 +192,10 @@ class _MihNumericStepperState extends State { width: 40, child: IconButton.filled( style: ButtonStyle( - backgroundColor: WidgetStateProperty.all(), + backgroundColor: WidgetStateProperty.all( + MzansiInnovationHub.of(context)! + .theme + .successColor()), ), color: widget.inputColor, iconSize: 20, From 32f92db19a1b69e2e55730b3fc5d971f36d88af0 Mon Sep 17 00:00:00 2001 From: Yasien Mac Mini Date: Tue, 15 Jul 2025 13:44:39 +0200 Subject: [PATCH 3/3] read only location field add business --- .../mzansi_profile/business_profile/profile_business_add.dart | 1 + 1 file changed, 1 insertion(+) 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 95306c6c..3dd67942 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 @@ -493,6 +493,7 @@ class _ProfileBusinessAddState extends State { controller: locationController, multiLineInput: false, requiredText: true, + readOnly: true, hintText: "GPS Location", ), ),