From 80dffdb986cbe3b478e670faa5b5c42b7f0173be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Thu, 18 May 2023 16:34:04 +0200 Subject: [PATCH] feat(layout): modify some layout files to utilize ScaffoldFieldWrapper class --- .../src/core/crud_cubit_consumer_screen_mixin.dart | 13 +++++++++---- ..._app_bar_grid_layout_cubit_screen_crud_list.dart | 1 + .../top_app_bar_layout_cubit_screen.dart | 3 +++ .../top_app_bar_layout_cubit_screen_crud.dart | 1 + .../top_app_bar_layout_cubit_screen_crud_item.dart | 1 + .../top_app_bar_layout_cubit_screen_crud_list.dart | 1 + .../structural_layouts/top_app_bar_layout.dart | 2 ++ 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart b/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart index 7a083f3c..e1156601 100644 --- a/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart +++ b/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart @@ -23,12 +23,17 @@ import 'package:wyatt_ui_components/wyatt_ui_components.dart'; mixin CrudMixin, SuccessState extends CrudSuccess> { Widget errorBuilder(BuildContext context, CrudError state) => - context.components.errorComponent.call( - message: (state.message != null) ? TextWrapper(state.message!) : null, - ); + context.components.error != null + ? context.components.errorComponent.call( + message: + (state.message != null) ? TextWrapper(state.message!) : null, + ) + : const SizedBox.shrink(); Widget loadingBuilder(BuildContext context, CrudLoading state) => - context.components.loader ?? const SizedBox.shrink(); + context.components.loader != null + ? context.components.loaderComponent.call() + : const CircularProgressIndicator(); Widget initialBuilder(BuildContext context, CrudInitial state) => const SizedBox.shrink(); diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_grid_layout_cubit_screen_crud_list.dart b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_grid_layout_cubit_screen_crud_list.dart index e20a1842..11c01461 100644 --- a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_grid_layout_cubit_screen_crud_list.dart +++ b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_grid_layout_cubit_screen_crud_list.dart @@ -25,6 +25,7 @@ abstract class TopAppBarGridLayoutCubitScreenCrudList< const TopAppBarGridLayoutCubitScreenCrudList({ super.custom, super.height = 60, + super.scaffoldFieldsWrapper, super.key, }); } diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen.dart b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen.dart index 48fe0abe..6dbf0fd6 100644 --- a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen.dart +++ b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen.dart @@ -26,16 +26,19 @@ abstract class TopAppBarLayoutCubitScreen, const TopAppBarLayoutCubitScreen({ this.custom, this.height = 60, + this.scaffoldFieldsWrapper, super.key, }); final double height; final TopAppBarComponent? Function(TopAppBarComponent?)? custom; + final ScaffoldFieldsWrapper? scaffoldFieldsWrapper; @override Widget parent(BuildContext context, Widget child) => TopAppBarLayout( height: height, custom: custom, + scaffoldFieldsWrapper: scaffoldFieldsWrapper, body: child, ); } diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud.dart b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud.dart index efa82d3e..d0048481 100644 --- a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud.dart +++ b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud.dart @@ -27,6 +27,7 @@ abstract class TopAppBarLayoutCubitScreenCrud< const TopAppBarLayoutCubitScreenCrud({ super.custom, super.height, + super.scaffoldFieldsWrapper, super.key, }); diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_item.dart b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_item.dart index dd7e2bb1..3d73b44f 100644 --- a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_item.dart +++ b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_item.dart @@ -24,6 +24,7 @@ abstract class TopAppBarLayoutCubitScreenCrudItem< const TopAppBarLayoutCubitScreenCrudItem({ super.custom, super.height = 60, + super.scaffoldFieldsWrapper, super.key, }); } diff --git a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_list.dart b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_list.dart index 902ce24c..80c53b40 100644 --- a/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_list.dart +++ b/packages/wyatt_bloc_layout/lib/src/presentation/top_app_bar_bloc_layout/top_app_bar_layout_cubit_screen_crud_list.dart @@ -24,6 +24,7 @@ abstract class TopAppBarLayoutCubitScreenCrudList< const TopAppBarLayoutCubitScreenCrudList({ super.custom, super.height = 60, + super.scaffoldFieldsWrapper, super.key, }); } diff --git a/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/top_app_bar_layout.dart b/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/top_app_bar_layout.dart index 0f9acc41..57f5647d 100644 --- a/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/top_app_bar_layout.dart +++ b/packages/wyatt_ui_layout/lib/src/presentation/layouts/structural_layouts/top_app_bar_layout.dart @@ -113,6 +113,7 @@ class TopAppBarLayout extends TopBarLayout { required super.body, super.custom, super.height, + super.scaffoldFieldsWrapper, super.key, }); @@ -133,6 +134,7 @@ class TopNavigationBarLayout extends TopBarLayout { required super.body, super.custom, super.height, + super.scaffoldFieldsWrapper, super.key, });