From a6903ae432946145504478c1874e02f892189ee5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Malo=20L=C3=A9on?= Date: Fri, 25 Aug 2023 19:12:58 +0200 Subject: [PATCH] feat(ui_components)!: available same type component usage (#200) --- packages/wyatt_ui_components/README.md | 47 ++- .../example/lib/component_theme.dart | 16 +- .../lib/components/custom_app_bar.g.dart | 99 ------ ..._app_bar.dart => custom_root_app_bar.dart} | 8 +- .../lib/components/custom_root_app_bar.g.dart | 101 ++++++ .../lib/components/custom_second_app_bar.dart | 20 ++ .../components/custom_second_app_bar.g.dart | 103 ++++++ .../wyatt_ui_components/example/lib/main.dart | 21 +- .../lib/src/core/core.dart | 2 + .../core/extensions/component_extensions.dart | 33 ++ .../src/core/utils/component_registry.dart | 59 ++++ .../src/features/component_theme_data.dart | 263 +++++++------- .../src/features/component_theme_data.g.dart | 321 ++++++++++-------- packages/wyatt_ui_components/pubspec.yaml | 2 +- 14 files changed, 703 insertions(+), 392 deletions(-) delete mode 100644 packages/wyatt_ui_components/example/lib/components/custom_app_bar.g.dart rename packages/wyatt_ui_components/example/lib/components/{custom_app_bar.dart => custom_root_app_bar.dart} (63%) create mode 100644 packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.g.dart create mode 100644 packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.dart create mode 100644 packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.g.dart create mode 100644 packages/wyatt_ui_components/lib/src/core/extensions/component_extensions.dart create mode 100644 packages/wyatt_ui_components/lib/src/core/utils/component_registry.dart diff --git a/packages/wyatt_ui_components/README.md b/packages/wyatt_ui_components/README.md index dbff11f0..eeda4b32 100644 --- a/packages/wyatt_ui_components/README.md +++ b/packages/wyatt_ui_components/README.md @@ -43,7 +43,23 @@ First create all your custom components in `domain/entities` folder. For exemple > Run `flutter pub run build_runner build` to generate your components. -Then, add your components to `ComponentThemeData` class. +Then, add your components to `ComponentThemeData` class. You can utilize multiple components of the same type, such as having multiple top app bars or distinct cards. However, it's necessary to distinguish them using identifiers. Extensions are provided to make your life easier. Note that it's not obligatory to assign an identifier to a component if there's only one of its kind. Here's an example: + +```dart +class AppThemeComponent { + static ComponentThemeData get components => ComponentThemeData.raw( + topAppBars: const { + 'root': CustomRootAppBar(), + 'second': CustomSecondAppBar(), + }.registry(), + bottomNavigationBars: const CustomBottomNavigationBar().registry(), + errors: const CustomErrorWidget().registry(), + loaders: const CustomLoaderWidget().registry(), + ); +} +``` + +I've rephrased the sentence while maintaining the original meaning and intent. ### Provider @@ -82,21 +98,28 @@ context.components, For example : ```dart - @override - Widget build(BuildContext context) => Scaffold( - appBar: context.components.appBar, - body: ... - ) + context.components.topAppBarComponent()(), ``` -If you need specific settings, or pass parameters to your component, call `copyWith.call` method. +or ```dart - @override - Widget build(BuildContext context) => Scaffold( - appBar: context.components.appBar.copyWith.call({title: 'New Title !'}), - body: ... - ) + appBar: context.components.topAppBarComponent().call(), +``` + +If you require specific settings or want to pass parameters to your component, simply provide them when you call your component. + +```dart + context.components.loaderComponent()( + colors: const MultiColor.single(Colors.green), + ), +``` + +And if you have only one parameter to modify, you can directly call it as shown below: + +```dart + context.components.loaderComponent(). + colors(const MultiColor.single(Colors.green)), ``` ## Default implementation diff --git a/packages/wyatt_ui_components/example/lib/component_theme.dart b/packages/wyatt_ui_components/example/lib/component_theme.dart index 258dfd0e..3f3e38fb 100644 --- a/packages/wyatt_ui_components/example/lib/component_theme.dart +++ b/packages/wyatt_ui_components/example/lib/component_theme.dart @@ -1,14 +1,18 @@ import 'package:wyatt_ui_components/wyatt_ui_components.dart'; -import 'package:wyatt_ui_components_example/components/custom_app_bar.dart'; import 'package:wyatt_ui_components_example/components/custom_bottom_bar.dart'; import 'package:wyatt_ui_components_example/components/custom_error_widget.dart'; import 'package:wyatt_ui_components_example/components/custom_loader_widget.dart'; +import 'package:wyatt_ui_components_example/components/custom_root_app_bar.dart'; +import 'package:wyatt_ui_components_example/components/custom_second_app_bar.dart'; class AppThemeComponent { - static ComponentThemeData get components => const ComponentThemeData.raw( - topAppBar: CustomAppBar(), - bottomNavigationBar: CustomBottomNavigationBar(), - error: CustomErrorWidget(), - loader: CustomLoaderWidget(), + static ComponentThemeData get components => ComponentThemeData.raw( + topAppBars: const { + 'root': CustomRootAppBar(), + 'second': CustomSecondAppBar(), + }.registry(), + bottomNavigationBars: const CustomBottomNavigationBar().registry(), + errors: const CustomErrorWidget().registry(), + loaders: const CustomLoaderWidget().registry(), ); } diff --git a/packages/wyatt_ui_components/example/lib/components/custom_app_bar.g.dart b/packages/wyatt_ui_components/example/lib/components/custom_app_bar.g.dart deleted file mode 100644 index 125680d9..00000000 --- a/packages/wyatt_ui_components/example/lib/components/custom_app_bar.g.dart +++ /dev/null @@ -1,99 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'custom_app_bar.dart'; - -// ************************************************************************** -// ComponentCopyWithGenerator -// ************************************************************************** - -class $CustomAppBarCWProxyImpl implements $TopAppBarComponentCWProxy { - const $CustomAppBarCWProxyImpl(this._value); - final CustomAppBar _value; - @override - CustomAppBar title(TextWrapper? title) => this(title: title); - @override - CustomAppBar centerTitle(bool? centerTitle) => this(centerTitle: centerTitle); - @override - CustomAppBar shape(ShapeBorder? shape) => this(shape: shape); - @override - CustomAppBar systemOverlayStyle(SystemUiOverlayStyle? systemOverlayStyle) => - this(systemOverlayStyle: systemOverlayStyle); - @override - CustomAppBar automaticallyImplyLeading(bool? automaticallyImplyLeading) => - this(automaticallyImplyLeading: automaticallyImplyLeading); - @override - CustomAppBar flexibleSpace(Widget? flexibleSpace) => - this(flexibleSpace: flexibleSpace); - @override - CustomAppBar bottom(PreferredSizeWidget? bottom) => this(bottom: bottom); - @override - CustomAppBar elevation(double? elevation) => this(elevation: elevation); - @override - CustomAppBar scrolledUnderElevation(double? scrolledUnderElevation) => - this(scrolledUnderElevation: scrolledUnderElevation); - @override - CustomAppBar shadowColor(Color? shadowColor) => - this(shadowColor: shadowColor); - @override - CustomAppBar surfaceTintColor(Color? surfaceTintColor) => - this(surfaceTintColor: surfaceTintColor); - @override - CustomAppBar backgroundColor(MultiColor? backgroundColor) => - this(backgroundColor: backgroundColor); - @override - CustomAppBar iconTheme(IconThemeData? iconTheme) => - this(iconTheme: iconTheme); - @override - CustomAppBar primary(bool? primary) => this(primary: primary); - @override - CustomAppBar excludeHeaderSemantics(bool? excludeHeaderSemantics) => - this(excludeHeaderSemantics: excludeHeaderSemantics); - @override - CustomAppBar toolbarHeight(double? toolbarHeight) => - this(toolbarHeight: toolbarHeight); - @override - CustomAppBar leadingWidth(double? leadingWidth) => - this(leadingWidth: leadingWidth); - @override - CustomAppBar leading(Widget? leading) => this(leading: leading); - @override - CustomAppBar actions(List? actions) => this(actions: actions); - @override - CustomAppBar expandedWidget(List? expandedWidget) => - this(expandedWidget: expandedWidget); - @override - CustomAppBar key(Key? key) => this(key: key); - @override - CustomAppBar call({ - TextWrapper? title, - bool? centerTitle, - ShapeBorder? shape, - SystemUiOverlayStyle? systemOverlayStyle, - bool? automaticallyImplyLeading, - Widget? flexibleSpace, - PreferredSizeWidget? bottom, - double? elevation, - double? scrolledUnderElevation, - Color? shadowColor, - Color? surfaceTintColor, - MultiColor? backgroundColor, - IconThemeData? iconTheme, - bool? primary, - bool? excludeHeaderSemantics, - double? toolbarHeight, - double? leadingWidth, - Widget? leading, - List? actions, - List? expandedWidget, - Key? key, - }) => - CustomAppBar( - title: title ?? _value.title, - key: key ?? _value.key, - ); -} - -mixin $CustomAppBarCWMixin on Component { - $TopAppBarComponentCWProxy get copyWith => - $CustomAppBarCWProxyImpl(this as CustomAppBar); -} diff --git a/packages/wyatt_ui_components/example/lib/components/custom_app_bar.dart b/packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.dart similarity index 63% rename from packages/wyatt_ui_components/example/lib/components/custom_app_bar.dart rename to packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.dart index e14c228f..a096fe8f 100644 --- a/packages/wyatt_ui_components/example/lib/components/custom_app_bar.dart +++ b/packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.dart @@ -1,12 +1,14 @@ import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart'; import 'package:wyatt_ui_components/wyatt_ui_components.dart'; -part 'custom_app_bar.g.dart'; +part 'custom_root_app_bar.g.dart'; @ComponentCopyWithExtension() -class CustomAppBar extends TopAppBarComponent with $CustomAppBarCWMixin { - const CustomAppBar({super.title, super.key}); +class CustomRootAppBar extends TopAppBarComponent + with $CustomRootAppBarCWMixin { + const CustomRootAppBar({super.title, super.key}); @override Widget build(BuildContext context) => AppBar( diff --git a/packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.g.dart b/packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.g.dart new file mode 100644 index 00000000..a276f16b --- /dev/null +++ b/packages/wyatt_ui_components/example/lib/components/custom_root_app_bar.g.dart @@ -0,0 +1,101 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'custom_root_app_bar.dart'; + +// ************************************************************************** +// ComponentCopyWithGenerator +// ************************************************************************** + +class $CustomRootAppBarCWProxyImpl implements $TopAppBarComponentCWProxy { + const $CustomRootAppBarCWProxyImpl(this._value); + final CustomRootAppBar _value; + @override + CustomRootAppBar title(TextWrapper? title) => this(title: title); + @override + CustomRootAppBar centerTitle(bool? centerTitle) => + this(centerTitle: centerTitle); + @override + CustomRootAppBar shape(ShapeBorder? shape) => this(shape: shape); + @override + CustomRootAppBar systemOverlayStyle( + SystemUiOverlayStyle? systemOverlayStyle) => + this(systemOverlayStyle: systemOverlayStyle); + @override + CustomRootAppBar automaticallyImplyLeading(bool? automaticallyImplyLeading) => + this(automaticallyImplyLeading: automaticallyImplyLeading); + @override + CustomRootAppBar flexibleSpace(Widget? flexibleSpace) => + this(flexibleSpace: flexibleSpace); + @override + CustomRootAppBar bottom(PreferredSizeWidget? bottom) => this(bottom: bottom); + @override + CustomRootAppBar elevation(double? elevation) => this(elevation: elevation); + @override + CustomRootAppBar scrolledUnderElevation(double? scrolledUnderElevation) => + this(scrolledUnderElevation: scrolledUnderElevation); + @override + CustomRootAppBar shadowColor(Color? shadowColor) => + this(shadowColor: shadowColor); + @override + CustomRootAppBar surfaceTintColor(Color? surfaceTintColor) => + this(surfaceTintColor: surfaceTintColor); + @override + CustomRootAppBar backgroundColor(MultiColor? backgroundColor) => + this(backgroundColor: backgroundColor); + @override + CustomRootAppBar iconTheme(IconThemeData? iconTheme) => + this(iconTheme: iconTheme); + @override + CustomRootAppBar primary(bool? primary) => this(primary: primary); + @override + CustomRootAppBar excludeHeaderSemantics(bool? excludeHeaderSemantics) => + this(excludeHeaderSemantics: excludeHeaderSemantics); + @override + CustomRootAppBar toolbarHeight(double? toolbarHeight) => + this(toolbarHeight: toolbarHeight); + @override + CustomRootAppBar leadingWidth(double? leadingWidth) => + this(leadingWidth: leadingWidth); + @override + CustomRootAppBar leading(Widget? leading) => this(leading: leading); + @override + CustomRootAppBar actions(List? actions) => this(actions: actions); + @override + CustomRootAppBar expandedWidget(List? expandedWidget) => + this(expandedWidget: expandedWidget); + @override + CustomRootAppBar key(Key? key) => this(key: key); + @override + CustomRootAppBar call({ + TextWrapper? title, + bool? centerTitle, + ShapeBorder? shape, + SystemUiOverlayStyle? systemOverlayStyle, + bool? automaticallyImplyLeading, + Widget? flexibleSpace, + PreferredSizeWidget? bottom, + double? elevation, + double? scrolledUnderElevation, + Color? shadowColor, + Color? surfaceTintColor, + MultiColor? backgroundColor, + IconThemeData? iconTheme, + bool? primary, + bool? excludeHeaderSemantics, + double? toolbarHeight, + double? leadingWidth, + Widget? leading, + List? actions, + List? expandedWidget, + Key? key, + }) => + CustomRootAppBar( + title: title ?? _value.title, + key: key ?? _value.key, + ); +} + +mixin $CustomRootAppBarCWMixin on Component { + $TopAppBarComponentCWProxy get copyWith => + $CustomRootAppBarCWProxyImpl(this as CustomRootAppBar); +} diff --git a/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.dart b/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.dart new file mode 100644 index 00000000..bc8303f7 --- /dev/null +++ b/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.dart @@ -0,0 +1,20 @@ +import 'package:flutter/material.dart'; +import 'package:flutter/services.dart'; +import 'package:wyatt_component_copy_with_extension/wyatt_component_copy_with_extension.dart'; +import 'package:wyatt_ui_components/wyatt_ui_components.dart'; + +part 'custom_second_app_bar.g.dart'; + +@ComponentCopyWithExtension() +class CustomSecondAppBar extends TopAppBarComponent + with $CustomSecondAppBarCWMixin { + const CustomSecondAppBar({super.title, super.key}); + + @override + Widget build(BuildContext context) => AppBar( + backgroundColor: Colors.green, + title: Text( + super.title?.data ?? '', + ), + ); +} diff --git a/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.g.dart b/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.g.dart new file mode 100644 index 00000000..b2baf398 --- /dev/null +++ b/packages/wyatt_ui_components/example/lib/components/custom_second_app_bar.g.dart @@ -0,0 +1,103 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'custom_second_app_bar.dart'; + +// ************************************************************************** +// ComponentCopyWithGenerator +// ************************************************************************** + +class $CustomSecondAppBarCWProxyImpl implements $TopAppBarComponentCWProxy { + const $CustomSecondAppBarCWProxyImpl(this._value); + final CustomSecondAppBar _value; + @override + CustomSecondAppBar title(TextWrapper? title) => this(title: title); + @override + CustomSecondAppBar centerTitle(bool? centerTitle) => + this(centerTitle: centerTitle); + @override + CustomSecondAppBar shape(ShapeBorder? shape) => this(shape: shape); + @override + CustomSecondAppBar systemOverlayStyle( + SystemUiOverlayStyle? systemOverlayStyle) => + this(systemOverlayStyle: systemOverlayStyle); + @override + CustomSecondAppBar automaticallyImplyLeading( + bool? automaticallyImplyLeading) => + this(automaticallyImplyLeading: automaticallyImplyLeading); + @override + CustomSecondAppBar flexibleSpace(Widget? flexibleSpace) => + this(flexibleSpace: flexibleSpace); + @override + CustomSecondAppBar bottom(PreferredSizeWidget? bottom) => + this(bottom: bottom); + @override + CustomSecondAppBar elevation(double? elevation) => this(elevation: elevation); + @override + CustomSecondAppBar scrolledUnderElevation(double? scrolledUnderElevation) => + this(scrolledUnderElevation: scrolledUnderElevation); + @override + CustomSecondAppBar shadowColor(Color? shadowColor) => + this(shadowColor: shadowColor); + @override + CustomSecondAppBar surfaceTintColor(Color? surfaceTintColor) => + this(surfaceTintColor: surfaceTintColor); + @override + CustomSecondAppBar backgroundColor(MultiColor? backgroundColor) => + this(backgroundColor: backgroundColor); + @override + CustomSecondAppBar iconTheme(IconThemeData? iconTheme) => + this(iconTheme: iconTheme); + @override + CustomSecondAppBar primary(bool? primary) => this(primary: primary); + @override + CustomSecondAppBar excludeHeaderSemantics(bool? excludeHeaderSemantics) => + this(excludeHeaderSemantics: excludeHeaderSemantics); + @override + CustomSecondAppBar toolbarHeight(double? toolbarHeight) => + this(toolbarHeight: toolbarHeight); + @override + CustomSecondAppBar leadingWidth(double? leadingWidth) => + this(leadingWidth: leadingWidth); + @override + CustomSecondAppBar leading(Widget? leading) => this(leading: leading); + @override + CustomSecondAppBar actions(List? actions) => this(actions: actions); + @override + CustomSecondAppBar expandedWidget(List? expandedWidget) => + this(expandedWidget: expandedWidget); + @override + CustomSecondAppBar key(Key? key) => this(key: key); + @override + CustomSecondAppBar call({ + TextWrapper? title, + bool? centerTitle, + ShapeBorder? shape, + SystemUiOverlayStyle? systemOverlayStyle, + bool? automaticallyImplyLeading, + Widget? flexibleSpace, + PreferredSizeWidget? bottom, + double? elevation, + double? scrolledUnderElevation, + Color? shadowColor, + Color? surfaceTintColor, + MultiColor? backgroundColor, + IconThemeData? iconTheme, + bool? primary, + bool? excludeHeaderSemantics, + double? toolbarHeight, + double? leadingWidth, + Widget? leading, + List? actions, + List? expandedWidget, + Key? key, + }) => + CustomSecondAppBar( + title: title ?? _value.title, + key: key ?? _value.key, + ); +} + +mixin $CustomSecondAppBarCWMixin on Component { + $TopAppBarComponentCWProxy get copyWith => + $CustomSecondAppBarCWProxyImpl(this as CustomSecondAppBar); +} diff --git a/packages/wyatt_ui_components/example/lib/main.dart b/packages/wyatt_ui_components/example/lib/main.dart index be86f9b0..ac72753b 100644 --- a/packages/wyatt_ui_components/example/lib/main.dart +++ b/packages/wyatt_ui_components/example/lib/main.dart @@ -47,14 +47,22 @@ class Home extends StatelessWidget { @override Widget build(BuildContext context) => Scaffold( appBar: PreferredSize( - preferredSize: const Size.fromHeight(60), - child: context.components.topAppBarComponent - .title(const TextWrapper('Example title')), + preferredSize: const Size.fromHeight(120), + child: Column( + children: [ + context.components + .topAppBarComponent() + .title(const TextWrapper('Example title')), + context.components + .topAppBarComponent('second') + .title(const TextWrapper('Example title')), + ], + ), ), body: Column( children: [ Expanded( - child: context.components.errorComponent.call( + child: context.components.errorComponent()( message: const TextWrapper('Example error'), ), ), @@ -62,12 +70,13 @@ class Home extends StatelessWidget { height: 10, ), Expanded( - child: context.components.loaderComponent.call( + child: context.components.loaderComponent()( colors: const MultiColor.single(Colors.green), ), ), ], ), - bottomNavigationBar: context.components.bottomNavigationBar, + bottomNavigationBar: + context.components.bottomNavigationBarComponent()(), ); } diff --git a/packages/wyatt_ui_components/lib/src/core/core.dart b/packages/wyatt_ui_components/lib/src/core/core.dart index e4df47c7..b27375d2 100644 --- a/packages/wyatt_ui_components/lib/src/core/core.dart +++ b/packages/wyatt_ui_components/lib/src/core/core.dart @@ -16,5 +16,7 @@ export 'enums/enums.dart'; export 'extensions/build_context_extensions.dart'; +export 'extensions/component_extensions.dart'; export 'mixins/copy_with_mixin.dart'; +export 'utils/component_registry.dart'; export 'utils/utils.dart'; diff --git a/packages/wyatt_ui_components/lib/src/core/extensions/component_extensions.dart b/packages/wyatt_ui_components/lib/src/core/extensions/component_extensions.dart new file mode 100644 index 00000000..e649d9a3 --- /dev/null +++ b/packages/wyatt_ui_components/lib/src/core/extensions/component_extensions.dart @@ -0,0 +1,33 @@ +// 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 . + +import 'package:wyatt_ui_components/wyatt_ui_components.dart'; + +/// Extension on a map of components that creates a [ComponentRegistry] +/// using the map's content. +extension ComponentMapExtension on Map { + /// Creates and returns a [ComponentRegistry] based on the map's components. + ComponentRegistry registry() => ComponentRegistry(components: this); +} + +/// Extension on a single component that creates a [ComponentRegistry] +/// containing only that component. +extension ComponentExtension on T { + /// Creates and returns a [ComponentRegistry] containing + /// only this component. + // ignore: use_to_and_as_if_applicable + ComponentRegistry registry() => ComponentRegistry.solo(this); +} diff --git a/packages/wyatt_ui_components/lib/src/core/utils/component_registry.dart b/packages/wyatt_ui_components/lib/src/core/utils/component_registry.dart new file mode 100644 index 00000000..04dfee56 --- /dev/null +++ b/packages/wyatt_ui_components/lib/src/core/utils/component_registry.dart @@ -0,0 +1,59 @@ +// 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 . + +import 'package:wyatt_ui_components/wyatt_ui_components.dart'; + +/// A registry for components of type [T], providing easy access and management. +class ComponentRegistry { + /// Constructs a [ComponentRegistry] with the given [components]. + const ComponentRegistry({required Map components}) + : _components = components; + + /// Factory constructor to create a [ComponentRegistry] + /// containing only a single [component]. + factory ComponentRegistry.solo(T component) => ComponentRegistry( + components: { + 'solo': component, + }, + ); + + final Map _components; + + /// Returns a component by its [id], or the first + /// component if [id] is null or not found. + T? call([String? id]) => getComponent(id) ?? getFirstComponent(); + + /// Returns a component by its [id], or null if not found. + T? getComponent(String? id) => _components[id]; + + /// Returns the first component in the registry, or null + /// if the registry is empty. + T? getFirstComponent() => _components.values.firstOrNull; + + /// Checks if the registry contains a component with the given [id]. + bool containsComponent(String id) => _components.containsKey(id); + + /// Returns the count of components in the registry. + int get count => _components.length; + + /// Returns a list of all IDs of components in the registry. + List get ids => _components.keys.toList(); + + /// Returns a string representation of the registry, + /// showing the count and IDs. + @override + String toString() => '$count - $ids'; +} diff --git a/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart index 0410e034..95293092 100644 --- a/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart +++ b/packages/wyatt_ui_components/lib/src/features/component_theme_data.dart @@ -16,6 +16,7 @@ import 'package:copy_with_extension/copy_with_extension.dart'; import 'package:flutter/material.dart'; +import 'package:wyatt_ui_components/src/core/utils/component_registry.dart'; import 'package:wyatt_ui_components/src/domain/entities/entities.dart'; part 'component_theme_data.g.dart'; @@ -26,64 +27,64 @@ part 'component_theme_data.g.dart'; class ComponentThemeData { /// {@macro component_theme_data} factory ComponentThemeData({ - TopAppBarComponent? topAppBar, - TopNavigationBarComponent? topNavigationBar, - BottomNavigationBarComponent? bottomNavigationBar, - ErrorComponent? error, - LoaderComponent? loader, - RichTextBuilderComponent? richTextBuilder, - TextInputComponent? textInput, - FileSelectionButtonComponent? fileSelectionButton, - FlatButtonComponent? flatButton, - SimpleIconButtonComponent? simpleIconButton, - SymbolButtonComponent? symbolButton, - InformationCardComponent? informationCard, - PortfolioCardComponent? portfolioCard, - QuoteCardComponent? quoteCard, - SkillCardComponent? skillCard, - PricingCardComponent? pricingCard, - FloatingActionButtonComponent? floatingActionButton, + ComponentRegistry? topAppBars, + ComponentRegistry? topNavigationBars, + ComponentRegistry? bottomNavigationBars, + ComponentRegistry? errors, + ComponentRegistry? loaders, + ComponentRegistry? richTextBuilders, + ComponentRegistry? textInputs, + ComponentRegistry? fileSelectionButtons, + ComponentRegistry? flatButtons, + ComponentRegistry? simpleIconButtons, + ComponentRegistry? symbolButtons, + ComponentRegistry? informationCards, + ComponentRegistry? portfolioCards, + ComponentRegistry? quoteCards, + ComponentRegistry? skillCards, + ComponentRegistry? pricingCards, + ComponentRegistry? floatingActionButtons, }) => ComponentThemeData.raw( - topAppBar: topAppBar, - topNavigationBar: topNavigationBar, - bottomNavigationBar: bottomNavigationBar, - error: error, - loader: loader, - richTextBuilder: richTextBuilder, - textInput: textInput, - fileSelectionButton: fileSelectionButton, - flatButton: flatButton, - simpleIconButton: simpleIconButton, - symbolButton: symbolButton, - informationCard: informationCard, - portfolioCard: portfolioCard, - quoteCard: quoteCard, - skillCard: skillCard, - pricingCard: pricingCard, - floatingActionButton: floatingActionButton, + topAppBars: topAppBars, + topNavigationBars: topNavigationBars, + bottomNavigationBars: bottomNavigationBars, + errors: errors, + loaders: loaders, + richTextBuilders: richTextBuilders, + textInputs: textInputs, + fileSelectionButtons: fileSelectionButtons, + flatButtons: flatButtons, + simpleIconButtons: simpleIconButtons, + symbolButtons: symbolButtons, + informationCards: informationCards, + portfolioCards: portfolioCards, + quoteCards: quoteCards, + skillCards: skillCards, + pricingCards: pricingCards, + floatingActionButtons: floatingActionButtons, ); - /// {@macro component_theme_data} + // /// {@macro component_theme_data} factory ComponentThemeData.fromOther(ComponentThemeData other) => ComponentThemeData( - topAppBar: other.topAppBar, - topNavigationBar: other.topNavigationBar, - bottomNavigationBar: other.bottomNavigationBar, - error: other.error, - loader: other.loader, - richTextBuilder: other.richTextBuilder, - textInput: other.textInput, - fileSelectionButton: other.fileSelectionButton, - flatButton: other.flatButton, - simpleIconButton: other.simpleIconButton, - symbolButton: other.symbolButton, - informationCard: other.informationCard, - portfolioCard: other.portfolioCard, - quoteCard: other.quoteCard, - skillCard: other.skillCard, - pricingCard: other.pricingCard, - floatingActionButton: other.floatingActionButton, + topAppBars: other.topAppBars, + topNavigationBars: other.topNavigationBars, + bottomNavigationBars: other.bottomNavigationBars, + errors: other.errors, + loaders: other.loaders, + richTextBuilders: other.richTextBuilders, + textInputs: other.textInputs, + fileSelectionButtons: other.fileSelectionButtons, + flatButtons: other.flatButtons, + simpleIconButtons: other.simpleIconButtons, + symbolButtons: other.symbolButtons, + informationCards: other.informationCards, + portfolioCards: other.portfolioCards, + quoteCards: other.quoteCards, + skillCards: other.skillCards, + pricingCards: other.pricingCards, + floatingActionButtons: other.floatingActionButtons, ); /// Create a [ComponentThemeData] given a set of exact values. Most values @@ -93,23 +94,23 @@ class ComponentThemeData { /// create intermediate themes based on two themes created with the /// [ComponentThemeData] constructor. const ComponentThemeData.raw({ - this.topAppBar, - this.topNavigationBar, - this.bottomNavigationBar, - this.error, - this.loader, - this.richTextBuilder, - this.textInput, - this.fileSelectionButton, - this.flatButton, - this.simpleIconButton, - this.symbolButton, - this.informationCard, - this.portfolioCard, - this.quoteCard, - this.skillCard, - this.pricingCard, - this.floatingActionButton, + this.topAppBars, + this.topNavigationBars, + this.bottomNavigationBars, + this.errors, + this.loaders, + this.richTextBuilders, + this.textInputs, + this.fileSelectionButtons, + this.flatButtons, + this.simpleIconButtons, + this.symbolButtons, + this.informationCards, + this.portfolioCards, + this.quoteCards, + this.skillCards, + this.pricingCards, + this.floatingActionButtons, }); R _get(T? component, R? returned) { @@ -128,64 +129,90 @@ class ComponentThemeData { } // Bars - final TopAppBarComponent? topAppBar; - $TopAppBarComponentCWProxy get topAppBarComponent => - _get(topAppBar, topAppBar?.copyWith); - final TopNavigationBarComponent? topNavigationBar; - $TopNavigationBarComponentCWProxy get topNavigationBarComponent => - _get(topNavigationBar, topNavigationBar?.copyWith); - final BottomNavigationBarComponent? bottomNavigationBar; - $BottomNavigationBarComponentCWProxy get bottomNavigationBarComponent => - _get(bottomNavigationBar, bottomNavigationBar?.copyWith); + final ComponentRegistry? topAppBars; + $TopAppBarComponentCWProxy topAppBarComponent([String? id]) => + _get(topAppBars?.call(id), topAppBars?.call(id)?.copyWith); + + final ComponentRegistry? topNavigationBars; + $TopNavigationBarComponentCWProxy topNavigationBarComponent([String? id]) => + _get(topNavigationBars?.call(id), topNavigationBars?.call(id)?.copyWith); + + final ComponentRegistry? bottomNavigationBars; + $BottomNavigationBarComponentCWProxy bottomNavigationBarComponent([ + String? id, + ]) => + _get( + bottomNavigationBars?.call(id), + bottomNavigationBars?.call(id)?.copyWith, + ); // CRUD Widgets - final ErrorComponent? error; - $ErrorComponentCWProxy get errorComponent => _get(error, error?.copyWith); - final LoaderComponent? loader; - $LoaderComponentCWProxy get loaderComponent => _get(loader, loader?.copyWith); + final ComponentRegistry? errors; + $ErrorComponentCWProxy errorComponent([String? id]) => + _get(errors?.call(id), errors?.call(id)?.copyWith); + + final ComponentRegistry? loaders; + $LoaderComponentCWProxy loaderComponent([String? id]) => + _get(loaders?.call(id), loaders?.call(id)?.copyWith); // Cards - final InformationCardComponent? informationCard; - $InformationCardComponentCWProxy get informationCardComponent => - _get(informationCard, informationCard?.copyWith); - final PortfolioCardComponent? portfolioCard; - $PortfolioCardComponentCWProxy get portfolioCardComponent => - _get(portfolioCard, portfolioCard?.copyWith); - final QuoteCardComponent? quoteCard; - $QuoteCardComponentCWProxy get quoteCardComponent => - _get(quoteCard, quoteCard?.copyWith); - final SkillCardComponent? skillCard; - $SkillCardComponentCWProxy get skillCardComponent => - _get(skillCard, skillCard?.copyWith); - final PricingCardComponent? pricingCard; - $PricingCardComponentCWProxy get pricingCardComponent => - _get(pricingCard, pricingCard?.copyWith); + final ComponentRegistry? informationCards; + $InformationCardComponentCWProxy informationCardComponent([String? id]) => + _get(informationCards?.call(id), informationCards?.call(id)?.copyWith); + + final ComponentRegistry? portfolioCards; + $PortfolioCardComponentCWProxy portfolioCardComponent([String? id]) => + _get(portfolioCards?.call(id), portfolioCards?.call(id)?.copyWith); + + final ComponentRegistry? quoteCards; + $QuoteCardComponentCWProxy quoteCardComponent([String? id]) => + _get(quoteCards?.call(id), quoteCards?.call(id)?.copyWith); + + final ComponentRegistry? skillCards; + $SkillCardComponentCWProxy skillCardComponent([String? id]) => + _get(skillCards?.call(id), skillCards?.call(id)?.copyWith); + final ComponentRegistry? pricingCards; + $PricingCardComponentCWProxy pricingCardComponent([String? id]) => + _get(pricingCards?.call(id), pricingCards?.call(id)?.copyWith); // Rich Text - final RichTextBuilderComponent? richTextBuilder; - $RichTextBuilderComponentCWProxy get richTextBuilderComponent => - _get(richTextBuilder, richTextBuilder?.copyWith); + final ComponentRegistry? richTextBuilders; + $RichTextBuilderComponentCWProxy richTextBuilderComponent([String? id]) => + _get(richTextBuilders?.call(id), richTextBuilders?.call(id)?.copyWith); // Text Inputs - final TextInputComponent? textInput; - $TextInputComponentCWProxy get textInputComponent => - _get(textInput, textInput?.copyWith); + final ComponentRegistry? textInputs; + $TextInputComponentCWProxy textInputComponent([String? id]) => + _get(textInputs?.call(id), textInputs?.call(id)?.copyWith); // Buttons - final FileSelectionButtonComponent? fileSelectionButton; - $FileSelectionButtonComponentCWProxy get fileSelectionButtonComponent => - _get(fileSelectionButton, fileSelectionButton?.copyWith); - final FlatButtonComponent? flatButton; - $FlatButtonComponentCWProxy get flatButtonComponent => - _get(flatButton, flatButton?.copyWith); - final SimpleIconButtonComponent? simpleIconButton; - $SimpleIconButtonComponentCWProxy get simpleIconButtonComponent => - _get(simpleIconButton, simpleIconButton?.copyWith); - final SymbolButtonComponent? symbolButton; - $SymbolButtonComponentCWProxy get symbolButtonComponent => - _get(symbolButton, symbolButton?.copyWith); + final ComponentRegistry? fileSelectionButtons; + $FileSelectionButtonComponentCWProxy fileSelectionButtonComponent([ + String? id, + ]) => + _get( + fileSelectionButtons?.call(id), + fileSelectionButtons?.call(id)?.copyWith, + ); - final FloatingActionButtonComponent? floatingActionButton; - $FloatingActionButtonComponentCWProxy get floatingActionButtonComponent => - _get(floatingActionButton, floatingActionButton?.copyWith); + final ComponentRegistry? flatButtons; + $FlatButtonComponentCWProxy flatButtonComponent([String? id]) => + _get(flatButtons?.call(id), flatButtons?.call(id)?.copyWith); + + final ComponentRegistry? simpleIconButtons; + $SimpleIconButtonComponentCWProxy simpleIconButtonComponent([String? id]) => + _get(simpleIconButtons?.call(id), simpleIconButtons?.call(id)?.copyWith); + + final ComponentRegistry? symbolButtons; + $SymbolButtonComponentCWProxy symbolButtonComponent([String? id]) => + _get(symbolButtons?.call(id), symbolButtons?.call(id)?.copyWith); + + final ComponentRegistry? floatingActionButtons; + $FloatingActionButtonComponentCWProxy floatingActionButtonComponent([ + String? id, + ]) => + _get( + floatingActionButtons?.call(id), + floatingActionButtons?.call(id)?.copyWith, + ); } diff --git a/packages/wyatt_ui_components/lib/src/features/component_theme_data.g.dart b/packages/wyatt_ui_components/lib/src/features/component_theme_data.g.dart index cd9b6bc5..dc03e692 100644 --- a/packages/wyatt_ui_components/lib/src/features/component_theme_data.g.dart +++ b/packages/wyatt_ui_components/lib/src/features/component_theme_data.g.dart @@ -7,44 +7,54 @@ part of 'component_theme_data.dart'; // ************************************************************************** abstract class _$ComponentThemeDataCWProxy { - ComponentThemeData topAppBar(TopAppBarComponent? topAppBar); + ComponentThemeData topAppBars( + ComponentRegistry? topAppBars); - ComponentThemeData topNavigationBar( - TopNavigationBarComponent? topNavigationBar); + ComponentThemeData topNavigationBars( + ComponentRegistry? topNavigationBars); - ComponentThemeData bottomNavigationBar( - BottomNavigationBarComponent? bottomNavigationBar); + ComponentThemeData bottomNavigationBars( + ComponentRegistry? bottomNavigationBars); - ComponentThemeData error(ErrorComponent? error); + ComponentThemeData errors(ComponentRegistry? errors); - ComponentThemeData loader(LoaderComponent? loader); + ComponentThemeData loaders(ComponentRegistry? loaders); - ComponentThemeData richTextBuilder(RichTextBuilderComponent? richTextBuilder); + ComponentThemeData richTextBuilders( + ComponentRegistry? richTextBuilders); - ComponentThemeData textInput(TextInputComponent? textInput); + ComponentThemeData textInputs( + ComponentRegistry? textInputs); - ComponentThemeData fileSelectionButton( - FileSelectionButtonComponent? fileSelectionButton); + ComponentThemeData fileSelectionButtons( + ComponentRegistry? fileSelectionButtons); - ComponentThemeData flatButton(FlatButtonComponent? flatButton); + ComponentThemeData flatButtons( + ComponentRegistry? flatButtons); - ComponentThemeData simpleIconButton( - SimpleIconButtonComponent? simpleIconButton); + ComponentThemeData simpleIconButtons( + ComponentRegistry? simpleIconButtons); - ComponentThemeData symbolButton(SymbolButtonComponent? symbolButton); + ComponentThemeData symbolButtons( + ComponentRegistry? symbolButtons); - ComponentThemeData informationCard(InformationCardComponent? informationCard); + ComponentThemeData informationCards( + ComponentRegistry? informationCards); - ComponentThemeData portfolioCard(PortfolioCardComponent? portfolioCard); + ComponentThemeData portfolioCards( + ComponentRegistry? portfolioCards); - ComponentThemeData quoteCard(QuoteCardComponent? quoteCard); + ComponentThemeData quoteCards( + ComponentRegistry? quoteCards); - ComponentThemeData skillCard(SkillCardComponent? skillCard); + ComponentThemeData skillCards( + ComponentRegistry? skillCards); - ComponentThemeData pricingCard(PricingCardComponent? pricingCard); + ComponentThemeData pricingCards( + ComponentRegistry? pricingCards); - ComponentThemeData floatingActionButton( - FloatingActionButtonComponent? floatingActionButton); + ComponentThemeData floatingActionButtons( + ComponentRegistry? floatingActionButtons); /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `ComponentThemeData(...).copyWith.fieldName(...)` to override fields one at a time with nullification support. /// @@ -53,23 +63,23 @@ abstract class _$ComponentThemeDataCWProxy { /// ComponentThemeData(...).copyWith(id: 12, name: "My name") /// ```` ComponentThemeData call({ - TopAppBarComponent? topAppBar, - TopNavigationBarComponent? topNavigationBar, - BottomNavigationBarComponent? bottomNavigationBar, - ErrorComponent? error, - LoaderComponent? loader, - RichTextBuilderComponent? richTextBuilder, - TextInputComponent? textInput, - FileSelectionButtonComponent? fileSelectionButton, - FlatButtonComponent? flatButton, - SimpleIconButtonComponent? simpleIconButton, - SymbolButtonComponent? symbolButton, - InformationCardComponent? informationCard, - PortfolioCardComponent? portfolioCard, - QuoteCardComponent? quoteCard, - SkillCardComponent? skillCard, - PricingCardComponent? pricingCard, - FloatingActionButtonComponent? floatingActionButton, + ComponentRegistry? topAppBars, + ComponentRegistry? topNavigationBars, + ComponentRegistry? bottomNavigationBars, + ComponentRegistry? errors, + ComponentRegistry? loaders, + ComponentRegistry? richTextBuilders, + ComponentRegistry? textInputs, + ComponentRegistry? fileSelectionButtons, + ComponentRegistry? flatButtons, + ComponentRegistry? simpleIconButtons, + ComponentRegistry? symbolButtons, + ComponentRegistry? informationCards, + ComponentRegistry? portfolioCards, + ComponentRegistry? quoteCards, + ComponentRegistry? skillCards, + ComponentRegistry? pricingCards, + ComponentRegistry? floatingActionButtons, }); } @@ -80,77 +90,90 @@ class _$ComponentThemeDataCWProxyImpl implements _$ComponentThemeDataCWProxy { final ComponentThemeData _value; @override - ComponentThemeData topAppBar(TopAppBarComponent? topAppBar) => - this(topAppBar: topAppBar); + ComponentThemeData topAppBars( + ComponentRegistry? topAppBars) => + this(topAppBars: topAppBars); @override - ComponentThemeData topNavigationBar( - TopNavigationBarComponent? topNavigationBar) => - this(topNavigationBar: topNavigationBar); + ComponentThemeData topNavigationBars( + ComponentRegistry? topNavigationBars) => + this(topNavigationBars: topNavigationBars); @override - ComponentThemeData bottomNavigationBar( - BottomNavigationBarComponent? bottomNavigationBar) => - this(bottomNavigationBar: bottomNavigationBar); + ComponentThemeData bottomNavigationBars( + ComponentRegistry? + bottomNavigationBars) => + this(bottomNavigationBars: bottomNavigationBars); @override - ComponentThemeData error(ErrorComponent? error) => this(error: error); + ComponentThemeData errors(ComponentRegistry? errors) => + this(errors: errors); @override - ComponentThemeData loader(LoaderComponent? loader) => this(loader: loader); + ComponentThemeData loaders(ComponentRegistry? loaders) => + this(loaders: loaders); @override - ComponentThemeData richTextBuilder( - RichTextBuilderComponent? richTextBuilder) => - this(richTextBuilder: richTextBuilder); + ComponentThemeData richTextBuilders( + ComponentRegistry? richTextBuilders) => + this(richTextBuilders: richTextBuilders); @override - ComponentThemeData textInput(TextInputComponent? textInput) => - this(textInput: textInput); + ComponentThemeData textInputs( + ComponentRegistry? textInputs) => + this(textInputs: textInputs); @override - ComponentThemeData fileSelectionButton( - FileSelectionButtonComponent? fileSelectionButton) => - this(fileSelectionButton: fileSelectionButton); + ComponentThemeData fileSelectionButtons( + ComponentRegistry? + fileSelectionButtons) => + this(fileSelectionButtons: fileSelectionButtons); @override - ComponentThemeData flatButton(FlatButtonComponent? flatButton) => - this(flatButton: flatButton); + ComponentThemeData flatButtons( + ComponentRegistry? flatButtons) => + this(flatButtons: flatButtons); @override - ComponentThemeData simpleIconButton( - SimpleIconButtonComponent? simpleIconButton) => - this(simpleIconButton: simpleIconButton); + ComponentThemeData simpleIconButtons( + ComponentRegistry? simpleIconButtons) => + this(simpleIconButtons: simpleIconButtons); @override - ComponentThemeData symbolButton(SymbolButtonComponent? symbolButton) => - this(symbolButton: symbolButton); + ComponentThemeData symbolButtons( + ComponentRegistry? symbolButtons) => + this(symbolButtons: symbolButtons); @override - ComponentThemeData informationCard( - InformationCardComponent? informationCard) => - this(informationCard: informationCard); + ComponentThemeData informationCards( + ComponentRegistry? informationCards) => + this(informationCards: informationCards); @override - ComponentThemeData portfolioCard(PortfolioCardComponent? portfolioCard) => - this(portfolioCard: portfolioCard); + ComponentThemeData portfolioCards( + ComponentRegistry? portfolioCards) => + this(portfolioCards: portfolioCards); @override - ComponentThemeData quoteCard(QuoteCardComponent? quoteCard) => - this(quoteCard: quoteCard); + ComponentThemeData quoteCards( + ComponentRegistry? quoteCards) => + this(quoteCards: quoteCards); @override - ComponentThemeData skillCard(SkillCardComponent? skillCard) => - this(skillCard: skillCard); + ComponentThemeData skillCards( + ComponentRegistry? skillCards) => + this(skillCards: skillCards); @override - ComponentThemeData pricingCard(PricingCardComponent? pricingCard) => - this(pricingCard: pricingCard); + ComponentThemeData pricingCards( + ComponentRegistry? pricingCards) => + this(pricingCards: pricingCards); @override - ComponentThemeData floatingActionButton( - FloatingActionButtonComponent? floatingActionButton) => - this(floatingActionButton: floatingActionButton); + ComponentThemeData floatingActionButtons( + ComponentRegistry? + floatingActionButtons) => + this(floatingActionButtons: floatingActionButtons); @override @@ -161,93 +184,97 @@ class _$ComponentThemeDataCWProxyImpl implements _$ComponentThemeDataCWProxy { /// ComponentThemeData(...).copyWith(id: 12, name: "My name") /// ```` ComponentThemeData call({ - Object? topAppBar = const $CopyWithPlaceholder(), - Object? topNavigationBar = const $CopyWithPlaceholder(), - Object? bottomNavigationBar = const $CopyWithPlaceholder(), - Object? error = const $CopyWithPlaceholder(), - Object? loader = const $CopyWithPlaceholder(), - Object? richTextBuilder = const $CopyWithPlaceholder(), - Object? textInput = const $CopyWithPlaceholder(), - Object? fileSelectionButton = const $CopyWithPlaceholder(), - Object? flatButton = const $CopyWithPlaceholder(), - Object? simpleIconButton = const $CopyWithPlaceholder(), - Object? symbolButton = const $CopyWithPlaceholder(), - Object? informationCard = const $CopyWithPlaceholder(), - Object? portfolioCard = const $CopyWithPlaceholder(), - Object? quoteCard = const $CopyWithPlaceholder(), - Object? skillCard = const $CopyWithPlaceholder(), - Object? pricingCard = const $CopyWithPlaceholder(), - Object? floatingActionButton = const $CopyWithPlaceholder(), + Object? topAppBars = const $CopyWithPlaceholder(), + Object? topNavigationBars = const $CopyWithPlaceholder(), + Object? bottomNavigationBars = const $CopyWithPlaceholder(), + Object? errors = const $CopyWithPlaceholder(), + Object? loaders = const $CopyWithPlaceholder(), + Object? richTextBuilders = const $CopyWithPlaceholder(), + Object? textInputs = const $CopyWithPlaceholder(), + Object? fileSelectionButtons = const $CopyWithPlaceholder(), + Object? flatButtons = const $CopyWithPlaceholder(), + Object? simpleIconButtons = const $CopyWithPlaceholder(), + Object? symbolButtons = const $CopyWithPlaceholder(), + Object? informationCards = const $CopyWithPlaceholder(), + Object? portfolioCards = const $CopyWithPlaceholder(), + Object? quoteCards = const $CopyWithPlaceholder(), + Object? skillCards = const $CopyWithPlaceholder(), + Object? pricingCards = const $CopyWithPlaceholder(), + Object? floatingActionButtons = const $CopyWithPlaceholder(), }) { return ComponentThemeData( - topAppBar: topAppBar == const $CopyWithPlaceholder() - ? _value.topAppBar + topAppBars: topAppBars == const $CopyWithPlaceholder() + ? _value.topAppBars // ignore: cast_nullable_to_non_nullable - : topAppBar as TopAppBarComponent?, - topNavigationBar: topNavigationBar == const $CopyWithPlaceholder() - ? _value.topNavigationBar + : topAppBars as ComponentRegistry?, + topNavigationBars: topNavigationBars == const $CopyWithPlaceholder() + ? _value.topNavigationBars // ignore: cast_nullable_to_non_nullable - : topNavigationBar as TopNavigationBarComponent?, - bottomNavigationBar: bottomNavigationBar == const $CopyWithPlaceholder() - ? _value.bottomNavigationBar + : topNavigationBars as ComponentRegistry?, + bottomNavigationBars: bottomNavigationBars == const $CopyWithPlaceholder() + ? _value.bottomNavigationBars // ignore: cast_nullable_to_non_nullable - : bottomNavigationBar as BottomNavigationBarComponent?, - error: error == const $CopyWithPlaceholder() - ? _value.error + : bottomNavigationBars + as ComponentRegistry?, + errors: errors == const $CopyWithPlaceholder() + ? _value.errors // ignore: cast_nullable_to_non_nullable - : error as ErrorComponent?, - loader: loader == const $CopyWithPlaceholder() - ? _value.loader + : errors as ComponentRegistry?, + loaders: loaders == const $CopyWithPlaceholder() + ? _value.loaders // ignore: cast_nullable_to_non_nullable - : loader as LoaderComponent?, - richTextBuilder: richTextBuilder == const $CopyWithPlaceholder() - ? _value.richTextBuilder + : loaders as ComponentRegistry?, + richTextBuilders: richTextBuilders == const $CopyWithPlaceholder() + ? _value.richTextBuilders // ignore: cast_nullable_to_non_nullable - : richTextBuilder as RichTextBuilderComponent?, - textInput: textInput == const $CopyWithPlaceholder() - ? _value.textInput + : richTextBuilders as ComponentRegistry?, + textInputs: textInputs == const $CopyWithPlaceholder() + ? _value.textInputs // ignore: cast_nullable_to_non_nullable - : textInput as TextInputComponent?, - fileSelectionButton: fileSelectionButton == const $CopyWithPlaceholder() - ? _value.fileSelectionButton + : textInputs as ComponentRegistry?, + fileSelectionButtons: fileSelectionButtons == const $CopyWithPlaceholder() + ? _value.fileSelectionButtons // ignore: cast_nullable_to_non_nullable - : fileSelectionButton as FileSelectionButtonComponent?, - flatButton: flatButton == const $CopyWithPlaceholder() - ? _value.flatButton + : fileSelectionButtons + as ComponentRegistry?, + flatButtons: flatButtons == const $CopyWithPlaceholder() + ? _value.flatButtons // ignore: cast_nullable_to_non_nullable - : flatButton as FlatButtonComponent?, - simpleIconButton: simpleIconButton == const $CopyWithPlaceholder() - ? _value.simpleIconButton + : flatButtons as ComponentRegistry?, + simpleIconButtons: simpleIconButtons == const $CopyWithPlaceholder() + ? _value.simpleIconButtons // ignore: cast_nullable_to_non_nullable - : simpleIconButton as SimpleIconButtonComponent?, - symbolButton: symbolButton == const $CopyWithPlaceholder() - ? _value.symbolButton + : simpleIconButtons as ComponentRegistry?, + symbolButtons: symbolButtons == const $CopyWithPlaceholder() + ? _value.symbolButtons // ignore: cast_nullable_to_non_nullable - : symbolButton as SymbolButtonComponent?, - informationCard: informationCard == const $CopyWithPlaceholder() - ? _value.informationCard + : symbolButtons as ComponentRegistry?, + informationCards: informationCards == const $CopyWithPlaceholder() + ? _value.informationCards // ignore: cast_nullable_to_non_nullable - : informationCard as InformationCardComponent?, - portfolioCard: portfolioCard == const $CopyWithPlaceholder() - ? _value.portfolioCard + : informationCards as ComponentRegistry?, + portfolioCards: portfolioCards == const $CopyWithPlaceholder() + ? _value.portfolioCards // ignore: cast_nullable_to_non_nullable - : portfolioCard as PortfolioCardComponent?, - quoteCard: quoteCard == const $CopyWithPlaceholder() - ? _value.quoteCard + : portfolioCards as ComponentRegistry?, + quoteCards: quoteCards == const $CopyWithPlaceholder() + ? _value.quoteCards // ignore: cast_nullable_to_non_nullable - : quoteCard as QuoteCardComponent?, - skillCard: skillCard == const $CopyWithPlaceholder() - ? _value.skillCard + : quoteCards as ComponentRegistry?, + skillCards: skillCards == const $CopyWithPlaceholder() + ? _value.skillCards // ignore: cast_nullable_to_non_nullable - : skillCard as SkillCardComponent?, - pricingCard: pricingCard == const $CopyWithPlaceholder() - ? _value.pricingCard + : skillCards as ComponentRegistry?, + pricingCards: pricingCards == const $CopyWithPlaceholder() + ? _value.pricingCards // ignore: cast_nullable_to_non_nullable - : pricingCard as PricingCardComponent?, - floatingActionButton: floatingActionButton == const $CopyWithPlaceholder() - ? _value.floatingActionButton - // ignore: cast_nullable_to_non_nullable - : floatingActionButton as FloatingActionButtonComponent?, + : pricingCards as ComponentRegistry?, + floatingActionButtons: + floatingActionButtons == const $CopyWithPlaceholder() + ? _value.floatingActionButtons + // ignore: cast_nullable_to_non_nullable + : floatingActionButtons + as ComponentRegistry?, ); } } diff --git a/packages/wyatt_ui_components/pubspec.yaml b/packages/wyatt_ui_components/pubspec.yaml index e515686e..23655e08 100644 --- a/packages/wyatt_ui_components/pubspec.yaml +++ b/packages/wyatt_ui_components/pubspec.yaml @@ -6,7 +6,7 @@ version: 0.2.2 publish_to: https://git.wyatt-studio.fr/api/packages/Wyatt-FOSS/pub environment: - sdk: ">=2.19.0 <3.0.0" + sdk: ">=3.0.0 <4.0.0" dependencies: flutter: { sdk: flutter }