feat(deferred): (wip) add generator package

- wyatt_analysis@2.4.0

CHANGELOG.md

@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2023-02-07
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`wyatt_analysis` - `v2.4.0`](#wyatt_analysis---v240)
+
+---
+
+#### `wyatt_analysis` - `v2.4.0`
+
+ - **FEAT**: add new lint rules.
+ - **DOCS**: add instructions to create a new version (closes #104).
+
+
+## 2022-12-13
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`wyatt_authentication_bloc` - `v0.4.1`](#wyatt_authentication_bloc---v041)
+
+---
+
+#### `wyatt_authentication_bloc` - `v0.4.1`
+
+ - **REFACTOR**: use fromFirebaseUser factory to parse user.
+ - **REFACTOR**: update deps and re-export them.
+ - **FIX**: fix mock on register.
+ - **FEAT**: add google sign in in signIn cubit.
+ - **FEAT**: add google sign in parameter in firebase data source constructor.
+ - **FEAT**: add google sign_in support (closes #59).
+ - **FEAT**: add reauthenticate, updateEmail and updatePassword.
+ - **DOCS**: add correct header.
+
+
 ## 2022-12-12
 
 ### Changes

README.md

@@ -17,10 +17,6 @@
 -->
 
 <p align="center">
-
-  <a href="https://wyattapp.io">
-    <img width="150px" src="resources/wyatt-campus-logo.png">
-  </a>
  <a href="https://wyatt-studio.fr">
     <img width="150px" src="resources/wyatt-studio-logo.png">
   </a>
@@ -44,10 +40,9 @@
 
 ## About
 
-Here is it a set of [Flutter plugins](https://flutter.io/platform-plugins/) that power up your applications.
+Here is a set of [Flutter plugins](https://flutter.io/platform-plugins/) that enhance your applications.
 
-[Flutter](https://flutter.dev) is Google's UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop from a single codebase. Flutter is used by developers and organizations around the world, and is free
+[Flutter](https://flutter.dev) is Google's UI toolkit for building beautiful, natively compiled applications for mobile, web, and desktop using a single codebase. It is used by developers and organizations worldwide and is free and open-source.
-and open source.
 
 ---
 
@@ -61,21 +56,21 @@ git clone ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git
 
 ### Prerequisite
 
-- [Flutter](https://github.com/flutter/flutter).
+1. [Flutter](https://github.com/flutter/flutter). It is a UI toolkit developed by Google for building beautiful and natively compiled applications for mobile, web, and desktop from a single codebase.
 
-- [Melos](https://github.com/invertase/melos). Used to manage Dart projects with multiple packages.
+2. [Melos](https://github.com/invertase/melos). Melos is a tool that helps in managing Dart projects that have multiple packages. It can be installed using the following command:
 
 ```shell
 dart pub global activate melos
 ```
 
-- [Mason](https://github.com/felangel/mason). Used for code generation.
+3. [Mason](https://github.com/felangel/mason). Mason is used for code generation purposes. It can be installed by running the following command:
 
 ```shell
 dart pub global activate mason_cli
 ```
 
-- [Lcov](https://github.com/linux-test-project/lcov). Used to generate coverage data.
+4. [Lcov](https://github.com/linux-test-project/lcov). Lcov is a tool used to generate coverage data. It can be installed on macOS by running the following command:
 
 ```shell
 # on macos
@@ -84,38 +79,39 @@ brew install lcov
 
 - genhtml. Used to convert coverage data into html pages.
 
-After installing all these packages, bootstrap with `melos bs`.
+After installation of all these packages, the project can be bootstrapped using the command `melos bs`.
 
 ### Create a new package
 
 Create a new package in `packages/` folder.
+To create a new package in the packages/ folder, run the following command in the terminal:
 
 ```shell
 mason make wyatt_package --package_name  wyatt_<name> --description A new Wyatt package --flutter_only false
 ```
 
-Then bootstrap project with `melos bs` command.
+The <name> variable in the above command is important and must be clear and understandable.
+
+After creating the package, bootstrap the project with the `melos bs` command.
 
 #### Naming
 
 In the previous instructions `<name>` variable is important.
 It have to be clear and intelligible.
 
-You **MUST** use underscores.
+1. You must use underscores in the name.
+2. You must use the wyatt prefix for the package name.
+3. You must name the example with a specific name.
 
-You **MUST** use `wyatt` prefix for package.
+For example, if the name is "CRUD BLOC," the following naming conventions should be used:
 
-You **MUST** name example with specific name.
+1. name: crud_bloc
-
+2. package name: wyatt_crud_bloc
-For example, if name is CRUD BLOC
+3. example name: crud_bloc_example
-
-- name will be crud_bloc
-- so the package will be: `wyatt_crud_bloc`
-- and the example will be: `crud_bloc_example`
 
 ### Create issues
 
-Add the issues directly related to what you want to develop and label them correctly.
+Create an issue for each specific feature or task you want to work on and label it correctly using the following format:
 
 ```
 Type(scope): issue.
@@ -128,18 +124,18 @@ For example, on notification bloc package :
 
 ### Branches
 
-Master is protected. You can't push on it. Please develop your feature on another branch. The name of your branch has to match with the issue opened.
+The master branch is protected and cannot be pushed to directly. Please create a separate branch for each feature or task, with a name that corresponds to the related issue. The branch name should follow this format:
 
 `type(scope):issue`
 
 Example :
-Issue :
+For the issue:
 
 - `Feature(notification_bloc): add firebase messaging data source.`
 
-Branch related to this issue :
+The related branch should be named:
 
-- `feature(notification_bloc)/add_firebase_messaging_data_source`
+- `notification_bloc/feat/add_firebase_messaging_data_source`
 
 ### Commits
 
@@ -163,12 +159,11 @@ Some examples :
 - `docs: update readme.` = update **this** readme file.
 - `fix(crud)!: fix bug in awesome() function. (#32)` = fix a bug, `!` is important and indicate `BREAKING CHANGES` linked with the 32nd issue.
 
-When you have finished developing, and are ready to close the issue, close it via your commit :
+When you have completed your development work and are ready to resolve the related issue, you can close it via your commit message by including (close #issue_number). For example:
 
-`feat(auth): add AWS support. (close #31)`
+```shell
-
+feat(auth): add AWS support. (close #31)
-Note that your issue will be close after merging on master.
+```
-Before closing the issue, please check tests and update coverage. You might run :
 
 ```shell
 melos run test:all # this will run all tests in this project
@@ -179,45 +174,44 @@ melos run publish:validate # this will run a validation before publish packages
 melos run publish # this will publish packages
 ```
 
-> Note that only modified package will be verified and published.
+Please note that the issue will only be closed after it has been merged into the master branch. Before closing the issue, it is important to verify that all tests have been run and that coverage has been updated.
 
 #### Merge your work
 
-After closing your issue, some work may have been done on master in the meantime. To keep a clean git history, please rebase before opening a change request.
+When you have completed your work and closed the related issue, it's possible that some changes may have been made to the master branch in the meantime. To maintain a clean Git history, it's recommended to rebase before creating a change request (pull request).
 
 Two situations :
 
-- You have not yet created your branch and have committed locally :
+- You haven't created a branch yet and have made local commits:
 
 ```shell
 git pull --rebase
 ```
 
-- You are already working on your branch :
+- You are already working on a branch:
 
 ```shell
 git rebase -i master
 ```
 
-If possible, please use `--fixup` on your commit in interactive rebase.
+It's recommended to use the `--fixup` option during the interactive rebase to keep the Git history clean.
 
-Then, opend your PR, get the necessary approval and merge your work. Then you're done ✅.
+Once you have rebased, you can create a pull request, receive the necessary approvals, and then merge your work. And with that, you're done! 🎉
 
 #### Update version.
 
-Once your work is on the master, you can update your package version. Please filter packages to update only your package. `--scope` is used to do it.
+When your work has been merged into the master branch, it's time to update the package version. To update only your specific package, use the --scope option. For example, after merging changes into the `wyatt_notification_bloc` package, you can run the following command:
-For example, after merging changes on `wyatt_otification_bloc` package, you might run :
 
 ```shell
 melos version --scope="*wyatt_notification_bloc*"
 ```
 
-In fact, melos will filter all packages that match the `wyatt_notification_block` pattern.
+This will filter all packages that match the `wyatt_notification_bloc` pattern and update only that package.
 
-You can update check all packages tests by running :
+You can then verify that all packages and their tests are working correctly by running:
 
 ```shell
-melos run test
+melos run test:all
 ```
 
 #### Publish your package
@@ -265,14 +259,14 @@ Here you can change `package name` and `package version`.
 
 ---
 
-## Status
-
-![Status: Experimental](https://img.shields.io/badge/Status-WIP-red?style=flat-square)
-
-This repository is maintained by Wyatt Studio but work is in progress.
-
 ## Simple work flow diagramm
 
 To sum up, here a simple work flow diagramm.
 
 ![Dev Wokflow](doc/workflow.svg)
+
+## Status
+
+![Status: Experimental](https://img.shields.io/badge/Status-WIP-red?style=flat-square)
+
+This repository is maintained by Wyatt Studio but work is in progress.

mason-lock.json

@@ -1 +1 @@
-{"bricks":{"wyatt_clean_code":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_clean_code","ref":"033baa65408ec6b68e6a2ef43e64c24708ef16a1"}},"wyatt_feature_brick":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_feature_brick","ref":"033baa65408ec6b68e6a2ef43e64c24708ef16a1"}},"wyatt_package":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_package","ref":"033baa65408ec6b68e6a2ef43e64c24708ef16a1"}}}}
+{"bricks":{"wyatt_clean_code":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_clean_code","ref":"5009f1ef21d8531b773298c0fc08704d8f69afd1"}},"wyatt_feature_brick":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_feature_brick","ref":"5009f1ef21d8531b773298c0fc08704d8f69afd1"}},"wyatt_package_template":{"git":{"url":"ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git","path":"bricks/wyatt_package_template","ref":"5009f1ef21d8531b773298c0fc08704d8f69afd1"}}}}

mason.yaml

@@ -1,13 +1,13 @@
 bricks:
   wyatt_clean_code:
     git:
-      url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git
+      url: "ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git"
       path: bricks/wyatt_clean_code
   wyatt_feature_brick:
     git:
-      url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git
+      url: "ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git"
       path: bricks/wyatt_feature_brick
-  wyatt_package:
+  wyatt_package_template:
     git:
-      url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git
+      url: "ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-bricks.git"
-      path: bricks/wyatt_package
+      path: bricks/wyatt_package_template

packages/wyatt_analysis/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.0
+
+ - **FEAT**: add new lint rules.
+ - **DOCS**: add instructions to create a new version (closes #104).
+
 ## 2.3.0
 
  - **REFACTOR**: follow melos versioning.

packages/wyatt_analysis/README.md

@@ -1,5 +1,5 @@
 <!--
- * Copyright (C) 2022 WYATT GROUP
+ * Copyright (C) 2023 WYATT GROUP
  * Please see the AUTHORS file for details.
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -20,21 +20,21 @@
 
 ![SDK: Dart & Flutter](https://img.shields.io/badge/SDK-Dart%20%7C%20Flutter-blue?style=flat-square)
 
-This package provides lint rules for Dart and Flutter which are used at [Wyatt](https://wyattapp.io) and [Wyatt Studio](https://wyatt-studio.fr). For more information, see the complete list of options in **lib/analysis_options.2.3.0.yaml**.
+This package provides lint rules for Dart and Flutter which are used at [Wyatt](https://wyattapp.io) and [Wyatt Studio](https://wyatt-studio.fr). For more information, see the complete list of options in **lib/analysis_options.2.4.0.yaml**.
 
 **Note**: This package was heavily inspired by [pedantic](https://github.com/dart-lang/pedantic), [Very Good Analysis](https://github.com/VeryGoodOpenSource/very_good_analysis) and the official [flutter_lints](https://pub.dev/packages/flutter_lints).
 
 ## Usage
 
-To use the lints, add a dependency in your `pubspec.yaml`:
+To use the lints, add a dependency in your `pubspec.yaml` :
 
 ```yaml
 wyatt_analysis:
     hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub/
-    version: 2.3.0
+    version: 2.4.0
 ```
 
-Then, add an include in `analysis_options.yaml`:
+Then, add an include in `analysis_options.yaml` :
 
 ```yaml
 include: package:wyatt_analysis/analysis_options.yaml
@@ -49,13 +49,13 @@ include: package:wyatt_analysis/analysis_options.flutter.yaml
 If you wish to restrict the lint version, specify a version of `analysis_options.yaml` instead:
 
 ```yaml
-include: package:wyatt_analysis/analysis_options.flutter.2.3.0.yaml
+include: package:wyatt_analysis/analysis_options.flutter.2.4.0.yaml
 ```
 
 If you just want **Dart** version:
 
 ```yaml
-include: package:wyatt_analysis/analysis_options.2.3.0.yaml
+include: package:wyatt_analysis/analysis_options.2.4.0.yaml
 ```
 
 ## Suppressing Lints
@@ -87,7 +87,7 @@ class B {}
 
 ### Project Level
 
-To surpress a specific lint rule for an entire project, modify `analysis_options.yaml`:
+To surpress a specific lint rule for an entire project, modify `analysis_options.yaml` :
 
 ```yaml
 include: package:wyatt_analysis/analysis_options.yaml
@@ -104,6 +104,16 @@ To indicate your project is using `wyatt_analysis` → [![style: wyatt analysis]
 [![style: wyatt analysis](https://img.shields.io/badge/Style-Wyatt%20Analysis-blue)](https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_analysis)
 ```
 
+## Development
+
+When you want to create a new version of the plugin. Before any modification, execute the following command to create new files:
+
+```sh
+./new_version.sh <previous_version> <new_version>
+```
+> Where `<previous_version>` is 2.4.0
+
+
 ## Notes
 
 You can explore every lint rules [here](https://dart-lang.github.io/linter/lints/).

packages/wyatt_analysis/lib/analysis_options.2.4.0.yaml

@@ -0,0 +1,217 @@
+# Copyright (C) 2023 WYATT GROUP
+# Please see the AUTHORS file for details.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+analyzer:
+  language:
+    strict-casts: true
+    strict-inference: true
+    strict-raw-types: true
+
+  errors:
+    todo: info
+    close_sinks: ignore
+    missing_required_param: error
+    missing_return: error
+
+  exclude:
+    - lib/l10n/**
+    - lib/generated/**
+    - lib/gen/**
+    - lib/generated_plugin_registrant.dart
+    - test/.test_coverage.dart
+    - '**/*.g.dart'
+    - '**/*.freezed.dart'
+
+linter:
+  rules:
+    - always_declare_return_types
+    - always_put_control_body_on_new_line
+    - always_put_required_named_parameters_first
+    - always_require_non_null_named_parameters
+    - always_use_package_imports
+    - annotate_overrides
+    - avoid_bool_literals_in_conditional_expressions
+    - avoid_catching_errors
+    - avoid_double_and_int_checks
+    - avoid_dynamic_calls
+    - avoid_empty_else
+    - avoid_equals_and_hash_code_on_mutable_classes
+    - avoid_escaping_inner_quotes
+    - avoid_field_initializers_in_const_classes
+    - avoid_final_parameters
+    - avoid_function_literals_in_foreach_calls
+    - avoid_init_to_null
+    - avoid_js_rounded_ints
+    - avoid_multiple_declarations_per_line
+    - avoid_null_checks_in_equality_operators
+    - avoid_positional_boolean_parameters
+    - avoid_private_typedef_functions
+    - avoid_redundant_argument_values
+    - avoid_relative_lib_imports
+    - avoid_renaming_method_parameters
+    - avoid_return_types_on_setters
+    - avoid_returning_null
+    - avoid_returning_null_for_future
+    - avoid_returning_null_for_void
+    - avoid_returning_this
+    - avoid_setters_without_getters
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+    - avoid_slow_async_io
+    - avoid_type_to_string
+    - avoid_types_as_parameter_names
+    - avoid_types_on_closure_parameters
+    - avoid_unused_constructor_parameters
+    - avoid_void_async
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cancel_subscriptions
+    - cascade_invocations
+    - cast_nullable_to_non_nullable
+    - collection_methods_unrelated_type
+    - combinators_ordering
+    - comment_references
+    - conditional_uri_does_not_exist
+    - constant_identifier_names
+    - control_flow_in_finally
+    - curly_braces_in_flow_control_structures
+    - depend_on_referenced_packages
+    - deprecated_consistency
+    - directives_ordering
+    - empty_catches
+    - empty_constructor_bodies
+    - empty_statements
+    - eol_at_end_of_file
+    - exhaustive_cases
+    - file_names
+    - flutter_style_todos
+    - hash_and_equals
+    - implementation_imports
+    - implicit_call_tearoffs
+    - iterable_contains_unrelated_type
+    - join_return_with_assignment
+    - leading_newlines_in_multiline_strings
+    - library_names
+    - library_prefixes
+    - library_private_types_in_public_api
+    - lines_longer_than_80_chars
+    - list_remove_unrelated_type
+    - literal_only_boolean_expressions
+    - missing_whitespace_between_adjacent_strings
+    - no_adjacent_strings_in_list
+    - no_default_cases
+    - no_duplicate_case_values
+    - no_leading_underscores_for_library_prefixes
+    - no_leading_underscores_for_local_identifiers
+    - no_runtimeType_toString
+    - non_constant_identifier_names
+    - noop_primitive_operations
+    - null_check_on_nullable_type_parameter
+    - null_closures
+    - one_member_abstracts
+    - only_throw_errors
+    - overridden_fields
+    - package_api_docs
+    - package_names
+    - package_prefixed_library_names
+    - parameter_assignments
+    - prefer_adjacent_string_concatenation
+    - prefer_asserts_in_initializer_lists
+    - prefer_asserts_with_message
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_constructors_over_static_methods
+    - prefer_contains
+    - prefer_equal_for_default_values
+    - prefer_expression_function_bodies
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    - prefer_for_elements_to_map_fromIterable
+    - prefer_function_declarations_over_variables
+    - prefer_generic_function_type_aliases
+    - prefer_if_elements_to_conditional_expressions
+    - prefer_if_null_operators
+    - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_int_literals
+    - prefer_interpolation_to_compose_strings
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_is_not_operator
+    - prefer_iterable_whereType
+    - prefer_mixin
+    - prefer_null_aware_method_calls
+    - prefer_null_aware_operators
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - prefer_typing_uninitialized_variables
+    - prefer_void_to_null
+    - provide_deprecation_message
+    - recursive_getters
+    - require_trailing_commas
+    - slash_for_doc_comments
+    - sort_constructors_first
+    - sort_unnamed_constructors_first
+    - test_types_in_equals
+    - throw_in_finally
+    - tighten_type_of_initializing_formals
+    - type_annotate_public_apis
+    - type_init_formals
+    - unawaited_futures
+    - unnecessary_await_in_return
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_constructor_name
+    - unnecessary_getters_setters
+    - unnecessary_lambdas
+    - unnecessary_late
+    - unnecessary_new
+    - unnecessary_null_aware_assignments
+    - unnecessary_null_checks
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_nullable_for_final_variable_declarations
+    - unnecessary_overrides
+    - unnecessary_parenthesis
+    - unnecessary_raw_strings
+    - unnecessary_statements
+    - unnecessary_string_escapes
+    - unnecessary_string_interpolations
+    - unnecessary_this
+    - unnecessary_to_list_in_spreads
+    - unrelated_type_equality_checks
+    - unsafe_html
+    - use_enums
+    - use_function_type_syntax_for_parameters
+    - use_if_null_to_convert_nulls_to_bools
+    - use_is_even_rather_than_modulo
+    - use_late_for_private_fields_and_variables
+    - use_named_constants
+    - use_raw_strings
+    - use_rethrow_when_possible
+    - use_setters_to_change_properties
+    - use_string_buffers
+    - use_string_in_part_of_directives
+    - use_super_parameters
+    - use_test_throws_matchers
+    - use_to_and_as_if_applicable
+    - valid_regexps
+    - void_checks

packages/wyatt_analysis/lib/analysis_options.flutter.2.4.0.yaml

@@ -0,0 +1,32 @@
+# Copyright (C) 2023 WYATT GROUP
+# Please see the AUTHORS file for details.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+include: package:wyatt_analysis/analysis_options.2.4.0.yaml
+
+linter:
+  rules:
+    - avoid_print
+    - avoid_unnecessary_containers
+    - avoid_web_libraries_in_flutter
+    - no_logic_in_create_state
+    - sized_box_for_whitespace
+    - sized_box_shrink_expand
+    - sort_child_properties_last
+    - use_build_context_synchronously
+    - use_colored_box
+    - use_decorated_box
+    - use_full_hex_values_for_flutter_colors
+    - use_key_in_widget_constructors

packages/wyatt_analysis/lib/analysis_options.flutter.yaml

@@ -1,5 +1,4 @@
-
+# Copyright (C) 2023 WYATT GROUP
-# Copyright (C) 2022 WYATT GROUP
 # Please see the AUTHORS file for details.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -15,5 +14,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-include: package:wyatt_analysis/analysis_options.flutter.2.3.0.yaml
+include: package:wyatt_analysis/analysis_options.flutter.2.4.0.yaml
 

packages/wyatt_analysis/lib/analysis_options.yaml

@@ -1,5 +1,4 @@
-
+# Copyright (C) 2023 WYATT GROUP
-# Copyright (C) 2022 WYATT GROUP
 # Please see the AUTHORS file for details.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -15,5 +14,5 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-include: package:wyatt_analysis/analysis_options.2.3.0.yaml
+include: package:wyatt_analysis/analysis_options.2.4.0.yaml
 

packages/wyatt_analysis/lib/wyatt_analysis.dart

@@ -1,4 +1,4 @@
-// Copyright (C) 2022 WYATT GROUP
+// Copyright (C) 2023 WYATT GROUP
 // Please see the AUTHORS file for details.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -18,4 +18,4 @@
 /// used internally at [Wyatt Studio](https://wyatt-studio.fr).
 library wyatt_analysis;
 
-const String wyattAnalysisVersion = '2.3.0';
+const String wyattAnalysisVersion = '2.4.0';

packages/wyatt_analysis/pubspec.yaml

@@ -1,7 +1,23 @@
+# Copyright (C) 2023 WYATT GROUP
+# Please see the AUTHORS file for details.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 name: wyatt_analysis
 description: Lint rules for Dart and Flutter used internally at Wyatt Studio.
 repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_analysis
-version: 2.3.0
+version: 2.4.0
 
 publish_to: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
 

packages/wyatt_architecture/example/lib/data/data_sources/remote/album_api_data_source_impl.dart

@@ -24,9 +24,8 @@ import 'package:wyatt_http_client/wyatt_http_client.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class AlbumApiDataSourceImpl extends AlbumRemoteDataSource {
-  final MiddlewareClient _client;
-
   AlbumApiDataSourceImpl(this._client);
+  final MiddlewareClient _client;
 
   @override
   Future<Album> getAlbum(int id) async {

packages/wyatt_architecture/example/lib/data/data_sources/remote/photo_api_data_source_impl.dart

@@ -24,9 +24,8 @@ import 'package:wyatt_http_client/wyatt_http_client.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class PhotoApiDataSourceImpl extends PhotoRemoteDataSource {
-  final MiddlewareClient _client;
-
   PhotoApiDataSourceImpl(this._client);
+  final MiddlewareClient _client;
 
   @override
   Future<Photo> getPhoto(int id) async {

packages/wyatt_architecture/example/lib/data/repositories/photo_repository_impl.dart

@@ -24,15 +24,15 @@ import 'package:wyatt_architecture/wyatt_architecture.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class PhotoRepositoryImpl extends PhotoRepository {
-  final PhotoRemoteDataSource _photoRemoteDataSource;
-  final AlbumRemoteDataSource _albumRemoteDataSource;
-  final FavoriteLocalDataSource _favoriteLocalDataSource;
 
   PhotoRepositoryImpl(
     this._photoRemoteDataSource,
     this._albumRemoteDataSource,
     this._favoriteLocalDataSource,
   );
+  final PhotoRemoteDataSource _photoRemoteDataSource;
+  final AlbumRemoteDataSource _albumRemoteDataSource;
+  final FavoriteLocalDataSource _favoriteLocalDataSource;
 
   @override
   FutureOrResult<void> addPhotoToFavorites(Photo photo) => Result.tryCatchAsync(

packages/wyatt_architecture/example/lib/domain/usecases/photos/add_photo_to_favorites.dart

@@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart';
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class AddPhotoToFavorites extends AsyncUseCase<Photo, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   AddPhotoToFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(Photo? params) async {

packages/wyatt_architecture/example/lib/domain/usecases/photos/check_if_photo_is_in_favorites.dart

@@ -20,9 +20,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart';
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class CheckIfPhotoIsInFavorites extends AsyncUseCase<int, bool> {
-  final PhotoRepository _photoRepository;
 
   CheckIfPhotoIsInFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<bool> execute(int? params) async =>

packages/wyatt_architecture/example/lib/domain/usecases/photos/display_favorites.dart

@@ -19,9 +19,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart';
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class DisplayFavorites extends AsyncUseCase<NoParam, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   DisplayFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(void params) {

packages/wyatt_architecture/example/lib/domain/usecases/photos/display_photo.dart

@@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart';
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class DisplayPhoto extends AsyncUseCase<int, Photo> {
-  final PhotoRepository _photoRepository;
 
   DisplayPhoto(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<Photo> execute(int? params) {

packages/wyatt_architecture/example/lib/domain/usecases/photos/open_album.dart

@@ -22,9 +22,9 @@ import 'package:architecture_example/domain/usecases/photos/params/query_paramet
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class OpenAlbum extends AsyncUseCase<QueryParameters, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   OpenAlbum(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(QueryParameters? params) {

packages/wyatt_architecture/example/lib/domain/usecases/photos/params/query_parameters.dart

@@ -15,9 +15,9 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 class QueryParameters {
+
+  QueryParameters(this.start, this.limit, {this.albumId = -1});
   final int albumId;
   final int? start;
   final int? limit;
-
-  QueryParameters(this.start, this.limit, {this.albumId = -1});
 }

packages/wyatt_architecture/example/lib/domain/usecases/photos/remove_photo_from_favorites.dart

@@ -21,9 +21,9 @@ import 'package:architecture_example/domain/repositories/photo_repository.dart';
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class RemovePhotoFromFavorites extends AsyncUseCase<int, List<Photo>> {
-  final PhotoRepository _photoRepository;
 
   RemovePhotoFromFavorites(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Photo>> execute(int? params) async {

packages/wyatt_architecture/example/lib/domain/usecases/photos/retrieve_all_albums.dart

@@ -22,9 +22,9 @@ import 'package:architecture_example/domain/usecases/photos/params/query_paramet
 import 'package:wyatt_architecture/wyatt_architecture.dart';
 
 class RetrieveAllAlbums extends AsyncUseCase<QueryParameters, List<Album>> {
-  final PhotoRepository _photoRepository;
 
   RetrieveAllAlbums(this._photoRepository);
+  final PhotoRepository _photoRepository;
 
   @override
   FutureOrResult<List<Album>> execute(QueryParameters? params) {

packages/wyatt_architecture/example/lib/presentation/features/albums/blocs/album/album_bloc.dart

@@ -33,7 +33,6 @@ EventTransformer<E> throttleDroppable<E>(Duration duration) =>
     (events, mapper) => droppable<E>().call(events.throttle(duration), mapper);
 
 class AlbumBloc extends Bloc<AlbumEvent, AlbumState> {
-  final RetrieveAllAlbums _retrieveAllAlbums;
 
   AlbumBloc(this._retrieveAllAlbums) : super(const AlbumState()) {
     on<AlbumFetched>(
@@ -41,6 +40,7 @@ class AlbumBloc extends Bloc<AlbumEvent, AlbumState> {
       transformer: throttleDroppable(throttleDuration),
     );
   }
+  final RetrieveAllAlbums _retrieveAllAlbums;
 
   Future<void> _onAlbumFetched(
     AlbumFetched event,

packages/wyatt_architecture/example/lib/presentation/features/photo_details/blocs/photo_details/photo_details_state.dart

@@ -26,19 +26,19 @@ abstract class PhotoDetailsState extends Equatable {
 class PhotoDetailsInitial extends PhotoDetailsState {}
 
 class PhotoDetailsSuccess extends PhotoDetailsState {
-  final Photo photo;
-  final bool isFavorite;
 
   const PhotoDetailsSuccess(this.photo, {required this.isFavorite});
+  final Photo photo;
+  final bool isFavorite;
 
   @override
   List<Object> get props => [photo, isFavorite];
 }
 
 class PhotoDetailsFailure extends PhotoDetailsState {
-  final String error;
 
   const PhotoDetailsFailure(this.error);
+  final String error;
 
   @override
   List<Object> get props => [error];

packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_cubit.dart

@@ -23,10 +23,10 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 part 'favorite_checker_state.dart';
 
 class FavoriteCheckerCubit extends Cubit<FavoriteCheckerState> {
-  final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites;
 
   FavoriteCheckerCubit(this._checkIfPhotoIsInFavorites)
       : super(FavoriteCheckerInitial());
+  final CheckIfPhotoIsInFavorites _checkIfPhotoIsInFavorites;
 
   FutureOr<void> checkIfPhotoIsInFavorites(int photoId) async {
     final response = await _checkIfPhotoIsInFavorites.call(photoId);

packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/favorite_checker/favorite_checker_state.dart

@@ -10,19 +10,19 @@ abstract class FavoriteCheckerState extends Equatable {
 class FavoriteCheckerInitial extends FavoriteCheckerState {}
 
 class FavoriteCheckerSuccess extends FavoriteCheckerState {
-  final int photoId;
-  final bool isFavorite;
 
   const FavoriteCheckerSuccess(this.photoId, {required this.isFavorite});
+  final int photoId;
+  final bool isFavorite;
 
   @override
   List<Object> get props => [photoId, isFavorite];
 }
 
 class FavoriteCheckerFailure extends FavoriteCheckerState {
-  final String error;
 
   const FavoriteCheckerFailure(this.error);
+  final String error;
 
   @override
   List<Object> get props => [error];

packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_bloc.dart

@@ -33,7 +33,6 @@ EventTransformer<E> throttleDroppable<E>(Duration duration) =>
     (events, mapper) => droppable<E>().call(events.throttle(duration), mapper);
 
 class PhotoBloc extends Bloc<PhotoEvent, PhotoState> {
-  final OpenAlbum _openAlbum;
 
   PhotoBloc(this._openAlbum) : super(const PhotoState()) {
     on<PhotoFetched>(
@@ -41,6 +40,7 @@ class PhotoBloc extends Bloc<PhotoEvent, PhotoState> {
       transformer: throttleDroppable(throttleDuration),
     );
   }
+  final OpenAlbum _openAlbum;
 
   Future<void> _onPhotoFetched(
     PhotoFetched event,

packages/wyatt_architecture/example/lib/presentation/features/photos/blocs/photo/photo_event.dart

@@ -24,7 +24,7 @@ abstract class PhotoEvent extends Equatable {
 }
 
 class PhotoFetched extends PhotoEvent {
-  final int albumId;
 
   const PhotoFetched(this.albumId);
+  final int albumId;
 }

packages/wyatt_architecture/example/pubspec.yaml

@@ -67,7 +67,7 @@ dev_dependencies:
   wyatt_analysis:
     git:
       url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages
-      ref: wyatt_analysis-v2.3.0
+      ref: wyatt_analysis-v2.4.0
       path: packages/wyatt_analysis
 
 # For information on the generic Dart part of this file, see the

packages/wyatt_architecture/lib/src/core/exceptions/exceptions.dart

@@ -17,9 +17,9 @@
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 abstract class AppException implements Exception {
-  final String? message;
 
   AppException([this.message]);
+  final String? message;
 
   @override
   String toString() {

packages/wyatt_architecture/pubspec.yaml

@@ -24,4 +24,4 @@ dev_dependencies:
   
   wyatt_analysis:
     hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
-    version: ^2.3.0
+    version: ^2.4.0

packages/wyatt_authentication_bloc/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.4.1
+
+ - **REFACTOR**: use fromFirebaseUser factory to parse user.
+ - **REFACTOR**: update deps and re-export them.
+ - **FIX**: fix mock on register.
+ - **FEAT**: add google sign in in signIn cubit.
+ - **FEAT**: add google sign in parameter in firebase data source constructor.
+ - **FEAT**: add google sign_in support (closes #59).
+ - **FEAT**: add reauthenticate, updateEmail and updatePassword.
+ - **DOCS**: add correct header.
+
 ## 0.4.0+3
 
  - Update a dependency to the latest release.

packages/wyatt_authentication_bloc/analysis_options.yaml

@@ -1,4 +1 @@
 include: package:wyatt_analysis/analysis_options.flutter.yaml
-
-analyzer:
-  exclude: "!example/**"

packages/wyatt_authentication_bloc/example/.gitignore

@@ -45,5 +45,3 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
-
-firebase_options.dart

packages/wyatt_authentication_bloc/example/.vscode/launch.json

@@ -4,7 +4,7 @@
  * -----
  * File: launch.json
  * Created Date: 19/08/2022 15:12:25
- * Last Modified: 19/08/2022 15:22:02
+ * Last Modified: Tue Dec 13 2022
  * -----
  * Copyright (c) 2022
  */
@@ -15,11 +15,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "example_router",
+            "name": "Mock",
             "request": "launch",
             "type": "dart",
             "program": "lib/main.dart",
             "flutterMode": "debug"
+        },
+        {
+            "name": "Firebase",
+            "request": "launch",
+            "type": "dart",
+            "program": "lib/main_firebase.dart",
+            "flutterMode": "debug"
         }
     ]
 }

packages/wyatt_authentication_bloc/example/ios/Podfile.lock

@@ -5,41 +5,30 @@ PODS:
   - AppAuth/Core (1.6.0)
   - AppAuth/ExternalUserAgent (1.6.0):
     - AppAuth/Core
-  - FBAEMKit (14.1.0):
+  - Firebase/Auth (10.3.0):
-    - FBSDKCoreKit_Basics (= 14.1.0)
-  - FBSDKCoreKit (14.1.0):
-    - FBAEMKit (= 14.1.0)
-    - FBSDKCoreKit_Basics (= 14.1.0)
-  - FBSDKCoreKit_Basics (14.1.0)
-  - FBSDKLoginKit (14.1.0):
-    - FBSDKCoreKit (= 14.1.0)
-  - Firebase/Auth (10.0.0):
     - Firebase/CoreOnly
-    - FirebaseAuth (~> 10.0.0)
+    - FirebaseAuth (~> 10.3.0)
-  - Firebase/CoreOnly (10.0.0):
+  - Firebase/CoreOnly (10.3.0):
-    - FirebaseCore (= 10.0.0)
+    - FirebaseCore (= 10.3.0)
-  - firebase_auth (4.1.1):
+  - firebase_auth (4.2.0):
-    - Firebase/Auth (= 10.0.0)
+    - Firebase/Auth (= 10.3.0)
     - firebase_core
     - Flutter
-  - firebase_core (2.1.1):
+  - firebase_core (2.4.0):
-    - Firebase/CoreOnly (= 10.0.0)
+    - Firebase/CoreOnly (= 10.3.0)
     - Flutter
-  - FirebaseAuth (10.0.0):
+  - FirebaseAuth (10.3.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 7.8)
     - GoogleUtilities/Environment (~> 7.8)
-    - GTMSessionFetcher/Core (~> 2.1)
+    - GTMSessionFetcher/Core (< 4.0, >= 2.1)
-  - FirebaseCore (10.0.0):
+  - FirebaseCore (10.3.0):
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.1.0):
+  - FirebaseCoreInternal (10.3.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - Flutter (1.0.0)
-  - flutter_facebook_auth (4.4.1):
-    - FBSDKLoginKit (= 14.1.0)
-    - Flutter
   - google_sign_in_ios (0.0.1):
     - Flutter
     - GoogleSignIn (~> 6.2)
@@ -47,47 +36,36 @@ PODS:
     - AppAuth (~> 1.5)
     - GTMAppAuth (~> 1.3)
     - GTMSessionFetcher/Core (< 3.0, >= 1.1)
-  - GoogleUtilities/AppDelegateSwizzler (7.8.0):
+  - GoogleUtilities/AppDelegateSwizzler (7.10.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.8.0):
+  - GoogleUtilities/Environment (7.10.0):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.8.0):
+  - GoogleUtilities/Logger (7.10.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.8.0):
+  - GoogleUtilities/Network (7.10.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.8.0)"
+  - "GoogleUtilities/NSData+zlib (7.10.0)"
-  - GoogleUtilities/Reachability (7.8.0):
+  - GoogleUtilities/Reachability (7.10.0):
     - GoogleUtilities/Logger
   - GTMAppAuth (1.3.1):
     - AppAuth/Core (~> 1.6)
     - GTMSessionFetcher/Core (< 3.0, >= 1.5)
-  - GTMSessionFetcher/Core (2.1.0)
+  - GTMSessionFetcher/Core (2.3.0)
   - PromisesObjC (2.1.1)
-  - sign_in_with_apple (0.0.1):
-    - Flutter
-  - twitter_login (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
   - firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - Flutter (from `Flutter`)
-  - flutter_facebook_auth (from `.symlinks/plugins/flutter_facebook_auth/ios`)
   - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/ios`)
-  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
-  - twitter_login (from `.symlinks/plugins/twitter_login/ios`)
 
 SPEC REPOS:
   trunk:
     - AppAuth
-    - FBAEMKit
-    - FBSDKCoreKit
-    - FBSDKCoreKit_Basics
-    - FBSDKLoginKit
     - Firebase
     - FirebaseAuth
     - FirebaseCore
@@ -105,37 +83,24 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/firebase_core/ios"
   Flutter:
     :path: Flutter
-  flutter_facebook_auth:
-    :path: ".symlinks/plugins/flutter_facebook_auth/ios"
   google_sign_in_ios:
     :path: ".symlinks/plugins/google_sign_in_ios/ios"
-  sign_in_with_apple:
-    :path: ".symlinks/plugins/sign_in_with_apple/ios"
-  twitter_login:
-    :path: ".symlinks/plugins/twitter_login/ios"
 
 SPEC CHECKSUMS:
   AppAuth: 8fca6b5563a5baef2c04bee27538025e4ceb2add
-  FBAEMKit: a899515e45476027f73aef377b5cffadcd56ca3a
+  Firebase: f92fc551ead69c94168d36c2b26188263860acd9
-  FBSDKCoreKit: 24f8bc8d3b5b2a8c5c656a1329492a12e8efa792
+  firebase_auth: 579a0dc15451491cc83fccaa5102296635f24938
-  FBSDKCoreKit_Basics: 6e578c9bdc7aa1365dbbbde633c9ebb536bcaa98
+  firebase_core: 6f2f753e316765799d88568232ed59e300ff53db
-  FBSDKLoginKit: 787de205d524c3a4b17d527916f1d066e4361660
+  FirebaseAuth: 0e415d29d846c1dce2fb641e46f35e9888d9bec6
-  Firebase: 1b810f3d0c0532e27a48f1961f8c0400a668a2cf
+  FirebaseCore: 988754646ab3bd4bdcb740f1bfe26b9f6c0d5f2a
-  firebase_auth: dd33e93fce72a1c72040f7380dacf06e89db5705
+  FirebaseCoreInternal: 29b76f784d607df8b2a1259d73c3f04f1210137b
-  firebase_core: 5c0bb0ca7d0e70480a68a6e9ad9bf55d1edd5305
-  FirebaseAuth: 493382cf533cc45e2862b00e9aa4cfe4c98daf71
-  FirebaseCore: 97f48a3a567a72b8d4daa0f03c3aadb78df4e995
-  FirebaseCoreInternal: 96d75228e10fd369564da51bd898414eb0f54df5
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
-  flutter_facebook_auth: 361ac7a57263ebf327f26089507ead0d66558ee8
   google_sign_in_ios: 4f85eb9f937450765c8573bb85fd8cd6a5af675c
   GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a
-  GoogleUtilities: 1d20a6ad97ef46f67bbdec158ce00563a671ebb7
+  GoogleUtilities: bad72cb363809015b1f7f19beb1f1cd23c589f95
   GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
-  GTMSessionFetcher: ffbb25ec00ebcb5201adab0a56d808f6f1902d9f
+  GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
   PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
-  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
-  twitter_login: 2794db69b7640681171b17b3c2c84ad9dfb4a57f
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 

packages/wyatt_authentication_bloc/example/ios/Runner/Info.plist

@@ -28,6 +28,17 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>com.googleusercontent.apps.405351917235-2jv4ff02kovoim58f8d6d0rsa14apgkj</string>
+			</array>
+		</dict>
+	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

packages/wyatt_authentication_bloc/example/ios/firebase_app_id_file.json

@@ -1,7 +1,7 @@
 {
   "file_generated_by": "FlutterFire CLI",
   "purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
-  "GOOGLE_APP_ID": "1:136771801992:ios:bcdca68d2b7d227097203d",
+  "GOOGLE_APP_ID": "1:405351917235:ios:869f0ad8ace08db899f2c6",
-  "FIREBASE_PROJECT_ID": "tchat-beta",
+  "FIREBASE_PROJECT_ID": "meerabel-dev",
-  "GCM_SENDER_ID": "136771801992"
+  "GCM_SENDER_ID": "405351917235"
 }

packages/wyatt_authentication_bloc/example/lib/bootstrap.dart

@@ -18,9 +18,47 @@ import 'dart:async';
 
 import 'package:example_router/core/dependency_injection/get_it.dart';
 import 'package:example_router/core/utils/app_bloc_observer.dart';
+import 'package:example_router/firebase_options.dart';
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
+class MockSettings {
+  static MockSettings? _instance;
+
+  /// Data source mode
+  late bool enable = false;
+
+  MockSettings._(this.enable);
+
+  factory MockSettings.enable() {
+    _instance ??= MockSettings._(true);
+    if (_instance!.enable != true) {
+      throw Exception('Mock already initialized in: ${_instance!.enable}');
+    }
+    return _instance!;
+  }
+
+  factory MockSettings.disable() {
+    _instance ??= MockSettings._(false);
+    if (_instance!.enable != false) {
+      throw Exception('Mock already initialized in: ${_instance!.enable}');
+    }
+    return _instance!;
+  }
+
+  static bool isEnable() {
+    if (_instance == null) {
+      throw Exception('MockSettings not initialized!');
+    }
+    return _instance!.enable == true;
+  }
+
+  static bool isDisable() {
+    return !isEnable();
+  }
+}
+
 Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
   await runZonedGuarded(
     () async {
@@ -30,6 +68,12 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
       FlutterError.onError = (details) {
         debugPrint(details.toString());
       };
+
+      if (MockSettings.isDisable()) {
+        await Firebase.initializeApp(
+          options: DefaultFirebaseOptions.currentPlatform,
+        );
+      }
       await GetItInitializer.init();
 
       runApp(await builder());

packages/wyatt_authentication_bloc/example/lib/core/dependency_injection/get_it.dart

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
+import 'package:example_router/bootstrap.dart';
+import 'package:example_router/firebase_options.dart';
 import 'package:get_it/get_it.dart';
 import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
@@ -24,7 +26,8 @@ abstract class GetItInitializer {
   static Future<void> init() async {
     getIt
       ..registerLazySingleton<AuthenticationRemoteDataSource>(
-        () => AuthenticationMockDataSourceImpl(registeredAccounts: [
+        MockSettings.isEnable()
+            ? () => AuthenticationMockDataSourceImpl(registeredAccounts: [
                   Pair(
                     AccountModel(
                       uid: '1',
@@ -45,7 +48,10 @@ abstract class GetItInitializer {
                     ),
                     'tata1234',
                   ),
-        ]),
+                ])
+            : () => AuthenticationFirebaseDataSourceImpl(
+                googleSignIn: GoogleSignIn(
+                    clientId: DefaultFirebaseOptions.ios.iosClientId)),
       )
       ..registerLazySingleton<AuthenticationCacheDataSource<int>>(
         () => AuthenticationCacheDataSourceImpl<int>(),

packages/wyatt_authentication_bloc/example/lib/firebase_options.dart

@@ -0,0 +1,67 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      throw UnsupportedError(
+        'DefaultFirebaseOptions have not been configured for web - '
+        'you can reconfigure this by running the FlutterFire CLI again.',
+      );
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for android - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for macos - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.windows:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for windows - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyDDmtf0KN7Xw12_pqUsxoBfAxMuvCMmMmk',
+    appId: '1:405351917235:ios:869f0ad8ace08db899f2c6',
+    messagingSenderId: '405351917235',
+    projectId: 'meerabel-dev',
+    storageBucket: 'meerabel-dev.appspot.com',
+    androidClientId:
+        '405351917235-4g1dh3475tq6t1sa2qoh7ol60nf4ta05.apps.googleusercontent.com',
+    iosClientId:
+        '405351917235-2jv4ff02kovoim58f8d6d0rsa14apgkj.apps.googleusercontent.com',
+    iosBundleId: 'com.example.exampleRouter',
+  );
+}

packages/wyatt_authentication_bloc/example/lib/main.dart

@@ -18,5 +18,6 @@ import 'package:example_router/bootstrap.dart';
 import 'package:example_router/presentation/features/app/app.dart';
 
 void main() {
+  MockSettings.enable();
   bootstrap(App.new);
 }

packages/wyatt_authentication_bloc/example/lib/main_firebase.dart

@@ -14,26 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'dart:convert';
+import 'package:example_router/bootstrap.dart';
-import 'dart:math';
+import 'package:example_router/presentation/features/app/app.dart';
 
-import 'package:crypto/crypto.dart';
+void main() {
-
+  MockSettings.disable();
-class Cryptography {
+  bootstrap(App.new);
-  /// Generates a cryptographically secure random nonce, to be included in a
-  /// credential request.
-  static String generateNonce([int length = 32]) {
-    const charset =
-        '0123456789ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyz-._';
-    final random = Random.secure();
-    return List.generate(length, (_) => charset[random.nextInt(charset.length)])
-        .join();
-  }
-
-  /// Returns the sha256 hash of [input] in hex notation.
-  static String sha256ofString(String input) {
-    final bytes = utf8.encode(input);
-    final digest = sha256.convert(bytes);
-    return digest.toString();
-  }
 }

packages/wyatt_authentication_bloc/example/lib/presentation/features/sign_in/widgets/sign_in_form.dart

@@ -94,6 +94,22 @@ class _SignInAnonymouslyButton extends StatelessWidget {
   }
 }
 
+class _SignInWithGoogleButton extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return SubmitBuilder<SignInCubit<int>>(
+      builder: ((context, cubit, status) {
+        return status.isSubmissionInProgress
+            ? const CircularProgressIndicator()
+            : ElevatedButton(
+                onPressed: () => cubit.signInWithGoogle(),
+                child: const Text('Sign in Google'),
+              );
+      }),
+    );
+  }
+}
+
 class SignInForm extends StatelessWidget {
   const SignInForm({Key? key}) : super(key: key);
 
@@ -116,6 +132,8 @@ class SignInForm extends StatelessWidget {
             _SignInButton(),
             const SizedBox(height: 16),
             _SignInAnonymouslyButton(),
+            const SizedBox(height: 16),
+            _SignInWithGoogleButton(),
           ],
         ),
       ),

packages/wyatt_authentication_bloc/example/lib/presentation/features/sub/sub_page.dart

@@ -30,10 +30,12 @@ class SubPage extends StatelessWidget {
         title: const Text('Sub'),
         actions: [
           IconButton(
-              onPressed: () => context.read<AuthenticationCubit<int>>().signOut(),
+              onPressed: () =>
+                  context.read<AuthenticationCubit<int>>().signOut(),
               icon: const Icon(Icons.logout_rounded)),
           IconButton(
-              onPressed: () => context.read<AuthenticationRepository<int>>().refresh(),
+              onPressed: () =>
+                  context.read<AuthenticationRepository<int>>().refresh(),
               icon: const Icon(Icons.refresh))
         ],
       ),

packages/wyatt_authentication_bloc/example/test/widget_test.dart

@@ -0,0 +1 @@
+

packages/wyatt_authentication_bloc/lib/src/core/core.dart

@@ -18,4 +18,3 @@ export 'constants/form_field.dart';
 export 'constants/form_name.dart';
 export 'enums/enums.dart';
 export 'exceptions/exceptions.dart';
-export 'utils/utils.dart';

packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions.dart

@@ -20,15 +20,14 @@ part 'exceptions_firebase.dart';
 
 abstract class AuthenticationFailureInterface extends AppException
     implements Exception {
+  AuthenticationFailureInterface(this.code, this.msg);
+  AuthenticationFailureInterface.fromCode(this.code)
+      : msg = 'An unknown error occurred.';
   String code;
   String msg;
 
   @override
   String get message => msg;
-
-  AuthenticationFailureInterface(this.code, this.msg);
-  AuthenticationFailureInterface.fromCode(this.code)
-      : msg = 'An unknown error occurred.';
 }
 
 /// {@template apply_action_code_failure}
@@ -277,3 +276,10 @@ abstract class UpdatePasswordFailureInterface
 
   UpdatePasswordFailureInterface.fromCode(super.code) : super.fromCode();
 }
+
+abstract class ModelParsingFailureInterface
+    extends AuthenticationFailureInterface {
+  ModelParsingFailureInterface(super.code, super.msg);
+
+  ModelParsingFailureInterface.fromCode(super.code) : super.fromCode();
+}

packages/wyatt_authentication_bloc/lib/src/core/exceptions/exceptions_firebase.dart

@@ -349,3 +349,10 @@ class UpdatePasswordFailureFirebase extends UpdatePasswordFailureInterface {
     }
   }
 }
+
+class ModelParsingFailureFirebase extends ModelParsingFailureInterface {
+  ModelParsingFailureFirebase([String? code, String? msg])
+      : super(code ?? 'unknown', msg ?? 'An unknown error occurred.');
+
+  ModelParsingFailureFirebase.fromCode(super.code) : super.fromCode();
+}

packages/wyatt_authentication_bloc/lib/src/data/data_sources/local/authentication_cache_data_source_impl.dart

@@ -20,11 +20,10 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class AuthenticationCacheDataSourceImpl<T extends Object>
     extends AuthenticationCacheDataSource<T> {
+  AuthenticationCacheDataSourceImpl();
   Account? _account;
   T? _data;
 
-  AuthenticationCacheDataSourceImpl();
-
   @override
   Future<void> storeAccount(Account? account) async {
     _account = account;

packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_firebase_data_source_impl.dart

@@ -14,34 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:firebase_auth/firebase_auth.dart';
+import 'package:wyatt_authentication_bloc/src/data/models/account_model_firebase.dart';
 import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class AuthenticationFirebaseDataSourceImpl
     extends AuthenticationRemoteDataSource {
+  AuthenticationFirebaseDataSourceImpl({
+    FirebaseAuth? firebaseAuth,
+    GoogleSignIn? googleSignIn,
+  })  : _firebaseAuth = firebaseAuth ?? FirebaseAuth.instance,
+        _googleSignIn = googleSignIn ?? GoogleSignIn();
+
   final FirebaseAuth _firebaseAuth;
+  final GoogleSignIn _googleSignIn;
   UserCredential? _latestCreds;
 
-  AuthenticationFirebaseDataSourceImpl({FirebaseAuth? firebaseAuth})
-      : _firebaseAuth = firebaseAuth ?? FirebaseAuth.instance;
-
-  Account _mapper(User user) => AccountModel(
-        uid: user.uid,
-        emailVerified: user.emailVerified,
-        isAnonymous: user.isAnonymous,
-        providerId: user.providerData.first.providerId,
-        creationTime: user.metadata.creationTime,
-        lastSignInTime: user.metadata.lastSignInTime,
-        isNewUser: (user.metadata.creationTime != null &&
-                user.metadata.lastSignInTime != null)
-            ? user.metadata.lastSignInTime! == user.metadata.creationTime!
-            : null,
-        email: user.email,
-        phoneNumber: user.phoneNumber,
-        photoURL: user.photoURL,
-      );
-
   @override
   Future<Account> signInWithEmailAndPassword({
     required String email,
@@ -54,11 +42,7 @@ class AuthenticationFirebaseDataSourceImpl
       );
       _latestCreds = userCredential;
       final user = userCredential.user;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw SignInWithEmailAndPasswordFailureFirebase.fromCode(e.code);
     } catch (_) {
@@ -80,11 +64,7 @@ class AuthenticationFirebaseDataSourceImpl
       );
       _latestCreds = userCredential;
       final user = userCredential.user;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw SignUpWithEmailAndPasswordFailureFirebase.fromCode(e.code);
     } catch (_) {
@@ -121,8 +101,11 @@ class AuthenticationFirebaseDataSourceImpl
   @override
   Stream<Account?> streamAccount() =>
       _firebaseAuth.userChanges().map<Account?>((user) {
-        final Account? account = (user.isNotNull) ? _mapper(user!) : null;
+        try {
-        return account;
+          return AccountModelFirebase.fromFirebaseUser(user);
+        } on FirebaseAuthException {
+          return null;
+        }
       });
 
   @override
@@ -170,11 +153,7 @@ class AuthenticationFirebaseDataSourceImpl
       final userCredential = await _firebaseAuth.signInAnonymously();
       _latestCreds = userCredential;
       final user = userCredential.user;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw SignInAnonymouslyFailureFirebase.fromCode(e.code);
     } catch (_) {
@@ -182,6 +161,35 @@ class AuthenticationFirebaseDataSourceImpl
     }
   }
 
+  @override
+  Future<Account> signInWithGoogle() async {
+    try {
+      // Trigger the authentication flow
+      final GoogleSignInAccount? googleUser = await _googleSignIn.signIn();
+
+      // Obtain the auth details from the request
+      final GoogleSignInAuthentication? googleAuth =
+          await googleUser?.authentication;
+
+      // Create a new credential
+      final credential = GoogleAuthProvider.credential(
+        accessToken: googleAuth?.accessToken,
+        idToken: googleAuth?.idToken,
+      );
+
+      final userCredential =
+          await _firebaseAuth.signInWithCredential(credential);
+
+      _latestCreds = userCredential;
+      final user = userCredential.user;
+      return AccountModelFirebase.fromFirebaseUser(user);
+    } on FirebaseAuthException catch (e) {
+      throw SignInWithGoogleFailureFirebase.fromCode(e.code);
+    } catch (_) {
+      throw SignInWithGoogleFailureFirebase();
+    }
+  }
+
   @override
   Future<bool> verifyPasswordResetCode({required String code}) async {
     try {
@@ -215,11 +223,7 @@ class AuthenticationFirebaseDataSourceImpl
         throw Exception(); // Get caught just after.
       }
       final user = _firebaseAuth.currentUser;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw ReauthenticateFailureFirebase.fromCode(e.code);
     } catch (_) {
@@ -232,11 +236,7 @@ class AuthenticationFirebaseDataSourceImpl
     try {
       await _firebaseAuth.currentUser!.updateEmail(email);
       final user = _firebaseAuth.currentUser;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw UpdateEmailFailureFirebase.fromCode(e.code);
     } catch (_) {
@@ -249,11 +249,7 @@ class AuthenticationFirebaseDataSourceImpl
     try {
       await _firebaseAuth.currentUser!.updatePassword(password);
       final user = _firebaseAuth.currentUser;
-      if (user.isNotNull) {
+      return AccountModelFirebase.fromFirebaseUser(user);
-        return _mapper(user!);
-      } else {
-        throw Exception(); // Get caught just after.
-      }
     } on FirebaseAuthException catch (e) {
       throw UpdatePasswordFailureFirebase.fromCode(e.code);
     } catch (_) {

packages/wyatt_authentication_bloc/lib/src/data/data_sources/remote/authentication_mock_data_source_impl.dart

@@ -21,6 +21,10 @@ import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
 import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 
 class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource {
+  AuthenticationMockDataSourceImpl({
+    this.idToken = 'fake-id-token',
+    this.registeredAccounts,
+  });
   Pair<Account, String>? _connectedMock;
   Pair<Account, String>? _registeredMock;
   DateTime _lastSignInTime = DateTime.now();
@@ -30,11 +34,6 @@ class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource {
   final List<Pair<Account, String>>? registeredAccounts;
   final String idToken;
 
-  AuthenticationMockDataSourceImpl({
-    this.idToken = 'fake-id-token',
-    this.registeredAccounts,
-  });
-
   Future<void> _randomDelay() async {
     await Future<void>.delayed(
       Duration(milliseconds: Random().nextInt(400) + 200),
@@ -112,7 +111,26 @@ class AuthenticationMockDataSourceImpl extends AuthenticationRemoteDataSource {
       uid: 'mock-id-anom',
       emailVerified: false,
       isAnonymous: true,
-      providerId: 'wyatt',
+      providerId: 'wyatt-studio.fr',
+      creationTime: creation,
+      lastSignInTime: creation,
+      isNewUser: creation == creation,
+    );
+    _streamAccount.add(mock);
+    _connectedMock = _connectedMock?.copyWith(left: mock);
+    _lastSignInTime = DateTime.now();
+    return Future.value(mock);
+  }
+
+  @override
+  Future<Account> signInWithGoogle() async {
+    await _randomDelay();
+    final creation = DateTime.now();
+    final mock = AccountModel(
+      uid: 'mock-id-google',
+      emailVerified: true,
+      isAnonymous: false,
+      providerId: 'google.com',
       creationTime: creation,
       lastSignInTime: creation,
       isNewUser: creation == creation,

packages/wyatt_authentication_bloc/lib/src/data/models/account_model.dart

@@ -72,7 +72,8 @@ class AccountModel extends Account {
     String? phoneNumber,
     String? photoURL,
     String? providerId,
-  }) => AccountModel(
+  }) =>
+      AccountModel(
         uid: uid ?? this.uid,
         email: email ?? this.email,
         creationTime: creationTime ?? this.creationTime,

packages/wyatt_authentication_bloc/lib/src/data/models/account_model_firebase.dart

@@ -0,0 +1,55 @@
+// ignore_for_file: public_member_api_docs, sort_constructors_first
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:wyatt_authentication_bloc/wyatt_authentication_bloc.dart';
+
+class AccountModelFirebase extends AccountModel {
+  AccountModelFirebase._({
+    required super.uid,
+    required super.emailVerified,
+    required super.isAnonymous,
+    required super.providerId,
+    super.lastSignInTime,
+    super.creationTime,
+    super.isNewUser,
+    super.email,
+    super.phoneNumber,
+    super.photoURL,
+  });
+
+  factory AccountModelFirebase.fromFirebaseUser(User? user) {
+    if (user != null) {
+      return AccountModelFirebase._(
+        uid: user.uid,
+        emailVerified: user.emailVerified,
+        isAnonymous: user.isAnonymous,
+        providerId: user.providerData.first.providerId,
+        creationTime: user.metadata.creationTime,
+        lastSignInTime: user.metadata.lastSignInTime,
+        isNewUser: (user.metadata.creationTime != null &&
+                user.metadata.lastSignInTime != null)
+            ? user.metadata.lastSignInTime! == user.metadata.creationTime!
+            : null,
+        email: user.email,
+        phoneNumber: user.phoneNumber,
+        photoURL: user.photoURL,
+      );
+    } else {
+      throw ModelParsingFailureFirebase('null-user', 'User cannot be null!');
+    }
+  }
+}

packages/wyatt_authentication_bloc/lib/src/data/models/account_wrapper_model.dart

@@ -29,7 +29,8 @@ class AccountWrapperModel<T> extends AccountWrapper<T> {
   AccountWrapperModel<T> copyWith({
     Account? account,
     T? data,
-  }) => AccountWrapperModel<T>(
+  }) =>
+      AccountWrapperModel<T>(
         account ?? this.account,
         data ?? this.data,
       );

packages/wyatt_authentication_bloc/lib/src/data/repositories/authentication_repository_impl.dart

@@ -42,19 +42,6 @@ typedef OnAuthChange<T> = FutureOrResult<T?> Function(
 
 class AuthenticationRepositoryImpl<T extends Object>
     extends AuthenticationRepository<T> {
-  final AuthenticationCacheDataSource<T> _authenticationLocalDataSource;
-  final AuthenticationRemoteDataSource _authenticationRemoteDataSource;
-
-  late FormRepository _formRepository;
-
-  final OnSignUpSuccess<T>? _onSignUpSuccess;
-
-  final OnAuthChange<T>? _onAccountChanges;
-  final StreamController<FutureOrResult<AccountWrapper<T>>> _signUpStream =
-      StreamController();
-
-  bool _pause = false; // Semaphore
-
   AuthenticationRepositoryImpl({
     required AuthenticationCacheDataSource<T> authenticationCacheDataSource,
     required AuthenticationRemoteDataSource authenticationRemoteDataSource,
@@ -106,6 +93,18 @@ class AuthenticationRepositoryImpl<T extends Object>
         ),
       );
   }
+  final AuthenticationCacheDataSource<T> _authenticationLocalDataSource;
+  final AuthenticationRemoteDataSource _authenticationRemoteDataSource;
+
+  late FormRepository _formRepository;
+
+  final OnSignUpSuccess<T>? _onSignUpSuccess;
+
+  final OnAuthChange<T>? _onAccountChanges;
+  final StreamController<FutureOrResult<AccountWrapper<T>>> _signUpStream =
+      StreamController();
+
+  bool _pause = false;
 
   @override
   FormRepository get formRepository => _formRepository;
@@ -295,6 +294,17 @@ class AuthenticationRepositoryImpl<T extends Object>
         (error) => error,
       );
 
+  @override
+  FutureOrResult<Account> signInWithGoogle() =>
+      Result.tryCatchAsync<Account, AppException, AppException>(
+        () async {
+          final account =
+              await _authenticationRemoteDataSource.signInWithGoogle();
+          return account;
+        },
+        (error) => error,
+      );
+
   @override
   FutureOrResult<bool> verifyPasswordResetCode({required String code}) =>
       Result.tryCatchAsync<bool, AppException, AppException>(

packages/wyatt_authentication_bloc/lib/src/domain/data_sources/remote/authentication_remote_data_source.dart

@@ -49,6 +49,8 @@ abstract class AuthenticationRemoteDataSource extends BaseRemoteDataSource {
 
   Future<Account> signInAnonymously();
 
+  Future<Account> signInWithGoogle();
+
   Future<Account> updateEmail({required String email});
 
   Future<Account> updatePassword({required String password});

packages/wyatt_authentication_bloc/lib/src/domain/repositories/authentication_repository.dart

@@ -73,6 +73,13 @@ abstract class AuthenticationRepository<T> extends BaseRepository {
   /// {@endtemplate}
   FutureOrResult<Account> signInAnonymously();
 
+  /// {@template signin_google}
+  /// Starts the Sign In with Google Flow.
+  ///
+  /// Throws a SignInWithGoogleFailureInterface if an exception occurs.
+  /// {@endtemplate}
+  FutureOrResult<Account> signInWithGoogle();
+
   /// {@template signin_pwd}
   /// Signs in with the provided [email] and [password].
   ///

packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_cubit.dart

@@ -26,14 +26,13 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 part 'authentication_state.dart';
 
 class AuthenticationCubit<Extra> extends Cubit<AuthenticationState<Extra>> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-
   AuthenticationCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
         super(const AuthenticationState.unknown()) {
     _listenForAuthenticationChanges();
   }
+  final AuthenticationRepository<Extra> _authenticationRepository;
 
   void _listenForAuthenticationChanges() {
     _authenticationRepository.streamAccount().listen((accountFutureResult) {

packages/wyatt_authentication_bloc/lib/src/features/authentication/cubit/authentication_state.dart

@@ -17,13 +17,8 @@
 part of 'authentication_cubit.dart';
 
 class AuthenticationState<Extra> extends Equatable {
-  final AuthenticationStatus status;
+  const AuthenticationState.unauthenticated()
-  final AccountWrapper<Extra>? accountWrapper;
+      : this._(status: AuthenticationStatus.unauthenticated);
-
-  const AuthenticationState._({required this.status, this.accountWrapper});
-
-  const AuthenticationState.unknown()
-      : this._(status: AuthenticationStatus.unknown);
 
   const AuthenticationState.authenticated(AccountWrapper<Extra> accountWrapper)
       : this._(
@@ -31,8 +26,12 @@ class AuthenticationState<Extra> extends Equatable {
           accountWrapper: accountWrapper,
         );
 
-  const AuthenticationState.unauthenticated()
+  const AuthenticationState.unknown()
-      : this._(status: AuthenticationStatus.unauthenticated);
+      : this._(status: AuthenticationStatus.unknown);
+
+  const AuthenticationState._({required this.status, this.accountWrapper});
+  final AuthenticationStatus status;
+  final AccountWrapper<Extra>? accountWrapper;
 
   @override
   List<Object?> get props => [status, accountWrapper];

packages/wyatt_authentication_bloc/lib/src/features/email_verification/cubit/email_verification_cubit.dart

@@ -24,12 +24,11 @@ import 'package:wyatt_form_bloc/wyatt_form_bloc.dart';
 part 'email_verification_state.dart';
 
 class EmailVerificationCubit<Extra> extends Cubit<EmailVerificationState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-
   EmailVerificationCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
         super(const EmailVerificationState());
+  final AuthenticationRepository<Extra> _authenticationRepository;
 
   FutureOr<void> sendEmailVerification() async {
     emit(state.copyWith(status: FormStatus.submissionInProgress));

packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_cubit.dart

@@ -25,10 +25,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 part 'password_reset_state.dart';
 
 class PasswordResetCubit<Extra> extends FormDataCubit<PasswordResetState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
-
   PasswordResetCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
@@ -38,6 +34,9 @@ class PasswordResetCubit<Extra> extends FormDataCubit<PasswordResetState> {
                 .accessForm(AuthFormName.passwordResetForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.passwordResetForm;

packages/wyatt_authentication_bloc/lib/src/features/password_reset/cubit/password_reset_state.dart

@@ -17,13 +17,12 @@
 part of 'password_reset_cubit.dart';
 
 class PasswordResetState extends FormDataState {
-  Email get email => form.validatorOf(AuthFormField.email);
-
   const PasswordResetState({
     required super.form,
     super.status = FormStatus.pure,
     super.errorMessage,
   });
+  Email get email => form.validatorOf(AuthFormField.email);
 
   PasswordResetState copyWith({
     WyattForm? form,

packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_cubit.dart

@@ -23,10 +23,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 part 'sign_in_state.dart';
 
 class SignInCubit<Extra> extends FormDataCubit<SignInState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
-
   SignInCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
@@ -36,6 +32,9 @@ class SignInCubit<Extra> extends FormDataCubit<SignInState> {
                 .accessForm(AuthFormName.signInForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.signInForm;
@@ -206,4 +205,24 @@ class SignInCubit<Extra> extends FormDataCubit<SignInState> {
       ),
     );
   }
+
+  FutureOr<void> signInWithGoogle() async {
+    if (state.status.isSubmissionInProgress) {
+      return;
+    }
+    // TODO(wyatt): maybe emit new state (to not carry an old errorMessage)
+    emit(state.copyWith(status: FormStatus.submissionInProgress));
+
+    final uid = await _authenticationRepository.signInWithGoogle();
+
+    emit(
+      uid.fold(
+        (value) => state.copyWith(status: FormStatus.submissionSuccess),
+        (error) => state.copyWith(
+          errorMessage: error.message,
+          status: FormStatus.submissionFailure,
+        ),
+      ),
+    );
+  }
 }

packages/wyatt_authentication_bloc/lib/src/features/sign_in/cubit/sign_in_state.dart

@@ -17,16 +17,15 @@
 part of 'sign_in_cubit.dart';
 
 class SignInState extends FormDataState {
-  FormInputValidator<String?, ValidationError> get email =>
-      form.validatorOf(AuthFormField.email);
-  FormInputValidator<String?, ValidationError> get password =>
-      form.validatorOf(AuthFormField.password);
-
   const SignInState({
     required super.form,
     super.status = FormStatus.pure,
     super.errorMessage,
   });
+  FormInputValidator<String?, ValidationError> get email =>
+      form.validatorOf(AuthFormField.email);
+  FormInputValidator<String?, ValidationError> get password =>
+      form.validatorOf(AuthFormField.password);
 
   SignInState copyWith({
     WyattForm? form,

packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_cubit.dart

@@ -25,10 +25,6 @@ import 'package:wyatt_type_utils/wyatt_type_utils.dart';
 part 'sign_up_state.dart';
 
 class SignUpCubit<Extra> extends FormDataCubit<SignUpState> {
-  final AuthenticationRepository<Extra> _authenticationRepository;
-  FormRepository get _formRepository =>
-      _authenticationRepository.formRepository;
-
   SignUpCubit({
     required AuthenticationRepository<Extra> authenticationRepository,
   })  : _authenticationRepository = authenticationRepository,
@@ -38,6 +34,9 @@ class SignUpCubit<Extra> extends FormDataCubit<SignUpState> {
                 .accessForm(AuthFormName.signUpForm),
           ),
         );
+  final AuthenticationRepository<Extra> _authenticationRepository;
+  FormRepository get _formRepository =>
+      _authenticationRepository.formRepository;
 
   @override
   String get formName => AuthFormName.signUpForm;

packages/wyatt_authentication_bloc/lib/src/features/sign_up/cubit/sign_up_state.dart

@@ -17,16 +17,15 @@
 part of 'sign_up_cubit.dart';
 
 class SignUpState extends FormDataState {
-  FormInputValidator<String?, ValidationError> get email =>
-      form.validatorOf(AuthFormField.email);
-  FormInputValidator<String?, ValidationError> get password =>
-      form.validatorOf(AuthFormField.password);
-
   const SignUpState({
     required super.form,
     super.status = FormStatus.pure,
     super.errorMessage,
   });
+  FormInputValidator<String?, ValidationError> get email =>
+      form.validatorOf(AuthFormField.email);
+  FormInputValidator<String?, ValidationError> get password =>
+      form.validatorOf(AuthFormField.password);
 
   SignUpState copyWith({
     WyattForm? form,

packages/wyatt_authentication_bloc/lib/wyatt_authentication_bloc.dart

@@ -17,4 +17,7 @@
 /// An authentication library for BLoC.
 library wyatt_authentication_bloc;
 
+export 'package:firebase_auth/firebase_auth.dart';
+export 'package:google_sign_in/google_sign_in.dart';
+
 export 'src/src.dart';

packages/wyatt_authentication_bloc/pubspec.yaml

@@ -1,7 +1,7 @@
 name: wyatt_authentication_bloc
 description: Authentication BLoC for Flutter
 repository: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages/src/branch/master/packages/wyatt_authentication_bloc
-version: 0.4.0+3
+version: 0.4.1
 
 publish_to: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
 
@@ -10,17 +10,12 @@ environment:
   flutter: ">=1.17.0"
 
 dependencies:
-  flutter:
+  flutter: { sdk: flutter }
-    sdk: flutter
-
   crypto: ^3.0.2
   flutter_bloc: ^8.1.1
   equatable: ^2.0.5
-  firebase_auth: ^4.1.1
+  firebase_auth: ^4.2.0
-  google_sign_in: ^5.3.0
+  google_sign_in: ^5.4.2
-  flutter_facebook_auth: ^4.3.0
-  sign_in_with_apple: ^3.3.0
-  twitter_login: ^4.2.3
   rxdart: ^0.27.7
 
   wyatt_form_bloc:
@@ -36,11 +31,10 @@ dependencies:
     version: ^0.0.4
 
 dev_dependencies:
-  flutter_test:
+  flutter_test: { sdk: flutter }
-    sdk: flutter
   bloc_test: ^9.1.0
   mocktail: ^0.3.0
 
   wyatt_analysis:
     hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub/
-    version: 2.3.0
+    version: 2.4.0

packages/wyatt_bloc_helper/pubspec.yaml

@@ -22,4 +22,4 @@ dev_dependencies:
   
   wyatt_analysis:
     hosted: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub
-    version: ^2.3.0
+    version: ^2.4.0

packages/wyatt_bloc_layout/example/lib/components/custom_app_bar.dart

@@ -0,0 +1,14 @@
+import 'package:flutter/material.dart';
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart';
+
+part 'custom_app_bar.g.dart';
+
+@ComponentCopyWithExtension()
+class CustomAppBar extends AppBarComponent with $CustomAppBarCWMixin {
+  const CustomAppBar({super.title});
+  @override
+  Widget build(BuildContext context) => AppBar(
+        title: Text(title?.text ?? 'Title'),
+      );
+}

packages/wyatt_bloc_layout/example/lib/components/custom_app_bar.g.dart

@@ -0,0 +1,35 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_app_bar.dart';
+
+// **************************************************************************
+// ComponentCopyWithGenerator
+// **************************************************************************
+
+class $CustomAppBarCWProxyImpl implements $AppBarComponentCWProxy {
+  const $CustomAppBarCWProxyImpl(this._value);
+  final CustomAppBar _value;
+  @override
+  CustomAppBar title(TextWrapper? title) => this(title: title);
+  @override
+  CustomAppBar leading(Widget? leading) => this(leading: leading);
+  @override
+  CustomAppBar actions(List<Widget>? actions) => this(actions: actions);
+  @override
+  CustomAppBar key(Key? key) => this(key: key);
+  @override
+  CustomAppBar call({
+    TextWrapper? title,
+    Widget? leading,
+    List<Widget>? actions,
+    Key? key,
+  }) =>
+      CustomAppBar(
+        title: title ?? _value.title,
+      );
+}
+
+mixin $CustomAppBarCWMixin on Component {
+  $AppBarComponentCWProxy get copyWith =>
+      $CustomAppBarCWProxyImpl(this as CustomAppBar);
+}

packages/wyatt_bloc_layout/example/lib/components/custom_bottom_bar.dart

@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart';
+
+part 'custom_bottom_bar.g.dart';
+
+@ComponentCopyWithExtension()
+class CustomBottomBar extends BottomNavigationBarComponent
+    with $CustomBottomBarCWMixin {
+  @override
+  Widget build(BuildContext context) => BottomNavigationBar(
+        items: [
+          BottomNavigationBarItem(
+              icon: Icon(
+                Icons.e_mobiledata,
+              ),
+              label: 'Icon 1'),
+          BottomNavigationBarItem(
+              icon: Icon(
+                Icons.do_not_disturb_off,
+              ),
+              label: 'Icon 2'),
+        ],
+        backgroundColor: Colors.blue,
+      );
+}

packages/wyatt_bloc_layout/example/lib/components/custom_bottom_bar.g.dart

@@ -0,0 +1,33 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_bottom_bar.dart';
+
+// **************************************************************************
+// ComponentCopyWithGenerator
+// **************************************************************************
+
+class $CustomBottomBarCWProxyImpl
+    implements $BottomNavigationBarComponentCWProxy {
+  const $CustomBottomBarCWProxyImpl(this._value);
+  final CustomBottomBar _value;
+  @override
+  CustomBottomBar onTap(void Function(BuildContext, int)? onTap) =>
+      this(onTap: onTap);
+  @override
+  CustomBottomBar currentIndex(int? currentIndex) =>
+      this(currentIndex: currentIndex);
+  @override
+  CustomBottomBar key(Key? key) => this(key: key);
+  @override
+  CustomBottomBar call({
+    void Function(BuildContext, int)? onTap,
+    int? currentIndex,
+    Key? key,
+  }) =>
+      CustomBottomBar();
+}
+
+mixin $CustomBottomBarCWMixin on Component {
+  $BottomNavigationBarComponentCWProxy get copyWith =>
+      $CustomBottomBarCWProxyImpl(this as CustomBottomBar);
+}

packages/wyatt_bloc_layout/example/lib/components/custom_error_widget.dart

@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart';
+
+part 'custom_error_widget.g.dart';
+
+@ComponentCopyWithExtension()
+class CustomErrorWidget extends ErrorWidgetComponent
+    with $CustomErrorWidgetCWMixin {
+  CustomErrorWidget({super.error});
+
+  @override
+  Widget build(BuildContext context) => ColoredBox(
+        color: Colors.red,
+        child: Center(child: Text(error?.text ?? 'Error')),
+      );
+}

packages/wyatt_bloc_layout/example/lib/components/custom_error_widget.g.dart

@@ -0,0 +1,29 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_error_widget.dart';
+
+// **************************************************************************
+// ComponentCopyWithGenerator
+// **************************************************************************
+
+class $CustomErrorWidgetCWProxyImpl implements $ErrorWidgetComponentCWProxy {
+  const $CustomErrorWidgetCWProxyImpl(this._value);
+  final CustomErrorWidget _value;
+  @override
+  CustomErrorWidget error(TextWrapper? error) => this(error: error);
+  @override
+  CustomErrorWidget key(Key? key) => this(key: key);
+  @override
+  CustomErrorWidget call({
+    TextWrapper? error,
+    Key? key,
+  }) =>
+      CustomErrorWidget(
+        error: error ?? _value.error,
+      );
+}
+
+mixin $CustomErrorWidgetCWMixin on Component {
+  $ErrorWidgetComponentCWProxy get copyWith =>
+      $CustomErrorWidgetCWProxyImpl(this as CustomErrorWidget);
+}

packages/wyatt_bloc_layout/example/lib/components/custom_loading_widget.dart

@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+import 'package:wyatt_component_copy_with_extension/component_copy_with_extension.dart';
+
+part 'custom_loading_widget.g.dart';
+
+@ComponentCopyWithExtension()
+class CustomLoadingWidget extends LoadingWidgetComponent
+    with $CustomLoadingWidgetCWMixin {
+  CustomLoadingWidget({super.color});
+
+  @override
+  Widget build(BuildContext context) =>
+      Center(child: CircularProgressIndicator(color: color));
+}

packages/wyatt_bloc_layout/example/lib/components/custom_loading_widget.g.dart

@@ -0,0 +1,30 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'custom_loading_widget.dart';
+
+// **************************************************************************
+// ComponentCopyWithGenerator
+// **************************************************************************
+
+class $CustomLoadingWidgetCWProxyImpl
+    implements $LoadingWidgetComponentCWProxy {
+  const $CustomLoadingWidgetCWProxyImpl(this._value);
+  final CustomLoadingWidget _value;
+  @override
+  CustomLoadingWidget color(Color? color) => this(color: color);
+  @override
+  CustomLoadingWidget key(Key? key) => this(key: key);
+  @override
+  CustomLoadingWidget call({
+    Color? color,
+    Key? key,
+  }) =>
+      CustomLoadingWidget(
+        color: color ?? _value.color,
+      );
+}
+
+mixin $CustomLoadingWidgetCWMixin on Component {
+  $LoadingWidgetComponentCWProxy get copyWith =>
+      $CustomLoadingWidgetCWProxyImpl(this as CustomLoadingWidget);
+}

packages/wyatt_bloc_layout/example/lib/components/theme_components.dart

@@ -1,4 +1,7 @@
-import 'package:flutter/material.dart';
+import 'package:bloc_layout_example/components/custom_app_bar.dart';
+import 'package:bloc_layout_example/components/custom_bottom_bar.dart';
+import 'package:bloc_layout_example/components/custom_error_widget.dart';
+import 'package:bloc_layout_example/components/custom_loading_widget.dart';
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
 class AppThemeComponent {
@@ -9,71 +12,3 @@ class AppThemeComponent {
         errorWidget: CustomErrorWidget(),
       );
 }
-
-class CustomAppBar extends AppBarComponent {
-  const CustomAppBar({super.title});
-  @override
-  Widget build(BuildContext context) => AppBar(
-        title: Text(title ?? 'Title'),
-      );
-
-  @override
-  AppBarComponent? configure(
-          {String? title, Widget? leading, List<Widget>? actions}) =>
-      CustomAppBar(
-        title: title ?? this.title,
-      );
-}
-
-class CustomBottomBar extends BottomNavigationBarComponent {
-  @override
-  Widget build(BuildContext context) => BottomNavigationBar(
-        items: [
-          BottomNavigationBarItem(
-              icon: Icon(
-                Icons.e_mobiledata,
-              ),
-              label: 'Icon 1'),
-          BottomNavigationBarItem(
-              icon: Icon(
-                Icons.do_not_disturb_off,
-              ),
-              label: 'Icon 2'),
-        ],
-        backgroundColor: Colors.blue,
-      );
-
-  @override
-  BottomNavigationBarComponent? configure(
-          {void Function(BuildContext p1, int p2)? onTap,
-          int currentIndex = 0}) =>
-      this;
-}
-
-class CustomLoadingWidget extends LoadingWidgetComponent {
-  CustomLoadingWidget({super.color});
-
-  @override
-  Widget build(BuildContext context) =>
-      Center(child: CircularProgressIndicator(color: color));
-
-  @override
-  LoadingWidgetComponent? configure({Color? color}) => CustomLoadingWidget(
-        color: color ?? this.color,
-      );
-}
-
-class CustomErrorWidget extends ErrorWidgetComponent {
-  CustomErrorWidget({super.error});
-
-  @override
-  Widget build(BuildContext context) => ColoredBox(
-        color: Colors.red,
-        child: Center(child: Text(error ?? 'Error')),
-      );
-
-  @override
-  ErrorWidgetComponent? configure({String? error}) => CustomErrorWidget(
-        error: error ?? this.error,
-      );
-}

packages/wyatt_bloc_layout/example/lib/main.dart

@@ -105,7 +105,7 @@ class ExampleListCrudStateManagement
 }
 
 class ExampleFrameLayoutCrudConsumer
-    extends FrameLayoutCrudConsumerScreen<ExampleCubit, String> {
+    extends FrameLayoutCrudCubitConsumerScreen<ExampleCubit, String> {
   const ExampleFrameLayoutCrudConsumer()
       : super(
           title: 'Example Title',
@@ -118,7 +118,7 @@ class ExampleFrameLayoutCrudConsumer
 }
 
 class ExampleFrameLayoutCrudListConsumer
-    extends FrameLayoutCrudListConsumerScreen<ExampleCubit, String> {
+    extends FrameLayoutCrudListCubitConsumerScreen<ExampleCubit, String> {
   const ExampleFrameLayoutCrudListConsumer()
       : super(
           title: 'Example Title',

packages/wyatt_bloc_layout/example/pubspec.yaml

@@ -3,7 +3,7 @@ description: A new Flutter project.
 
 # The following line prevents the package from being accidentally published to
 # pub.dev using `flutter pub publish`. This is preferred for private packages.
-publish_to: 'none' # Remove this line if you wish to publish to pub.dev
+publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 # The following defines the version and build number for your application.
 # A version number is three numbers separated by dots, like 1.2.43
@@ -27,33 +27,38 @@ environment:
 # the latest version available on pub.dev. To see which dependencies have newer
 # versions available, run `flutter pub outdated`.
 dependencies:
-  
   flutter:
     sdk: flutter
 
-  
   wyatt_bloc_layout:
     path: "../"
 
-dev_dependencies:
+  wyatt_component_copy_with_extension:
+    git:
+      url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git
+      path: packages/wyatt_component_copy_with_extension
 
+dev_dependencies:
   flutter_test:
     sdk: flutter
 
+  build_runner: ^2.3.3
+  wyatt_component_copy_with_gen:
+    git:
+      url: ssh://git@git.wyatt-studio.fr:993/Wyatt-FOSS/wyatt-packages.git
+      path: packages/wyatt_component_copy_with_gen
 
   wyatt_analysis:
     git:
       url: https://git.wyatt-studio.fr/Wyatt-FOSS/wyatt-packages
-      ref: wyatt_analysis-v2.3.0
+      ref: wyatt_analysis-v2.4.0
       path: packages/wyatt_analysis
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
-
 # The following section is specific to Flutter.
 flutter:
-
   # The following line ensures that the Material Icons font is
   # included with your application, so that you can use the icons in
   # the material Icons class.

packages/wyatt_bloc_layout/lib/src/core/core.dart

@@ -14,4 +14,4 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'cryptography.dart';
+export './crud_cubit_consumer_screen_mixin.dart';

packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart

@@ -16,13 +16,14 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
-import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class CrudCubitScreenBase<Cubit extends bloc_base.Cubit<CrudState>,
+import 'package:wyatt_crud_bloc/wyatt_crud_bloc.dart';
-    SuccessState extends CrudSuccess> extends CubitScreen<Cubit, CrudState> {
+import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-  const CrudCubitScreenBase();
+
+mixin CrudMixin<Cubit extends bloc_base.Cubit,
+    SuccessState extends CrudSuccess> {
   Widget errorBuilder(BuildContext context, CrudError state) =>
-      context.components.errorWidget?.configure(error: state.message) ??
+      context.components.errorWidget?.copyWith(error: state.message.wrap()) ??
       const SizedBox.shrink();
 
   Widget loadingBuilder(BuildContext context, CrudLoading state) =>
@@ -33,8 +34,7 @@ abstract class CrudCubitScreenBase<Cubit extends bloc_base.Cubit<CrudState>,
 
   Widget successBuilder(BuildContext context, SuccessState state);
 
-  @override
+  Widget crudBuilder(BuildContext context, CrudState state) =>
-  Widget onBuild(BuildContext context, CrudState state) =>
       CrudBuilder<CrudInitial, CrudLoading, SuccessState, CrudError>(
         errorBuilder: errorBuilder,
         loadingBuilder: loadingBuilder,
@@ -43,13 +43,3 @@ abstract class CrudCubitScreenBase<Cubit extends bloc_base.Cubit<CrudState>,
         builder: successBuilder,
       );
 }
-
-abstract class CrudCubitScreen<Cubit extends bloc_base.Cubit<CrudState>, T>
-    extends CrudCubitScreenBase<Cubit, CrudLoaded<T>> {
-  const CrudCubitScreen();
-}
-
-abstract class CrudListCubitScreen<Cubit extends bloc_base.Cubit<CrudState>, T>
-    extends CrudCubitScreenBase<Cubit, CrudListLoaded<T>> {
-  const CrudListCubitScreen();
-}

packages/wyatt_bloc_layout/lib/src/presentation/consumers/bases/app_bar_layout_cubit_consumer_screen.dart

@@ -16,37 +16,26 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class AppBarLayoutCrudScreen<Cubit extends bloc_base.Cubit<CrudState>,
+abstract class AppBarLayoutCubitConsumerScreen<
-    T> extends CrudCubitScreen<Cubit, T> {
+    Cubit extends bloc_base.Cubit<State>,
-  final String? title;
+    State extends Object> extends CubitConsumerScreen<Cubit, State> {
-
+  const AppBarLayoutCubitConsumerScreen({
-  const AppBarLayoutCrudScreen({
     this.title,
+    this.leading,
+    this.actions,
+    super.key,
   });
 
+  final String? title;
+  final Widget? leading;
+  final List<Widget>? actions;
+
   @override
   Widget parent(BuildContext context, Widget child) => AppBarLayout(
-        title: title ?? 'Title',
+        title: title,
-        body: child,
-      );
-}
-
-abstract class AppBarLayoutCrudListScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudListCubitScreen<Cubit, T> {
-  final String? title;
-  final int? currentIndex;
-
-  const AppBarLayoutCrudListScreen({
-    this.title,
-    this.currentIndex,
-  });
-
-  @override
-  Widget parent(BuildContext context, Widget child) => AppBarLayout(
-        title: title ?? 'Title',
         body: child,
       );
 }

packages/wyatt_bloc_layout/lib/src/presentation/consumers/bases/bases.dart

@@ -0,0 +1,19 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export './app_bar_layout_cubit_consumer_screen.dart';
+export './bottom_bar_layout_cubit_consumer_screen.dart';
+export './frame_layout_cubit_consumer_screen.dart';

packages/wyatt_bloc_layout/lib/src/presentation/consumers/bases/bottom_bar_layout_cubit_consumer_screen.dart

@@ -16,40 +16,23 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class BottomNavigationBarLayoutCrudScreen<
+abstract class BottomBarLayoutCubitConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
+    Cubit extends bloc_base.Cubit<State>,
-    T> extends CrudCubitScreen<Cubit, T> {
+    State extends Object> extends CubitConsumerScreen<Cubit, State> {
-  final int? currentIndex;
+  const BottomBarLayoutCubitConsumerScreen({
-
-  const BottomNavigationBarLayoutCrudScreen({
     this.currentIndex,
+    super.key,
   });
 
+  final int? currentIndex;
+
   @override
   Widget parent(BuildContext context, Widget child) =>
       BottomNavigationBarLayout(
+        currentIndex: currentIndex,
         body: child,
-        currentIndex: currentIndex ?? 0,
-      );
-}
-
-abstract class BottomNavigationBarLayoutCrudListScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudListCubitScreen<Cubit, T> {
-  final String? title;
-  final int? currentIndex;
-
-  const BottomNavigationBarLayoutCrudListScreen({
-    this.title,
-    this.currentIndex,
-  });
-
-  @override
-  Widget parent(BuildContext context, Widget child) =>
-      BottomNavigationBarLayout(
-        body: child,
-        currentIndex: currentIndex ?? 0,
       );
 }

packages/wyatt_bloc_layout/lib/src/presentation/consumers/bases/frame_layout_cubit_consumer_screen.dart

@@ -14,43 +14,31 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-import 'package:flutter/src/widgets/framework.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class FrameLayoutCrudScreen<Cubit extends bloc_base.Cubit<CrudState>,
+abstract class FrameLayoutCubitConsumerScreen<
-    T> extends CrudCubitScreen<Cubit, T> {
+    Cubit extends bloc_base.Cubit<State>,
-  final String? title;
+    State extends Object> extends CubitConsumerScreen<Cubit, State> {
-  final int? currentIndex;
+  const FrameLayoutCubitConsumerScreen({
-
-  const FrameLayoutCrudScreen({
     this.title,
+    this.leading,
+    this.actions,
     this.currentIndex,
+    super.key,
   });
 
+  final int? currentIndex;
+  final String? title;
+  final Widget? leading;
+  final List<Widget>? actions;
+
   @override
   Widget parent(BuildContext context, Widget child) => FrameLayout(
-        title: title ?? 'Title',
+        title: title,
+        currentIndex: currentIndex,
         body: child,
-        currentIndex: currentIndex ?? 0,
-      );
-}
-
-abstract class FrameLayoutCrudListScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudListCubitScreen<Cubit, T> {
-  final String? title;
-  final int? currentIndex;
-
-  const FrameLayoutCrudListScreen({
-    this.title,
-    this.currentIndex,
-  });
-
-  @override
-  Widget parent(BuildContext context, Widget child) => FrameLayout(
-        title: title ?? 'Title',
-        body: child,
-        currentIndex: currentIndex ?? 0,
       );
 }

packages/wyatt_bloc_layout/lib/src/presentation/consumers/consumers.dart

@@ -13,3 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export 'bases/bases.dart';
+export 'crud/crud.dart';

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud/app_bar_layout_crud_cubit_consumer_screen.dart

@@ -18,40 +18,34 @@ import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class FrameLayoutCrudConsumerScreen<
+abstract class AppBarLayoutCrudCubitConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
-    T> extends CrudCubitConsumerScreen<Cubit, T> {
+    extends AppBarLayoutCubitConsumerScreen<Cubit, CrudState>
-  final String? title;
+    with CrudMixin<Cubit, CrudLoaded<T>> {
-  final int? currentIndex;
+  const AppBarLayoutCrudCubitConsumerScreen({
-
+    super.title,
-  const FrameLayoutCrudConsumerScreen({
+    super.leading,
-    this.title,
+    super.actions,
-    this.currentIndex,
+    super.key,
   });
 
   @override
-  Widget parent(BuildContext context, Widget child) => FrameLayout(
+  Widget onBuild(BuildContext context, CrudState state) =>
-        title: title ?? 'Title',
+      crudBuilder(context, state);
-        body: child,
-        currentIndex: currentIndex ?? 0,
-      );
 }
 
-abstract class FrameLayoutCrudListConsumerScreen<
+abstract class AppBarLayoutCrudListCubitConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
-    T> extends CrudListCubitConsumerScreen<Cubit, T> {
+    extends AppBarLayoutCubitConsumerScreen<Cubit, CrudState>
-  final String? title;
+    with CrudMixin<Cubit, CrudListLoaded<T>> {
-  final int? currentIndex;
+  const AppBarLayoutCrudListCubitConsumerScreen({
-
+    super.title,
-  const FrameLayoutCrudListConsumerScreen({
+    super.leading,
-    this.title,
+    super.actions,
-    this.currentIndex,
+    super.key,
   });
 
   @override
-  Widget parent(BuildContext context, Widget child) => FrameLayout(
+  Widget onBuild(BuildContext context, CrudState state) =>
-        title: title ?? 'Title',
+      crudBuilder(context, state);
-        body: child,
-        currentIndex: currentIndex ?? 0,
-      );
 }

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud/bottom_bar_layout_crud_cubit_consumer_screen.dart

@@ -0,0 +1,47 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+
+abstract class BottomBarLayoutCrudCubitConsumerScreen<
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
+    extends BottomBarLayoutCubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudLoaded<T>> {
+  const BottomBarLayoutCrudCubitConsumerScreen({
+    super.currentIndex,
+    super.key,
+  });
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}
+
+abstract class BottomBarLayoutCrudListCubitConsumerScreen<
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
+    extends BottomBarLayoutCubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudListLoaded<T>> {
+  const BottomBarLayoutCrudListCubitConsumerScreen({
+    super.currentIndex,
+    super.key,
+  });
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud/crud.dart

@@ -0,0 +1,20 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export './app_bar_layout_crud_cubit_consumer_screen.dart';
+export './bottom_bar_layout_crud_cubit_consumer_screen.dart';
+export './frame_layout_crud_cubit_consumer_screen.dart';
+export './crud_cubit_consumer_screen.dart';

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud/crud_cubit_consumer_screen.dart

@@ -0,0 +1,40 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:flutter/material.dart';
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
+abstract class CrudCubitConsumerScreen<Cubit extends bloc_base.Cubit<CrudState>,
+        T extends Object?> extends CubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudLoaded<T>> {
+  const CrudCubitConsumerScreen({super.key});
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}
+
+abstract class CrudListCubitConsumerScreen<
+        Cubit extends bloc_base.Cubit<CrudState>,
+        T extends Object?> extends CubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudListLoaded<T>> {
+  const CrudListCubitConsumerScreen({super.key});
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud/frame_layout_crud_cubit_consumer_screen.dart

@@ -0,0 +1,53 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+
+abstract class FrameLayoutCrudCubitConsumerScreen<
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
+    extends FrameLayoutCubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudLoaded<T>> {
+  const FrameLayoutCrudCubitConsumerScreen({
+    super.title,
+    super.leading,
+    super.actions,
+    super.currentIndex,
+    super.key,
+  });
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}
+
+abstract class FrameLayoutCrudListCubitConsumerScreen<
+        Cubit extends bloc_base.Cubit<CrudState>, T extends Object?>
+    extends FrameLayoutCubitConsumerScreen<Cubit, CrudState>
+    with CrudMixin<Cubit, CrudListLoaded<T>> {
+  const FrameLayoutCrudListCubitConsumerScreen({
+    super.title,
+    super.leading,
+    super.actions,
+    super.currentIndex,
+    super.key,
+  });
+
+  @override
+  Widget onBuild(BuildContext context, CrudState state) =>
+      crudBuilder(context, state);
+}

packages/wyatt_bloc_layout/lib/src/presentation/consumers/crud_cubit_consumer_screen_bases.dart

@@ -1,61 +0,0 @@
-// Copyright (C) 2022 WYATT GROUP
-// Please see the AUTHORS file for details.
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
-import 'package:wyatt_bloc_helper/wyatt_bloc_helper.dart';
-import 'package:wyatt_crud_bloc/wyatt_crud_bloc.dart';
-import 'package:wyatt_ui_components/wyatt_wyatt_ui_components.dart';
-
-abstract class CrudCubitConsumerScreenBase<
-        Cubit extends bloc_base.Cubit<CrudState>,
-        SuccessState extends CrudSuccess>
-    extends CubitConsumerScreen<Cubit, CrudState> {
-  const CrudCubitConsumerScreenBase({super.key});
-
-  Widget errorBuilder(BuildContext context, CrudError state) =>
-      context.components.errorWidget?.configure(error: state.message) ??
-      const SizedBox.shrink();
-
-  Widget loadingBuilder(BuildContext context, CrudLoading state) =>
-      context.components.loadingWidget ?? const SizedBox.shrink();
-
-  Widget initialBuilder(BuildContext context, CrudInitial state) =>
-      const SizedBox.shrink();
-
-  Widget successBuilder(BuildContext context, SuccessState state);
-
-  @override
-  Widget onBuild(BuildContext context, CrudState state) =>
-      CrudBuilder<CrudInitial, CrudLoading, SuccessState, CrudError>(
-        errorBuilder: errorBuilder,
-        loadingBuilder: loadingBuilder,
-        initialBuilder: initialBuilder,
-        state: state,
-        builder: successBuilder,
-      );
-}
-
-abstract class CrudCubitConsumerScreen<Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudCubitConsumerScreenBase<Cubit, CrudLoaded<T>> {
-  const CrudCubitConsumerScreen();
-}
-
-abstract class CrudListCubitConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudCubitConsumerScreenBase<Cubit, CrudListLoaded<T>> {
-  const CrudListCubitConsumerScreen();
-}

packages/wyatt_bloc_layout/lib/src/presentation/presentation.dart

@@ -14,11 +14,5 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-export 'consumers/crud_cubit_consumer_screen_bases.dart';
+export 'consumers/consumers.dart';
-export 'consumers/bottom_navigation_bar_layout_crud_consumer_screen.dart';
+export 'screens/screens.dart';
-export 'consumers/app_bar_cubit_consumer_screen.dart';
-export 'consumers/frame_layout_crud_consumer_screen.dart';
-export 'screens/crud_cubit_screen_base.dart';
-export 'screens/app_bar_cubit_screen.dart';
-export 'screens/bottom_navigation_bar_layout_crud_screen.dart';
-export 'screens/frame_layout_crud_screen.dart';

packages/wyatt_bloc_layout/lib/src/presentation/screens/bases/app_bar_layout_cubit_screen.dart

@@ -16,38 +16,25 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class AppBarLayoutCrudConsumerScreen<
+abstract class AppBarLayoutCubitScreen<Cubit extends bloc_base.Cubit<State>,
-    Cubit extends bloc_base.Cubit<CrudState>,
+    State extends Object> extends CubitScreen<Cubit, State> {
-    T> extends CrudCubitConsumerScreen<Cubit, T> {
+  const AppBarLayoutCubitScreen({
-  final String? title;
-
-  const AppBarLayoutCrudConsumerScreen({
     this.title,
+    this.leading,
+    this.actions,
+    super.key,
   });
 
+  final String? title;
+  final Widget? leading;
+  final List<Widget>? actions;
+
   @override
   Widget parent(BuildContext context, Widget child) => AppBarLayout(
-        title: title ?? 'Title',
+        title: title,
-        body: child,
-      );
-}
-
-abstract class AppBarLayoutCrudListConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudListCubitConsumerScreen<Cubit, T> {
-  final String? title;
-  final int? currentIndex;
-
-  const AppBarLayoutCrudListConsumerScreen({
-    this.title,
-    this.currentIndex,
-  });
-
-  @override
-  Widget parent(BuildContext context, Widget child) => AppBarLayout(
-        title: title ?? 'Title',
         body: child,
       );
 }

packages/wyatt_bloc_layout/lib/src/presentation/screens/bases/bases.dart

@@ -0,0 +1,19 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+export 'app_bar_layout_cubit_screen.dart';
+export 'bottom_bar_layout_cubit_screen.dart';
+export 'frame_layout_cubit_screen.dart';

packages/wyatt_bloc_layout/lib/src/presentation/screens/bases/bottom_bar_layout_cubit_screen.dart

@@ -16,40 +16,22 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
 import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
 
-abstract class BottomNavigationBarLayoutCrudConsumerScreen<
+abstract class BottomBarLayoutCubitScreen<Cubit extends bloc_base.Cubit<State>,
-    Cubit extends bloc_base.Cubit<CrudState>,
+    State extends Object> extends CubitScreen<Cubit, State> {
-    T> extends CrudCubitConsumerScreen<Cubit, T> {
+  const BottomBarLayoutCubitScreen({
-  final int? currentIndex;
-
-  const BottomNavigationBarLayoutCrudConsumerScreen({
     this.currentIndex,
+    super.key,
   });
 
+  final int? currentIndex;
+
   @override
   Widget parent(BuildContext context, Widget child) =>
       BottomNavigationBarLayout(
+        currentIndex: currentIndex,
         body: child,
-        currentIndex: currentIndex ?? 0,
-      );
-}
-
-abstract class BottomNavigationBarLayoutCrudListConsumerScreen<
-    Cubit extends bloc_base.Cubit<CrudState>,
-    T> extends CrudListCubitConsumerScreen<Cubit, T> {
-  final String? title;
-  final int? currentIndex;
-
-  const BottomNavigationBarLayoutCrudListConsumerScreen({
-    this.title,
-    this.currentIndex,
-  });
-
-  @override
-  Widget parent(BuildContext context, Widget child) =>
-      BottomNavigationBarLayout(
-        body: child,
-        currentIndex: currentIndex ?? 0,
       );
 }

packages/wyatt_bloc_layout/lib/src/presentation/screens/bases/frame_layout_cubit_screen.dart

@@ -0,0 +1,43 @@
+// Copyright (C) 2022 WYATT GROUP
+// Please see the AUTHORS file for details.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
+
+import 'package:wyatt_bloc_layout/wyatt_bloc_layout.dart';
+
+abstract class FrameLayoutCubitScreen<Cubit extends bloc_base.Cubit<State>,
+    State extends Object> extends CubitScreen<Cubit, State> {
+  const FrameLayoutCubitScreen({
+    this.title,
+    this.leading,
+    this.actions,
+    this.currentIndex,
+    super.key,
+  });
+
+  final int? currentIndex;
+  final String? title;
+  final Widget? leading;
+  final List<Widget>? actions;
+
+  @override
+  Widget parent(BuildContext context, Widget child) => FrameLayout(
+        title: title,
+        currentIndex: currentIndex,
+        body: child,
+      );
+}