From 54bd147e87bc932b7021ee83bd05b6e05df68dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 24 Aug 2023 18:00:21 +0200 Subject: [PATCH 1/5] chore: upgrade deps to major versions --- packages/wyatt_authentication_bloc/example/pubspec.yaml | 2 +- packages/wyatt_authentication_bloc/pubspec.yaml | 6 +++--- packages/wyatt_component_copy_with_gen/pubspec.yaml | 2 +- packages/wyatt_http_client/pubspec.yaml | 2 +- packages/wyatt_type_utils/example/pubspec.yaml | 2 +- packages/wyatt_ui_kit/example/pubspec.yaml | 4 ++-- packages/wyatt_ui_kit/pubspec.yaml | 4 ++-- packages/wyatt_ui_layout/example/pubspec.yaml | 2 +- packages/wyatt_ui_layout/pubspec.yaml | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/wyatt_authentication_bloc/example/pubspec.yaml b/packages/wyatt_authentication_bloc/example/pubspec.yaml index b269e5d6..dd098d2f 100644 --- a/packages/wyatt_authentication_bloc/example/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: flutter: sdk: flutter - go_router: ^5.1.5 + go_router: ^10.1.0 firebase_core: ^2.1.1 flutter_bloc: ^8.1.1 firebase_auth: ^4.2.0 diff --git a/packages/wyatt_authentication_bloc/pubspec.yaml b/packages/wyatt_authentication_bloc/pubspec.yaml index 74ad5bce..952edc15 100644 --- a/packages/wyatt_authentication_bloc/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: flutter_bloc: ^8.1.1 equatable: ^2.0.5 firebase_auth: ^4.2.0 - google_sign_in: ^5.4.2 + google_sign_in: ^6.1.4 rxdart: ^0.27.7 wyatt_form_bloc: @@ -30,12 +30,12 @@ dependencies: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub/ version: ^0.0.5 flutter_secure_storage: ^8.0.0 - http: ^0.13.5 + http: ^1.1.0 dev_dependencies: flutter_test: { sdk: flutter } bloc_test: ^9.1.0 - mocktail: ^0.3.0 + mocktail: ^1.0.0 wyatt_analysis: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub/ diff --git a/packages/wyatt_component_copy_with_gen/pubspec.yaml b/packages/wyatt_component_copy_with_gen/pubspec.yaml index e7e40745..f2c389a8 100644 --- a/packages/wyatt_component_copy_with_gen/pubspec.yaml +++ b/packages/wyatt_component_copy_with_gen/pubspec.yaml @@ -11,7 +11,7 @@ environment: dependencies: build: ^2.3.1 source_gen: ^1.2.7 - analyzer: ^5.4.0 + analyzer: ^6.2.0 wyatt_component_copy_with_extension: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub diff --git a/packages/wyatt_http_client/pubspec.yaml b/packages/wyatt_http_client/pubspec.yaml index 7e287156..335af5fc 100644 --- a/packages/wyatt_http_client/pubspec.yaml +++ b/packages/wyatt_http_client/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: crypto: ^3.0.2 - http: ^0.13.4 + http: ^1.1.0 dev_dependencies: wyatt_analysis: diff --git a/packages/wyatt_type_utils/example/pubspec.yaml b/packages/wyatt_type_utils/example/pubspec.yaml index ffb81097..d5773668 100644 --- a/packages/wyatt_type_utils/example/pubspec.yaml +++ b/packages/wyatt_type_utils/example/pubspec.yaml @@ -27,7 +27,7 @@ environment: # the latest version available on pub.dev. To see which dependencies have newer # versions available, run `flutter pub outdated`. dependencies: - http: ^0.13.4 + http: ^1.1.0 wyatt_type_utils: path: "../" diff --git a/packages/wyatt_ui_kit/example/pubspec.yaml b/packages/wyatt_ui_kit/example/pubspec.yaml index f641bc51..75a34a1d 100644 --- a/packages/wyatt_ui_kit/example/pubspec.yaml +++ b/packages/wyatt_ui_kit/example/pubspec.yaml @@ -15,8 +15,8 @@ dependencies: flutter_bloc: ^8.1.2 flutter_localizations: { sdk: flutter } - gap: ^2.0.1 - google_fonts: ^4.0.3 + gap: ^3.0.1 + google_fonts: ^5.1.0 wyatt_ui_components: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub diff --git a/packages/wyatt_ui_kit/pubspec.yaml b/packages/wyatt_ui_kit/pubspec.yaml index 9df5a07b..19aafef5 100644 --- a/packages/wyatt_ui_kit/pubspec.yaml +++ b/packages/wyatt_ui_kit/pubspec.yaml @@ -12,9 +12,9 @@ dependencies: dotted_border: ^2.0.0+3 equatable: ^2.0.5 flutter: { sdk: flutter } - flutter_animate: ^3.0.0 + flutter_animate: ^4.2.0+1 flutter_bloc: ^8.1.2 - gap: ^2.0.1 + gap: ^3.0.1 meta: ^1.8.0 wyatt_bloc_helper: hosted: diff --git a/packages/wyatt_ui_layout/example/pubspec.yaml b/packages/wyatt_ui_layout/example/pubspec.yaml index 3628bf8c..07cae106 100644 --- a/packages/wyatt_ui_layout/example/pubspec.yaml +++ b/packages/wyatt_ui_layout/example/pubspec.yaml @@ -32,7 +32,7 @@ dependencies: wyatt_ui_layout: path: "../" - go_router: ^5.0.1 + go_router: ^10.1.0 wyatt_ui_components: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub diff --git a/packages/wyatt_ui_layout/pubspec.yaml b/packages/wyatt_ui_layout/pubspec.yaml index 11315aab..3c737053 100644 --- a/packages/wyatt_ui_layout/pubspec.yaml +++ b/packages/wyatt_ui_layout/pubspec.yaml @@ -10,7 +10,7 @@ environment: dependencies: flutter: { sdk: flutter } - gap: ^2.0.1 + gap: ^3.0.1 wyatt_ui_components: hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub -- 2.47.2 From e74346b65558dab440b729015e01e0b1dd00c84f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 24 Aug 2023 18:06:07 +0200 Subject: [PATCH 2/5] fix(authentication_bloc): go router version refactoring --- .../example/lib/presentation/features/app/app.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/wyatt_authentication_bloc/example/lib/presentation/features/app/app.dart b/packages/wyatt_authentication_bloc/example/lib/presentation/features/app/app.dart index 51b038d9..634443c0 100644 --- a/packages/wyatt_authentication_bloc/example/lib/presentation/features/app/app.dart +++ b/packages/wyatt_authentication_bloc/example/lib/presentation/features/app/app.dart @@ -71,7 +71,8 @@ class App extends StatelessWidget { if (authState.status != previous?.status) { previous = authState; // Checking if current path is onboarding or not - final isOnboarding = AppRouter.publicRoutes.contains(state.subloc); + final isOnboarding = + AppRouter.publicRoutes.contains(state.matchedLocation); if (authState.status == AuthenticationStatus.unauthenticated) { debugPrint('Not logged'); if (!isOnboarding) { -- 2.47.2 From cc41b7b589ad2b060ae08000ab3f9a11ce656d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 24 Aug 2023 18:07:35 +0200 Subject: [PATCH 3/5] fix: apply dart fix --apply --- .../remote/album_mock_data_source_impl.dart | 2 +- .../widgets/photos_grid_thumbnail.dart | 4 +- .../lib/src/core/utils/forms.dart | 6 +- .../email_verification_cubit_test.dart | 12 ++-- .../password_reset_cubit_test.dart | 6 +- .../test/sign_in/sign_in_cubit_test.dart | 62 +++++++++---------- .../test/sign_in/sign_in_state_test.dart | 2 +- .../test/sign_up/sign_up_cubit_test.dart | 44 ++++++------- .../test/sign_up/sign_up_state_test.dart | 2 +- .../example/lib/bloc/example_cubit.dart | 2 +- .../cloud_messaging_repository_impl.dart | 2 +- .../get_cloud_messaging_token_use_case.dart | 2 +- .../init_cloud_messaging_use_case.dart | 2 +- .../listen_notification_use_case.dart | 2 +- ...t_cloud_messaging_permission_use_case.dart | 2 +- ...scribe_to_notification_topic_use_case.dart | 2 +- ...ribe_from_notification_topic_use_case.dart | 2 +- .../bloc/cloud_messaging_cubit.dart | 10 +-- .../bloc/cloud_messaging_state.dart | 2 +- .../crud/blocs/crud_advanced_cubit.dart | 2 +- .../src/features/crud/blocs/crud_cubit.dart | 2 +- .../lib/src/utils/convert.dart | 2 +- packages/wyatt_i18n/example/lib/main.dart | 2 +- .../core/utils/parsers/i18n_file_parser.dart | 2 +- .../wyatt_ui_kit/example/lib/bars/bars.dart | 8 +-- .../example/lib/buttons/buttons.dart | 2 +- .../cards/portfolio_card/portfolio_cards.dart | 16 ++--- .../lib/cards/skill_card/skill_cards.dart | 4 +- .../bars/widgets/navigation_item.dart | 4 +- .../file_selection_button_screen.dart | 4 +- .../flat_button/flat_button_screen.dart | 18 +++--- .../simple_icon_screen.dart | 2 +- .../symbol_button/symbol_button_screen.dart | 2 +- .../widgets/pricing_card_titles.dart | 6 +- .../cards/quote_card/quote_card.dart | 2 +- .../cards/widgets/card_wrapper.dart | 8 +-- 36 files changed, 127 insertions(+), 127 deletions(-) diff --git a/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_mock_data_source_impl.dart b/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_mock_data_source_impl.dart index 56af64ad..d63875cb 100644 --- a/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_mock_data_source_impl.dart +++ b/packages/wyatt_architecture/example/lib/data/data_sources/remote/album_mock_data_source_impl.dart @@ -25,7 +25,7 @@ class AlbumMockDataSourceImpl extends AlbumRemoteDataSource { id: 1, userId: 1, title: 'Album 1', - ) + ), }; @override diff --git a/packages/wyatt_architecture/example/lib/presentation/features/photos/state_management/widgets/photos_grid_thumbnail.dart b/packages/wyatt_architecture/example/lib/presentation/features/photos/state_management/widgets/photos_grid_thumbnail.dart index 021227ff..c11b52c0 100644 --- a/packages/wyatt_architecture/example/lib/presentation/features/photos/state_management/widgets/photos_grid_thumbnail.dart +++ b/packages/wyatt_architecture/example/lib/presentation/features/photos/state_management/widgets/photos_grid_thumbnail.dart @@ -58,8 +58,8 @@ class PhotosGridThumbnail bottom: 10, right: 10, child: Icon(Icons.favorite), - ) - ] + ), + ], ], ), ); diff --git a/packages/wyatt_authentication_bloc/lib/src/core/utils/forms.dart b/packages/wyatt_authentication_bloc/lib/src/core/utils/forms.dart index ec95768b..9eec9c65 100644 --- a/packages/wyatt_authentication_bloc/lib/src/core/utils/forms.dart +++ b/packages/wyatt_authentication_bloc/lib/src/core/utils/forms.dart @@ -33,7 +33,7 @@ abstract class Forms { FormInput( AuthFormField.password, customPasswordValidator ?? const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ); @@ -55,7 +55,7 @@ abstract class Forms { AuthFormField.password, customPasswordValidator ?? const Password.pure(), ), - ...extraSignUpInputs ?? [] + ...extraSignUpInputs ?? [], ], name: AuthFormName.signUpForm, ); @@ -93,7 +93,7 @@ abstract class Forms { customPasswordValidator ?? const Password.pure(), metadata: const FormInputMetadata(isRequired: false), ), - ...extraEditAccountInputs ?? [] + ...extraEditAccountInputs ?? [], ], validationStrategy: const OnlyRequiredInputValidator(), name: AuthFormName.editAccountForm, diff --git a/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart b/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart index 29e0c9b4..b7da3ae3 100644 --- a/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/email_verification/email_verification_cubit_test.dart @@ -46,7 +46,7 @@ void main() { AuthenticationSession.fromEvent( SignedInFromCacheEvent(account: account), data: 10, - ) + ), ]), ); @@ -113,7 +113,7 @@ void main() { ), const EmailVerificationState( status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -135,7 +135,7 @@ void main() { const EmailVerificationState( errorMessage: 'erreur', status: FormStatus.submissionFailure, - ) + ), ], ); }); @@ -192,7 +192,7 @@ void main() { const EmailVerificationState( isVerified: true, status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -214,7 +214,7 @@ void main() { ), const EmailVerificationState( status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -236,7 +236,7 @@ void main() { const EmailVerificationState( errorMessage: 'erreur', status: FormStatus.submissionFailure, - ) + ), ], ); }); diff --git a/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart b/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart index 11c98b59..704a816e 100644 --- a/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/password_reset/password_reset_cubit_test.dart @@ -41,7 +41,7 @@ void main() { final WyattForm form = WyattFormImpl( [ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.passwordResetForm, ); @@ -260,7 +260,7 @@ void main() { name: AuthFormName.passwordResetForm, ), status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -327,7 +327,7 @@ void main() { name: AuthFormName.passwordResetForm, ), status: FormStatus.submissionFailure, - ) + ), ], ); }); diff --git a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart index bc517187..739f7664 100644 --- a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_cubit_test.dart @@ -46,7 +46,7 @@ void main() { final WyattForm form = WyattFormImpl( [ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signInForm, ); @@ -102,7 +102,7 @@ void main() { AuthFormField.email, const Email.dirty(invalidEmailString), ), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signInForm, ), @@ -126,7 +126,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -145,7 +145,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -163,7 +163,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -191,7 +191,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(invalidPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -215,7 +215,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), @@ -234,7 +234,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), @@ -252,7 +252,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -287,7 +287,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -312,7 +312,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -331,7 +331,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -364,7 +364,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -383,7 +383,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -401,7 +401,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -417,12 +417,12 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -448,7 +448,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -467,7 +467,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -485,7 +485,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -501,12 +501,12 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), status: FormStatus.submissionFailure, - ) + ), ], ); }); @@ -527,7 +527,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -566,7 +566,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -584,7 +584,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), @@ -600,12 +600,12 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -630,7 +630,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signInForm, ), @@ -648,7 +648,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), @@ -664,12 +664,12 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signInForm, ), status: FormStatus.submissionFailure, - ) + ), ], ); }); diff --git a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_state_test.dart b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_state_test.dart index 30f40cb7..218ea513 100644 --- a/packages/wyatt_authentication_bloc/test/sign_in/sign_in_state_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_in/sign_in_state_test.dart @@ -22,7 +22,7 @@ void main() { final WyattForm form = WyattFormImpl( [ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signInForm, ); diff --git a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart index d437c339..0f266022 100644 --- a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_cubit_test.dart @@ -46,7 +46,7 @@ void main() { final WyattForm form = WyattFormImpl( [ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signUpForm, ); @@ -98,7 +98,7 @@ void main() { AuthFormField.email, const Email.dirty(invalidEmailString), ), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signUpForm, ), @@ -122,7 +122,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -141,7 +141,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -159,7 +159,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -187,7 +187,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(invalidPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -211,7 +211,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -230,7 +230,7 @@ void main() { FormInput( AuthFormField.password, const Password.pure(), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -248,7 +248,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -283,7 +283,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -302,7 +302,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -335,7 +335,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -354,7 +354,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -372,7 +372,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -388,12 +388,12 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), status: FormStatus.submissionSuccess, - ) + ), ], ); @@ -419,7 +419,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -438,7 +438,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -456,7 +456,7 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), @@ -472,12 +472,12 @@ void main() { FormInput( AuthFormField.password, const Password.dirty(validPasswordString), - ) + ), ], name: AuthFormName.signUpForm, ), status: FormStatus.submissionFailure, - ) + ), ], ); }); @@ -487,7 +487,7 @@ void main() { FormInput, dynamic>>[ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ]; final inputsB = < diff --git a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_state_test.dart b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_state_test.dart index 89380d66..9bbc5d30 100644 --- a/packages/wyatt_authentication_bloc/test/sign_up/sign_up_state_test.dart +++ b/packages/wyatt_authentication_bloc/test/sign_up/sign_up_state_test.dart @@ -22,7 +22,7 @@ void main() { final WyattForm form = WyattFormImpl( [ FormInput(AuthFormField.email, const Email.pure()), - FormInput(AuthFormField.password, const Password.pure()) + FormInput(AuthFormField.password, const Password.pure()), ], name: AuthFormName.signInForm, ); diff --git a/packages/wyatt_bloc_layout/example/lib/bloc/example_cubit.dart b/packages/wyatt_bloc_layout/example/lib/bloc/example_cubit.dart index dd2275d4..9fc24ebc 100644 --- a/packages/wyatt_bloc_layout/example/lib/bloc/example_cubit.dart +++ b/packages/wyatt_bloc_layout/example/lib/bloc/example_cubit.dart @@ -31,7 +31,7 @@ class ExampleCubit extends Cubit { 'DATA LOADED 1', 'DATA LOADED 2', 'DATA LOADED 3', - 'DATA LOADED 4' + 'DATA LOADED 4', ]), ); await Future.delayed(const Duration(seconds: 1)); diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart index f5212d81..f2dab68b 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart @@ -22,11 +22,11 @@ import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_me import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class CloudMessagingRepositoryImpl extends CloudMessagingRepository { - final CloudMessagingRemoteDataSource _notificationRemoteDataSource; CloudMessagingRepositoryImpl({ required CloudMessagingRemoteDataSource notificationRemoteDataSource, }) : _notificationRemoteDataSource = notificationRemoteDataSource; + final CloudMessagingRemoteDataSource _notificationRemoteDataSource; @override FutureOrResult getToken() => Result.tryCatchAsync( diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart index f951c154..72edd290 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart @@ -18,11 +18,11 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class GetCloudMessagingTokenUseCase extends AsyncUseCase { - final CloudMessagingRepository _notificationRepository; GetCloudMessagingTokenUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOrResult execute(void params) => diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart index 6d1f9394..9b0470b2 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart @@ -18,11 +18,11 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class InitCloudmessagingUseCase extends AsyncUseCase { - final CloudMessagingRepository _notificationRepository; InitCloudmessagingUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOrResult execute(NoParam? params) => _notificationRepository.init(); diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart index 7c434046..f4c3cbec 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart @@ -25,11 +25,11 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class ListenNotificationUseCase extends StreamUseCase { - final CloudMessagingRepository _notificationRepository; ListenNotificationUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOrResult> execute(NoParam? params) async { Stream? notificationStream; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart index 2e712cc9..c08b07ee 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart @@ -18,11 +18,11 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class RequestCloudMessagingPermissionUseCase extends AsyncUseCase { - final CloudMessagingRepository _notificationRepository; RequestCloudMessagingPermissionUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOrResult execute(void params) => diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart index b3a364ca..a68a6b74 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart @@ -20,11 +20,11 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class SubscribeToNotificationTopicUseCase extends AsyncUseCase { - final CloudMessagingRepository _notificationRepository; SubscribeToNotificationTopicUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOr onStart(String? params) { diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart index 1bd13f9c..cf7c60c3 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart @@ -21,11 +21,11 @@ import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_me class UnsubscribeFromNotificationTopicUseCase extends AsyncUseCase { - final CloudMessagingRepository _notificationRepository; UnsubscribeFromNotificationTopicUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; + final CloudMessagingRepository _notificationRepository; @override FutureOr onStart(String? params) { diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_cubit.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_cubit.dart index 1c298478..ed8eb0f5 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_cubit.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_cubit.dart @@ -30,11 +30,6 @@ part 'cloud_messaging_state.dart'; typedef OnNotification = void Function(RemoteNotification); class CloudMessagingCubit extends Cubit { - final ListenNotificationUseCase _listenNotification; - final SubscribeToNotificationTopicUseCase? _subscribe; - final UnsubscribeFromNotificationTopicUseCase? _unsubscribe; - - final OnNotification? handleNotification; CloudMessagingCubit({ required ListenNotificationUseCase listenNotification, SubscribeToNotificationTopicUseCase? subscribe, @@ -44,6 +39,11 @@ class CloudMessagingCubit extends Cubit { _subscribe = subscribe, _unsubscribe = unsubscribe, super(const CloudmessagingState()); + final ListenNotificationUseCase _listenNotification; + final SubscribeToNotificationTopicUseCase? _subscribe; + final UnsubscribeFromNotificationTopicUseCase? _unsubscribe; + + final OnNotification? handleNotification; Future listenNotification() async { final notificaitons = await _listenNotification.execute(const NoParam()); diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart index 4d2810d5..865962fd 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart @@ -17,9 +17,9 @@ part of 'cloud_messaging_cubit.dart'; class CloudmessagingState extends Equatable { - final RemoteNotification? remoteNotification; const CloudmessagingState([this.remoteNotification]); + final RemoteNotification? remoteNotification; @override List get props => [remoteNotification]; diff --git a/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_advanced_cubit.dart b/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_advanced_cubit.dart index d41e35d9..85546422 100644 --- a/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_advanced_cubit.dart +++ b/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_advanced_cubit.dart @@ -289,7 +289,7 @@ abstract class CrudAdvancedCubit WhereQueryType.whereIn, 'id', ids, - ) + ), ]); if (result.isOk) { return CrudListLoaded(result.ok ?? []); diff --git a/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_cubit.dart b/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_cubit.dart index 5d18975f..97265465 100644 --- a/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_cubit.dart +++ b/packages/wyatt_crud_bloc/lib/src/features/crud/blocs/crud_cubit.dart @@ -353,7 +353,7 @@ abstract class CrudCubit extends CrudBaseCubit { WhereQueryType.whereIn, 'id', ids, - ) + ), ]); if (result.isOk) { return CrudListLoaded(result.ok ?? []); diff --git a/packages/wyatt_http_client/lib/src/utils/convert.dart b/packages/wyatt_http_client/lib/src/utils/convert.dart index 93c86d59..81808e91 100644 --- a/packages/wyatt_http_client/lib/src/utils/convert.dart +++ b/packages/wyatt_http_client/lib/src/utils/convert.dart @@ -46,7 +46,7 @@ abstract class Convert { map.forEach( (key, value) => pairs.add([ Uri.encodeQueryComponent(key, encoding: encoding ?? utf8), - Uri.encodeQueryComponent(value, encoding: encoding ?? utf8) + Uri.encodeQueryComponent(value, encoding: encoding ?? utf8), ]), ); return pairs.map((pair) => '${pair[0]}=${pair[1]}').join('&'); diff --git a/packages/wyatt_i18n/example/lib/main.dart b/packages/wyatt_i18n/example/lib/main.dart index fa13f3f7..1d9e1373 100644 --- a/packages/wyatt_i18n/example/lib/main.dart +++ b/packages/wyatt_i18n/example/lib/main.dart @@ -44,7 +44,7 @@ class App extends StatelessWidget { ), ), GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate + GlobalWidgetsLocalizations.delegate, ], home: Scaffold( appBar: AppBar( diff --git a/packages/wyatt_i18n/lib/src/core/utils/parsers/i18n_file_parser.dart b/packages/wyatt_i18n/lib/src/core/utils/parsers/i18n_file_parser.dart index 3cc371e1..a06b6a12 100644 --- a/packages/wyatt_i18n/lib/src/core/utils/parsers/i18n_file_parser.dart +++ b/packages/wyatt_i18n/lib/src/core/utils/parsers/i18n_file_parser.dart @@ -93,7 +93,7 @@ class I18nFileParser extends Parser { String selectToString(Select token) { final Map cases = { - for (var e in token.options.map( + for (final e in token.options.map( (o) => MapEntry( o.name, o.value.map(parsedElementToString).join(), diff --git a/packages/wyatt_ui_kit/example/lib/bars/bars.dart b/packages/wyatt_ui_kit/example/lib/bars/bars.dart index 9f3300f6..95f2d205 100644 --- a/packages/wyatt_ui_kit/example/lib/bars/bars.dart +++ b/packages/wyatt_ui_kit/example/lib/bars/bars.dart @@ -27,7 +27,7 @@ class Bars extends DemoPage { ), ), actions: [ - IconButton(onPressed: () {}, icon: const Icon(Icons.menu)) + IconButton(onPressed: () {}, icon: const Icon(Icons.menu)), ], ), const Gap(20), @@ -54,13 +54,13 @@ class Bars extends DemoPage { ), ListTile( title: Text('Votre programme'), - ) + ), ], actions: [ IconButton( onPressed: () {}, icon: const Icon(Icons.clear), - ) + ), ], ), const Gap(20), @@ -81,7 +81,7 @@ class Bars extends DemoPage { TextWrapper('ACCUEIL'), TextWrapper('VOTRE PROGRAMME'), TextWrapper('LE STUDIO'), - TextWrapper('SAVOIR FAIRE') + TextWrapper('SAVOIR FAIRE'), ], ), ], diff --git a/packages/wyatt_ui_kit/example/lib/buttons/buttons.dart b/packages/wyatt_ui_kit/example/lib/buttons/buttons.dart index dfbb9f3e..9a8be9c0 100644 --- a/packages/wyatt_ui_kit/example/lib/buttons/buttons.dart +++ b/packages/wyatt_ui_kit/example/lib/buttons/buttons.dart @@ -50,7 +50,7 @@ class Buttons extends DemoPage { Gap(20), SimpleIconButtons(), Gap(20), - FileSelectionButtons() + FileSelectionButtons(), ], ), ], diff --git a/packages/wyatt_ui_kit/example/lib/cards/portfolio_card/portfolio_cards.dart b/packages/wyatt_ui_kit/example/lib/cards/portfolio_card/portfolio_cards.dart index f467143a..0b478d87 100644 --- a/packages/wyatt_ui_kit/example/lib/cards/portfolio_card/portfolio_cards.dart +++ b/packages/wyatt_ui_kit/example/lib/cards/portfolio_card/portfolio_cards.dart @@ -43,12 +43,12 @@ class PortfolioCards extends StatelessWidget { 'assets/images/mockup_1.png', alignment: Alignment.topCenter, fit: BoxFit.cover, - ) + ), ], keywords: const [ TextWrapper('UI Design'), TextWrapper('Developpement'), - TextWrapper('Deploiement') + TextWrapper('Deploiement'), ], ), const Gap(20), @@ -78,9 +78,9 @@ class PortfolioCards extends StatelessWidget { 'assets/images/mockup_1.png', alignment: Alignment.topCenter, fit: BoxFit.cover, - ) + ), ], - ) + ), ], ), const Gap(20), @@ -118,12 +118,12 @@ class PortfolioCards extends StatelessWidget { 'assets/images/mockup_1.png', alignment: Alignment.topCenter, fit: BoxFit.cover, - ) + ), ], keywords: const [ TextWrapper('UI Design'), TextWrapper('Developpement'), - TextWrapper('Deploiement') + TextWrapper('Deploiement'), ], ), const Gap(20), @@ -168,12 +168,12 @@ class PortfolioCards extends StatelessWidget { 'assets/images/mockup_1.png', alignment: Alignment.topCenter, fit: BoxFit.cover, - ) + ), ], keywords: const [ TextWrapper('UI Design'), TextWrapper('Developpement'), - TextWrapper('Deploiement') + TextWrapper('Deploiement'), ], ), ], diff --git a/packages/wyatt_ui_kit/example/lib/cards/skill_card/skill_cards.dart b/packages/wyatt_ui_kit/example/lib/cards/skill_card/skill_cards.dart index 2bcb72d2..9c4ff6f5 100644 --- a/packages/wyatt_ui_kit/example/lib/cards/skill_card/skill_cards.dart +++ b/packages/wyatt_ui_kit/example/lib/cards/skill_card/skill_cards.dart @@ -47,7 +47,7 @@ class SkillCards extends StatelessWidget { gradientColors: const MultiColor([Colors.red, Colors.orange]), ), - ) + ), ], bulletColors: const MultiColor([Colors.red, Colors.orange]), title: const TextWrapper('Lorem Ipsum'), @@ -78,7 +78,7 @@ class SkillCards extends StatelessWidget { gradientColors: const MultiColor([Colors.blue, Colors.green]), ), - ) + ), ], bulletColors: const MultiColor([Colors.blue, Colors.green]), title: const TextWrapper('Lorem Ipsum'), diff --git a/packages/wyatt_ui_kit/lib/src/components/bars/widgets/navigation_item.dart b/packages/wyatt_ui_kit/lib/src/components/bars/widgets/navigation_item.dart index a89c9f1e..710375dd 100644 --- a/packages/wyatt_ui_kit/lib/src/components/bars/widgets/navigation_item.dart +++ b/packages/wyatt_ui_kit/lib/src/components/bars/widgets/navigation_item.dart @@ -63,7 +63,7 @@ class NavigationItem extends StatelessWidget { .themeExtension() ?.selectedIndicatorColors, TopBarThemeExtensionDefault.from(Theme.of(context)) - .selectedIndicatorColors + .selectedIndicatorColors, ], valueValidator: (value) => value?.isGradient, transform: (value) => @@ -75,7 +75,7 @@ class NavigationItem extends StatelessWidget { .themeExtension() ?.selectedIndicatorColors, TopBarThemeExtensionDefault.from(Theme.of(context)) - .selectedIndicatorColors + .selectedIndicatorColors, ], valueValidator: (value) => value?.isColor, transform: (value) => value?.color, diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_screen.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_screen.dart index fb3597a2..e96cd569 100644 --- a/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_screen.dart +++ b/packages/wyatt_ui_kit/lib/src/components/buttons/file_selection_button/file_selection_button_screen.dart @@ -177,7 +177,7 @@ class FileSelectionButtonScreen ) : null, boxShadow: [ - if (style.shadow != null) ...[style.shadow!] + if (style.shadow != null) ...[style.shadow!], ], borderRadius: style.radius, ), @@ -214,7 +214,7 @@ class FileSelectionButtonScreen GradientText.fromWrapper( title!, gradientColors: style.foregroundColors, - ) + ), ], /// Choose color diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_screen.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_screen.dart index 39613f62..c3119e0c 100644 --- a/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_screen.dart +++ b/packages/wyatt_ui_kit/lib/src/components/buttons/flat_button/flat_button_screen.dart @@ -156,7 +156,7 @@ class FlatButtonScreen extends CubitScreen { : null, boxShadow: [ - if (style.shadow != null) ...[style.shadow!] + if (style.shadow != null) ...[style.shadow!], ], borderRadius: style.radius, ), @@ -174,7 +174,7 @@ class FlatButtonScreen extends CubitScreen { if (prefix != null && (prefix is Icon?) && ((prefix as Icon?)?.color != null)) ...[ - prefix! + prefix!, ] else if (style.foregroundColors?.color != null && prefix != null) ...[ ColorFiltered( @@ -183,9 +183,9 @@ class FlatButtonScreen extends CubitScreen { BlendMode.srcIn, ), child: prefix, - ) + ), ] else ...[ - prefix ?? const SizedBox.shrink() + prefix ?? const SizedBox.shrink(), ], Gap(style.padding?.vertical ?? 10), @@ -204,13 +204,13 @@ class FlatButtonScreen extends CubitScreen { label!, style: style.labelStyle, gradientColors: style.foregroundColors, - ) + ), ], Gap(style.padding?.vertical ?? 10), if (suffix != null && (suffix is Icon?) && ((suffix as Icon?)?.color != null)) ...[ - suffix! + suffix!, ] else if (style.foregroundColors?.colors != null && style.foregroundColors!.colors.isNotEmpty && suffix != null) ...[ @@ -220,7 +220,7 @@ class FlatButtonScreen extends CubitScreen { BlendMode.srcIn, ), child: suffix, - ) + ), ] else if (style.foregroundColors?.color != null && suffix != null) ...[ ColorFiltered( @@ -229,9 +229,9 @@ class FlatButtonScreen extends CubitScreen { BlendMode.srcIn, ), child: suffix, - ) + ), ] else ...[ - suffix ?? const SizedBox.shrink() + suffix ?? const SizedBox.shrink(), ], ], ), diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_screen.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_screen.dart index ecf5378b..2b2241a0 100644 --- a/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_screen.dart +++ b/packages/wyatt_ui_kit/lib/src/components/buttons/simple_icon_button/simple_icon_screen.dart @@ -152,7 +152,7 @@ class SimpleIconButtonScreen extends CubitScreen { ) : null, boxShadow: [ - if (style.shadow != null) ...[style.shadow!] + if (style.shadow != null) ...[style.shadow!], ], borderRadius: style.radius, ), diff --git a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_screen.dart b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_screen.dart index d98afec7..e36a92a8 100644 --- a/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_screen.dart +++ b/packages/wyatt_ui_kit/lib/src/components/buttons/symbol_button/symbol_button_screen.dart @@ -181,7 +181,7 @@ class SymbolButtonScreen ) : null, boxShadow: [ - if (style.shadow != null) ...[style.shadow!] + if (style.shadow != null) ...[style.shadow!], ], borderRadius: style.radius, ), diff --git a/packages/wyatt_ui_kit/lib/src/components/cards/pricing_card/widgets/pricing_card_titles.dart b/packages/wyatt_ui_kit/lib/src/components/cards/pricing_card/widgets/pricing_card_titles.dart index 13dfb2bf..311f18fa 100644 --- a/packages/wyatt_ui_kit/lib/src/components/cards/pricing_card/widgets/pricing_card_titles.dart +++ b/packages/wyatt_ui_kit/lib/src/components/cards/pricing_card/widgets/pricing_card_titles.dart @@ -102,7 +102,7 @@ class PricingCardTitles extends StatelessWidget { ], ), const Gap(_bodyTopSpacing), - ] + ], ], RichText( text: TextSpan( @@ -111,7 +111,7 @@ class PricingCardTitles extends StatelessWidget { TextSpan( text: price.text.data, style: price.text.style, - ) + ), ], if (pricing?.hasAsterisk ?? false) ...[ WidgetSpan( @@ -128,7 +128,7 @@ class PricingCardTitles extends StatelessWidget { TextSpan( text: period.text.data, style: period.text.style, - ) + ), ], ], ), diff --git a/packages/wyatt_ui_kit/lib/src/components/cards/quote_card/quote_card.dart b/packages/wyatt_ui_kit/lib/src/components/cards/quote_card/quote_card.dart index 8e233aea..57c23c0a 100644 --- a/packages/wyatt_ui_kit/lib/src/components/cards/quote_card/quote_card.dart +++ b/packages/wyatt_ui_kit/lib/src/components/cards/quote_card/quote_card.dart @@ -134,7 +134,7 @@ class QuoteCard extends QuoteCardComponent with $QuoteCardCWMixin { ], ], ), - ) + ), ], ), ], diff --git a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart index bf9dbd55..a509c8c0 100644 --- a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart +++ b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart @@ -147,7 +147,7 @@ class CardWrapper extends StatelessWidget { [ radius, Theme.of(context).extension()?.radius, - CardThemeExtensionDefault.from(Theme.of(context)).radius + CardThemeExtensionDefault.from(Theme.of(context)).radius, ], ); @@ -155,7 +155,7 @@ class CardWrapper extends StatelessWidget { [ minSize, Theme.of(context).extension()?.minSize, - CardThemeExtensionDefault.from(Theme.of(context)).minSize + CardThemeExtensionDefault.from(Theme.of(context)).minSize, ], ); @@ -163,7 +163,7 @@ class CardWrapper extends StatelessWidget { [ maxSize, Theme.of(context).extension()?.maxSize, - CardThemeExtensionDefault.from(Theme.of(context)).maxSize + CardThemeExtensionDefault.from(Theme.of(context)).maxSize, ], ); @@ -178,7 +178,7 @@ class CardWrapper extends StatelessWidget { Theme.of(context) .extension() ?.backgroundColors, - CardThemeExtensionDefault.from(Theme.of(context)).backgroundColors + CardThemeExtensionDefault.from(Theme.of(context)).backgroundColors, ], valueValidator: (multiColor) => multiColor?.isGradient, transform: (multiColor) => -- 2.47.2 From 227158725d30975d6284e9d14836c1784b1f9e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 24 Aug 2023 18:08:18 +0200 Subject: [PATCH 4/5] fix: apply dart format --- .../local/authentication_mock_cache_data_source_impl.dart | 4 ++-- .../example/lib/firebase_options.dart | 3 ++- .../data/repositories/cloud_messaging_repository_impl.dart | 1 - .../domain/usecases/get_cloud_messaging_token_use_case.dart | 1 - .../src/domain/usecases/init_cloud_messaging_use_case.dart | 1 - .../src/domain/usecases/listen_notification_use_case.dart | 1 - .../request_cloud_messaging_permission_use_case.dart | 1 - .../usecases/subscribe_to_notification_topic_use_case.dart | 1 - .../unsubscribe_from_notification_topic_use_case.dart | 1 - .../features/notifications/bloc/cloud_messaging_state.dart | 1 - .../data_sources/remote/crud_firestore_data_source_impl.dart | 3 +-- .../lib/src/data/form_operations/form_difference.dart | 5 ++--- .../lib/src/data/form_operations/form_intersection.dart | 5 ++--- .../lib/src/data/form_operations/form_union.dart | 5 ++--- .../entities/bars/bottom_navigation_bar_component.dart | 2 +- .../lib/src/components/cards/widgets/card_wrapper.dart | 3 ++- 16 files changed, 14 insertions(+), 24 deletions(-) diff --git a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_mock_cache_data_source_impl.dart b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_mock_cache_data_source_impl.dart index 3c23a866..80b072c2 100644 --- a/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_mock_cache_data_source_impl.dart +++ b/packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_mock_cache_data_source_impl.dart @@ -32,8 +32,8 @@ class AuthenticationMockCacheDataSourceImpl @override Future getCachedAccount() async { await Future.delayed(const Duration(milliseconds: 200)); - -return null; + + return null; } @override diff --git a/packages/wyatt_cloud_messaging_bloc_base/example/lib/firebase_options.dart b/packages/wyatt_cloud_messaging_bloc_base/example/lib/firebase_options.dart index 446a8685..e9a80b3c 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/example/lib/firebase_options.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/example/lib/firebase_options.dart @@ -53,7 +53,8 @@ class DefaultFirebaseOptions { messagingSenderId: '100151285458', projectId: 'wyatt-notification-example', storageBucket: 'wyatt-notification-example.appspot.com', - iosClientId: '100151285458-a9notq1k1padf0vk9ove8ll3amjgi7mn.apps.googleusercontent.com', + iosClientId: + '100151285458-a9notq1k1padf0vk9ove8ll3amjgi7mn.apps.googleusercontent.com', iosBundleId: 'com.example.notificationBlocExample', ); } diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart index f2dab68b..d7d467d9 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/data/repositories/cloud_messaging_repository_impl.dart @@ -22,7 +22,6 @@ import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_me import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class CloudMessagingRepositoryImpl extends CloudMessagingRepository { - CloudMessagingRepositoryImpl({ required CloudMessagingRemoteDataSource notificationRemoteDataSource, }) : _notificationRemoteDataSource = notificationRemoteDataSource; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart index 72edd290..b2fad136 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/get_cloud_messaging_token_use_case.dart @@ -18,7 +18,6 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class GetCloudMessagingTokenUseCase extends AsyncUseCase { - GetCloudMessagingTokenUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart index 9b0470b2..12632716 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/init_cloud_messaging_use_case.dart @@ -18,7 +18,6 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class InitCloudmessagingUseCase extends AsyncUseCase { - InitCloudmessagingUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart index f4c3cbec..3d670f5d 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/listen_notification_use_case.dart @@ -25,7 +25,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart'; class ListenNotificationUseCase extends StreamUseCase { - ListenNotificationUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart index c08b07ee..45436321 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/request_cloud_messaging_permission_use_case.dart @@ -18,7 +18,6 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class RequestCloudMessagingPermissionUseCase extends AsyncUseCase { - RequestCloudMessagingPermissionUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart index a68a6b74..f5efbbb7 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/subscribe_to_notification_topic_use_case.dart @@ -20,7 +20,6 @@ import 'package:wyatt_architecture/wyatt_architecture.dart'; import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_messaging_repository.dart'; class SubscribeToNotificationTopicUseCase extends AsyncUseCase { - SubscribeToNotificationTopicUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart index cf7c60c3..d58fe4f2 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/domain/usecases/unsubscribe_from_notification_topic_use_case.dart @@ -21,7 +21,6 @@ import 'package:wyatt_cloud_messaging_bloc_base/src/domain/repositories/cloud_me class UnsubscribeFromNotificationTopicUseCase extends AsyncUseCase { - UnsubscribeFromNotificationTopicUseCase({ required CloudMessagingRepository notificationRepository, }) : _notificationRepository = notificationRepository; diff --git a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart index 865962fd..34311e4e 100644 --- a/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart +++ b/packages/wyatt_cloud_messaging_bloc_base/lib/src/features/notifications/bloc/cloud_messaging_state.dart @@ -17,7 +17,6 @@ part of 'cloud_messaging_cubit.dart'; class CloudmessagingState extends Equatable { - const CloudmessagingState([this.remoteNotification]); final RemoteNotification? remoteNotification; diff --git a/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart b/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart index 2915f2e6..7b4f793a 100644 --- a/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart +++ b/packages/wyatt_crud_bloc/lib/src/data/data_sources/remote/crud_firestore_data_source_impl.dart @@ -33,8 +33,7 @@ class CrudFirestoreDataSourceImpl required Model Function( DocumentSnapshot>, SnapshotOptions?, - ) - fromFirestore, + ) fromFirestore, /// The function that converts a [Model] to a [Map]. required Map Function(Model, SetOptions?) toFirestore, diff --git a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_difference.dart b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_difference.dart index ec77e957..bcee7fce 100644 --- a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_difference.dart +++ b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_difference.dart @@ -26,9 +26,8 @@ class FormDifference extends FormOperation { @override WyattForm call(WyattForm a, WyattForm b) { - final inputs = < - FormInput, - dynamic>>[]; + final inputs = , dynamic>>[]; for (final i in a.inputs) { if (!b.containsKey(i.key)) { diff --git a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_intersection.dart b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_intersection.dart index 332a7bd1..8986435d 100644 --- a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_intersection.dart +++ b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_intersection.dart @@ -26,9 +26,8 @@ class FormIntersection extends FormOperation { @override WyattForm call(WyattForm a, WyattForm b) { - final inputs = < - FormInput, - dynamic>>[]; + final inputs = , dynamic>>[]; for (final i in a.inputs) { if (b.containsKey(i.key)) { diff --git a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_union.dart b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_union.dart index 91725e13..edf4dbf6 100644 --- a/packages/wyatt_form_bloc/lib/src/data/form_operations/form_union.dart +++ b/packages/wyatt_form_bloc/lib/src/data/form_operations/form_union.dart @@ -26,9 +26,8 @@ class FormUnion extends FormOperation { @override WyattForm call(WyattForm a, WyattForm b) { - final inputs = < - FormInput, - dynamic>>[]; + final inputs = , dynamic>>[]; for (final i in a.inputs) { inputs.add(i); diff --git a/packages/wyatt_ui_components/lib/src/domain/entities/bars/bottom_navigation_bar_component.dart b/packages/wyatt_ui_components/lib/src/domain/entities/bars/bottom_navigation_bar_component.dart index b303351e..c3c39f4b 100644 --- a/packages/wyatt_ui_components/lib/src/domain/entities/bars/bottom_navigation_bar_component.dart +++ b/packages/wyatt_ui_components/lib/src/domain/entities/bars/bottom_navigation_bar_component.dart @@ -30,7 +30,7 @@ abstract class BottomNavigationBarComponent extends Component this.items = const [], super.key, }); - + final int currentIndex; final void Function(BuildContext, int)? onTap; final List items; diff --git a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart index a509c8c0..4f2477b6 100644 --- a/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart +++ b/packages/wyatt_ui_kit/lib/src/components/cards/widgets/card_wrapper.dart @@ -178,7 +178,8 @@ class CardWrapper extends StatelessWidget { Theme.of(context) .extension() ?.backgroundColors, - CardThemeExtensionDefault.from(Theme.of(context)).backgroundColors, + CardThemeExtensionDefault.from(Theme.of(context)) + .backgroundColors, ], valueValidator: (multiColor) => multiColor?.isGradient, transform: (multiColor) => -- 2.47.2 From a4c73421d28f30292a019c2e8575172517e36c29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 24 Aug 2023 18:13:22 +0200 Subject: [PATCH 5/5] fix(authentication_bloc): upgrade google sign to his major v --- packages/wyatt_authentication_bloc/example/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/wyatt_authentication_bloc/example/pubspec.yaml b/packages/wyatt_authentication_bloc/example/pubspec.yaml index dd098d2f..a83f46e2 100644 --- a/packages/wyatt_authentication_bloc/example/pubspec.yaml +++ b/packages/wyatt_authentication_bloc/example/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: firebase_core: ^2.1.1 flutter_bloc: ^8.1.1 firebase_auth: ^4.2.0 - google_sign_in: ^5.4.2 + google_sign_in: ^6.1.4 get_it: ^7.2.0 wyatt_authentication_bloc: -- 2.47.2