From 81a7ca5a1fce62e14c9e9cbca59b181ffc754794 Mon Sep 17 00:00:00 2001 From: AN12345 Date: Mon, 12 Dec 2022 14:08:36 -0500 Subject: [PATCH] feat(ui_components): make component data field nullable (#92) --- .../wyatt_ui_components/example/lib/main.dart | 2 +- .../lib/src/domain/entities/component.dart | 2 +- .../lib/src/domain/entities/components.dart | 8 ++++---- .../lib/src/features/component_theme_data.dart | 16 ++++++++-------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/wyatt_ui_components/example/lib/main.dart b/packages/wyatt_ui_components/example/lib/main.dart index 673d614a..e8aebaa0 100644 --- a/packages/wyatt_ui_components/example/lib/main.dart +++ b/packages/wyatt_ui_components/example/lib/main.dart @@ -50,7 +50,7 @@ class Home extends StatelessWidget { Widget build(BuildContext context) => Scaffold( appBar: PreferredSize( preferredSize: const Size.fromHeight(60), - child: context.components.appBar.configure(title: 'Example title'), + child: context.components.appBar?.configure(title: 'Example title'), ), body: Column( children: [ diff --git a/packages/wyatt_ui_components/lib/src/domain/entities/component.dart b/packages/wyatt_ui_components/lib/src/domain/entities/component.dart index ca2d18dc..7a03682f 100644 --- a/packages/wyatt_ui_components/lib/src/domain/entities/component.dart +++ b/packages/wyatt_ui_components/lib/src/domain/entities/component.dart @@ -19,5 +19,5 @@ import 'package:flutter/material.dart'; abstract class Component extends StatelessWidget { const Component({super.key}); - Component configure(); + Component? configure(); } diff --git a/packages/wyatt_ui_components/lib/src/domain/entities/components.dart b/packages/wyatt_ui_components/lib/src/domain/entities/components.dart index a758ae6b..44c16697 100644 --- a/packages/wyatt_ui_components/lib/src/domain/entities/components.dart +++ b/packages/wyatt_ui_components/lib/src/domain/entities/components.dart @@ -29,7 +29,7 @@ abstract class AppBarComponent extends Component { }); @override - AppBarComponent configure({ + AppBarComponent? configure({ String? title, Widget? leading, List? actions, @@ -46,7 +46,7 @@ abstract class BottomNavigationBarComponent extends Component { }); @override - BottomNavigationBarComponent configure({ + BottomNavigationBarComponent? configure({ void Function(BuildContext, int)? onTap, int currentIndex = 0, }); @@ -57,7 +57,7 @@ abstract class ErrorWidgetComponent extends Component { const ErrorWidgetComponent({required this.error, super.key}); @override - ErrorWidgetComponent configure({String? error}); + ErrorWidgetComponent? configure({String? error}); } abstract class LoadingWidgetComponent extends Component { @@ -65,5 +65,5 @@ abstract class LoadingWidgetComponent extends Component { const LoadingWidgetComponent({required this.color, super.key}); @override - LoadingWidgetComponent configure({Color? color}); + LoadingWidgetComponent? configure({Color? color}); } 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 66540540..e613e826 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 @@ -17,15 +17,15 @@ import 'package:wyatt_ui_components/src/domain/entities/components.dart'; class ComponentThemeData { - final AppBarComponent appBar; - final BottomNavigationBarComponent bottomNavigationBar; - final ErrorWidgetComponent errorWidget; - final LoadingWidgetComponent loadingWidget; + final AppBarComponent? appBar; + final BottomNavigationBarComponent? bottomNavigationBar; + final ErrorWidgetComponent? errorWidget; + final LoadingWidgetComponent? loadingWidget; const ComponentThemeData.raw({ - required this.appBar, - required this.bottomNavigationBar, - required this.errorWidget, - required this.loadingWidget, + this.appBar, + this.bottomNavigationBar, + this.errorWidget, + this.loadingWidget, }); }