chore(core): fix unnecessary import errors causing CI fails in beta and dev workflows

danvick · danvick · commit 716f37d81e96 · 2021-11-11T12:21:30.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .atom/
 .idea/
 **/.idea/
+*.old
 
 .packages
 .pub/
diff --git a/packages/flutter_form_builder/example/lib/main.dart b/packages/flutter_form_builder/example/lib/main.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
diff --git a/packages/flutter_form_builder/example/lib/sources/complete_form.dart b/packages/flutter_form_builder/example/lib/sources/complete_form.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
diff --git a/packages/flutter_form_builder/example/lib/sources/custom_fields.dart b/packages/flutter_form_builder/example/lib/sources/custom_fields.dart
@@ -46,22 +46,16 @@ class _CustomFieldsState extends State<CustomFields> {
               },
               autovalidateMode: AutovalidateMode.always,
               validator: (valueCandidate) {
-                if (valueCandidate == null ||
-                    (valueCandidate is String && valueCandidate.isEmpty) ||
-                    (valueCandidate is Iterable && valueCandidate.isEmpty) ||
-                    (valueCandidate is Map && valueCandidate.isEmpty)) {
+                if (valueCandidate?.isEmpty ?? true) {
                   return 'This field is required.';
                 }
                 return null;
               },
             ),
-            FormBuilderField<String>(
+            FormBuilderField<String?>(
               name: "option",
               validator: (valueCandidate) {
-                if (valueCandidate == null ||
-                    (valueCandidate is String && valueCandidate.isEmpty) ||
-                    (valueCandidate is Iterable && valueCandidate.isEmpty) ||
-                    (valueCandidate is Map && valueCandidate.isEmpty)) {
+                if (valueCandidate?.isEmpty ?? true) {
                   return 'This field is required.';
                 }
                 return null;
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox_group.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_checkbox_group.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// A list of Checkboxes for selecting multiple options
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_choice_chips.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// A list of `Chip`s that acts like radio buttons
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_date_range_picker.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_date_range_picker.dart
@@ -1,9 +1,7 @@
-import 'dart:async';
 import 'dart:core';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:intl/intl.dart' as intl;
 
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_date_time_picker.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:ui' as ui;
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_dropdown.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_dropdown.dart
@@ -1,6 +1,5 @@
 import 'package:collection/collection.dart' show IterableExtension;
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field for Dropdown button
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_filter_chips.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_filter_chips.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field with chips that acts like a list checkboxes.
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_radio_group.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_radio_group.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field to select one value from a list of Radio Widgets
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_range_slider.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_range_slider.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:intl/intl.dart';
 
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_segmented_control.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_segmented_control.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// Field for selection of a value from the `CupertinoSegmentedControl`
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_slider.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_slider.dart
@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:intl/intl.dart';
 
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_switch.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_switch.dart
@@ -1,7 +1,6 @@
 import 'dart:ui';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// On/Off switch field
diff --git a/packages/flutter_form_builder/lib/src/fields/form_builder_text_field.dart b/packages/flutter_form_builder/lib/src/fields/form_builder_text_field.dart
@@ -1,11 +1,8 @@
-import 'dart:ui';
 import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle;
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 /// A Material Design text field input.
diff --git a/packages/flutter_form_builder/lib/src/form_builder_field.dart b/packages/flutter_form_builder/lib/src/form_builder_field.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 
 enum OptionsOrientation { horizontal, vertical, wrap }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import 'package:flutter/cupertino.dart';`
`2`	`1`	`import 'package:flutter/material.dart';`
`3`	`2`	`import 'package:flutter_localizations/flutter_localizations.dart';`
`4`	`3`	`import 'package:form_builder_validators/form_builder_validators.dart';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import 'package:flutter/material.dart';`
`2`		`-import 'package:flutter/widgets.dart';`
`3`	`2`	`import 'package:flutter_form_builder/flutter_form_builder.dart';`
`4`	`3`
`5`	`4`	`/// A list of Checkboxes for selecting multiple options`