Formatting with dart-fm

CHANGELOG.md

@@ -28,3 +28,7 @@
 ## 0.2.1
 
 * Adding support for Flutter web
+
+## 0.2.2
+
+* Auto-formatting with dart-fm to meet pub.dev requirements

lib/date_field.dart

@@ -12,51 +12,51 @@ import 'package:intl/intl.dart';
 /// pass a [GlobalKey] to the constructor and use [GlobalKey.currentState] to
 /// save or reset the form field.
 class DateFormField extends FormField<DateTime> {
+  DateFormField(
+      {Key key,
+      FormFieldSetter<DateTime> onSaved,
+      FormFieldValidator<DateTime> validator,
+      DateTime initialValue,
+      bool autovalidate = false,
+      bool enabled = true,
+      this.onDateSelected,
+      this.firstDate,
+      this.lastDate,
+      this.label = 'Select date',
+      this.dateFormat,
+      this.decoration,
+      this.initialDatePickerMode = DatePickerMode.day})
+      : super(
+          key: key,
+          initialValue: initialValue,
+          onSaved: onSaved,
+          validator: validator,
+          autovalidate: autovalidate,
+          enabled: enabled,
+          builder: (FormFieldState<DateTime> field) {
+            final _DateFormFieldState state = field;
 
-  DateFormField({
+            void onChangedHandler(DateTime value) {
-    Key key,
+              if (onDateSelected != null) {
-    FormFieldSetter<DateTime> onSaved,
+                onDateSelected(value);
-    FormFieldValidator<DateTime> validator,
+              }
-    DateTime initialValue,
+              field.didChange(value);
-    bool autovalidate = false,
+            }
-    bool enabled = true,
-    this.onDateSelected,
-    this.firstDate,
-    this.lastDate,
-    this.label = 'Select date',
-    this.dateFormat,
-    this.decoration,
-    this.initialDatePickerMode = DatePickerMode.day
-  }) : super(
-    key: key,
-    initialValue: initialValue,
-    onSaved: onSaved,
-    validator: validator,
-    autovalidate: autovalidate,
-    enabled: enabled,
-    builder: (FormFieldState<DateTime> field) {
-      final _DateFormFieldState state = field;
 
-      void onChangedHandler(DateTime value) {
+            return DateField(
-        if (onDateSelected != null) {
+              label: label,
-          onDateSelected(value);
+              firstDate: firstDate,
-        }
+              lastDate: lastDate,
-        field.didChange(value);
+              decoration: decoration,
-      }
+              initialDatePickerMode: initialDatePickerMode,
-      return DateField(
+              dateFormat: dateFormat,
-        label: label,
+              errorText: state.errorText,
-        firstDate: firstDate,
+              onDateSelected: onChangedHandler,
-        lastDate: lastDate,
+              selectedDate: state.value,
-        decoration: decoration,
+              enabled: enabled,
-        initialDatePickerMode: initialDatePickerMode,
+            );
-        dateFormat: dateFormat,
+          },
-        errorText: state.errorText,
+        );
-        onDateSelected: onChangedHandler,
-        selectedDate: state.value,
-        enabled: enabled,
-      );
-    },
-  );
 
   /// (optional) A callback that will be triggered whenever a new
   /// DateTime is selected
@@ -80,7 +80,6 @@ class DateFormField extends FormField<DateTime> {
   /// (optional) Let you choose the [DatePickerMode] for the date picker! (default is [DatePickerMode.day]
   final DatePickerMode initialDatePickerMode;
 
-
   @override
   _DateFormFieldState createState() => _DateFormFieldState();
 }
@@ -92,7 +91,6 @@ class _DateFormFieldState extends FormFieldState<DateTime> {}
 /// Shows an [_InputDropdown] that'll trigger [DateField._selectDate] whenever the user
 /// clicks on it ! The date picker is **platform responsive** (ios date picker style for ios, ...)
 class DateField extends StatelessWidget {
-
   /// Default constructor
   const DateField({
     @required this.onDateSelected,
@@ -155,9 +153,7 @@ class DateField extends StatelessWidget {
           );
         },
       );
-    }
+    } else {
-    else {
-
       final DateTime _selectedDate = await showDatePicker(
           context: context,
           initialDatePickerMode: initialDatePickerMode,
@@ -183,9 +179,11 @@ class DateField extends StatelessWidget {
       label: text == null ? null : label,
       errorText: errorText,
       decoration: decoration,
-      onPressed: enabled ? () {
+      onPressed: enabled
-        _selectDate(context);
+          ? () {
-      } : null,
+              _selectDate(context);
+            }
+          : null,
     );
   }
 }
@@ -197,16 +195,15 @@ class DateField extends StatelessWidget {
 /// It does not show any popup menu, it'll just trigger onPressed whenever the
 /// user does click on it !
 class _InputDropdown extends StatelessWidget {
-  const _InputDropdown(
+  const _InputDropdown({
-      {Key key,
+    Key key,
-        @required this.text,
+    @required this.text,
-        this.label,
+    this.label,
-        this.decoration,
+    this.decoration,
-        this.textStyle,
+    this.textStyle,
-        this.onPressed,
+    this.onPressed,
-        this.errorText,
+    this.errorText,
-      }) :
+  })  : assert(text != null),
-        assert(text != null),
         super(key: key);
 
   /// The label to display for the field (default is 'Select date')
@@ -235,13 +232,13 @@ class _InputDropdown extends StatelessWidget {
       inkwellBorderRadius = BorderRadius.circular(8);
     }
 
-    final InputDecoration effectiveDecoration = decoration?.copyWith(
+    final InputDecoration effectiveDecoration =
-        errorText: errorText
+        decoration?.copyWith(errorText: errorText) ??
-    ) ?? InputDecoration(
+            InputDecoration(
-      labelText: label,
+              labelText: label,
-      errorText: errorText,
+              errorText: errorText,
-      suffixIcon: Icon(Icons.arrow_drop_down),
+              suffixIcon: Icon(Icons.arrow_drop_down),
-    ).applyDefaults(Theme.of(context).inputDecorationTheme);
+            ).applyDefaults(Theme.of(context).inputDecorationTheme);
 
     return Material(
       color: Colors.transparent,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: date_field
 description: Contains DateField and DateFormField which allows the user to pick a DateTime from an input field!
-version: 0.2.1
+version: 0.2.2
 homepage: 'https://github.com/GaspardMerten/date_field'
 
 environment: