Fix PR issues

forus-labs · Oct 5, 2024 · 4f07572 · 4f07572
1 parent d02b815
commit 4f07572
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 27 deletions.
diff --git a/forui/example/lib/sandbox.dart b/forui/example/lib/sandbox.dart
@@ -63,7 +63,7 @@ class _SandboxState extends State<Sandbox> {
             label: const Text('Select Group'),
             description: const Text('Select Group Description'),
             controller: FMultiSelectGroupController(min: 1, max: 2, values: {1}),
-            children: [
+            items: [
               FSelectGroupItem.checkbox(value: 1, label: const Text('Checkbox 1'), semanticLabel: 'Checkbox 1'),
               FSelectGroupItem.checkbox(value: 2, label: const Text('Checkbox 2'), semanticLabel: 'Checkbox 2'),
               FSelectGroupItem.checkbox(value: 3, label: const Text('Checkbox 3'), semanticLabel: 'Checkbox 3'),

diff --git a/forui/lib/src/widgets/select_group/select_group.dart b/forui/lib/src/widgets/select_group/select_group.dart
@@ -38,12 +38,12 @@ class FSelectGroup<T> extends FormField<Set<T>> {
   final Widget Function(BuildContext, String) errorBuilder;
 
   /// The children.
-  final List<FSelectGroupItem<T>> children;
+  final List<FSelectGroupItem<T>> items;
 
   /// Creates a [FSelectGroup].
   FSelectGroup({
     required this.controller,
-    required this.children,
+    required this.items,
     this.style,
     this.label,
     this.description,
@@ -75,7 +75,7 @@ class FSelectGroup<T> extends FormField<Set<T>> {
               error: error,
               child: Column(
                 children: [
-                  for (final child in children)
+                  for (final child in items)
                     FSelectGroupItemData<T>(
                       controller: controller,
                       style: groupStyle,
@@ -99,7 +99,7 @@ class FSelectGroup<T> extends FormField<Set<T>> {
       ..add(DiagnosticsProperty('controller', controller))
       ..add(ObjectFlagProperty.has('errorBuilder', errorBuilder))
       ..add(DiagnosticsProperty('testing', (1, 2, 3)))
-      ..add(IterableProperty('items', children));
+      ..add(IterableProperty('items', items));
   }
 }
 

diff --git a/forui/lib/src/widgets/select_group/select_group_item.dart b/forui/lib/src/widgets/select_group/select_group_item.dart
@@ -108,7 +108,12 @@ class _Builder<T> extends FSelectGroupItem<T> {
   final ValueWidgetBuilder<FSelectGroupItemState<T>> builder;
   final Widget? child;
 
-  const _Builder({required this.builder, required super.value, this.child, super.key}) : super._();
+  const _Builder({
+    required this.builder,
+    required super.value,
+    this.child,
+    super.key,
+  }) : super._();
 
   @override
   Widget build(BuildContext context) {

diff --git a/forui/test/src/test_scaffold.dart b/forui/test/src/test_scaffold.dart
@@ -8,19 +8,19 @@ class TestScaffold extends StatelessWidget {
     colorScheme: const FColorScheme(
       brightness: Brightness.light,
       disabledColorLightness: 0.1,
-      background: Colors.lightBlue,
-      foreground: Colors.lightBlue,
-      primary: Colors.lightBlue,
-      primaryForeground: Colors.lightBlue,
-      secondary: Colors.lightBlue,
-      secondaryForeground: Colors.lightBlue,
-      muted: Colors.lightBlue,
-      mutedForeground: Colors.lightBlue,
-      destructive: Colors.lightBlue,
-      destructiveForeground: Colors.lightBlue,
-      error: Colors.lightBlue,
-      errorForeground: Colors.lightBlue,
-      border: Colors.lightBlue,
+      background: Color(0xFF03A9F4),
+      foreground: Color(0xFF03A9F4),
+      primary: Color(0xFF03A9F4),
+      primaryForeground: Color(0xFF03A9F4),
+      secondary: Color(0xFF03A9F4),
+      secondaryForeground: Color(0xFF03A9F4),
+      muted: Color(0xFF03A9F4),
+      mutedForeground: Color(0xFF03A9F4),
+      destructive: Color(0xFF03A9F4),
+      destructiveForeground: Color(0xFF03A9F4),
+      error: Color(0xFF03A9F4),
+      errorForeground: Color(0xFF03A9F4),
+      border: Color(0xFF03A9F4),
     ),
   );
 

diff --git a/forui/test/src/widgets/select_group/select_group_golden_test.dart b/forui/test/src/widgets/select_group/select_group_golden_test.dart
@@ -23,7 +23,7 @@ void main() {
                   label: const Text('Select Group'),
                   description: const Text('Select Group Description'),
                   controller: FMultiSelectGroupController(values: {1}),
-                  children: [
+                  items: [
                     FSelectGroupItem.checkbox(
                       value: 1,
                       label: const Text('Checkbox 1'),
@@ -60,7 +60,7 @@ void main() {
                     label: const Text('Select Group'),
                     description: const Text('Select Group Description'),
                     controller: FMultiSelectGroupController(values: {1}),
-                    children: [
+                    items: [
                       FSelectGroupItem.checkbox(
                         value: 1,
                         label: const Text('Checkbox 1'),
@@ -102,7 +102,7 @@ void main() {
                     description: const Text('Select Group Description'),
                     forceErrorText: 'Some error message.',
                     controller: FMultiSelectGroupController(values: {1}),
-                    children: [
+                    items: [
                       FSelectGroupItem.checkbox(
                         value: 1,
                         label: const Text('Checkbox 1'),
@@ -147,7 +147,7 @@ void main() {
                     label: const Text('Select Group'),
                     description: const Text('Select Group Description'),
                     controller: FRadioSelectGroupController(value: 1),
-                    children: [
+                    items: [
                       FSelectGroupItem.radio(
                         value: 1,
                         label: const Text('Radio 1'),
@@ -189,7 +189,7 @@ void main() {
                     description: const Text('Select Group Description'),
                     forceErrorText: 'Some error message.',
                     controller: FRadioSelectGroupController(value: 1),
-                    children: [
+                    items: [
                       FSelectGroupItem.radio(
                         value: 1,
                         label: const Text('Radio 1'),

diff --git a/samples/lib/widgets/select_group.dart b/samples/lib/widgets/select_group.dart
@@ -21,7 +21,7 @@ class SelectGroupPage extends SampleScaffold {
               controller: FMultiSelectGroupController(values: {Sidebar.recents}),
               label: const Text('Sidebar'),
               description: const Text('These will be shown in the sidebar.'),
-              children: [
+              items: [
                 FSelectGroupItem.checkbox(
                   value: Sidebar.recents,
                   label: const Text('Recents'),
@@ -78,7 +78,7 @@ class CheckboxFormState extends State<CheckboxForm> {
               label: const Text('Favorite Languages'),
               description: const Text('Your favorite language.'),
               validator: (values) => values?.isEmpty ?? true ? 'Please select at least one language.' : null,
-              children: [
+              items: [
                 FSelectGroupItem.checkbox(
                   value: Language.dart,
                   label: const Text('Dart'),
@@ -152,7 +152,7 @@ class RadioFormState extends State<RadioForm> {
               label: const Text('Notifications'),
               description: const Text('Select the notifications.'),
               validator: (values) => values?.isEmpty ?? true ? 'Please select a value.' : null,
-              children: [
+              items: [
                 FSelectGroupItem.radio(
                   value: Notification.all,
                   label: const Text('All new messages'),