Merge pull request #42 from udos86/upgrade-flutter-3.16

v13.0.0

Author: udos86

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: subosito/flutter-action@v2
       with:
-        flutter-version: '3.13.0'
+        flutter-version: '3.16.0'
         channel: 'stable'
 
     - name: Install Dependencies

CHANGELOG.md

@@ -1,3 +1,16 @@
+## [13.0.0] - 12/02/2023
+
+* upgrades to Flutter `3.16.0`
+* upgrades to Dart `3.2.0`
+* removes deprecated `text` property from `FastRadioOption<T>`
+* adds `offLabelColor` and `onLabelColor` properties to `FastSwitch`
+* adds `barrierColor`, `barrierDismissible` and `barrierLabel` properties to `FastDatePicker`, `FastDateRangePicker` and `FastTimePicker`
+* adds `optionsViewOpenDirection` property to `FastAutocomplete`
+* adds `checkmarkColor` and `showCheckmark` properties to `FastChoiceChip`
+* adds `canRequestFocus`, `clipBehavior`, `contentInsertionConfiguration`, `cursorOpacityAnimates`, 
+`dragStartBehavior`, `onAppPrivateCommand`, `scribbleEnabled`, `scrollController`, 
+`selectionHeightStyle`, `selectionWidthStyle` and `undoController` properties to `FastTextField`
+
 ## [12.0.0] - 08/22/2023
 
 * upgrades to Flutter `3.13.0`

example/pubspec.yaml

@@ -18,17 +18,17 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.0+1
 
 environment:
-  sdk: ">=3.1.0 <4.0.0"
+  sdk: ">=3.2.0 <4.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.3
+  cupertino_icons: ^1.0.6
 
-  intl: ^0.18.0
+  intl: ^0.18.1
 
   flutter_fast_forms:
     path: ../
@@ -42,7 +42,7 @@ dev_dependencies:
   # activated in the `analysis_options.yaml` file located at the root of your
   # package. See that file for information about deactivating specific lint
   # rules and activating additional ones.
-  flutter_lints: ^2.0.1
+  flutter_lints: ^3.0.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

lib/src/check/switch.dart

@@ -46,9 +46,11 @@ class FastSwitch extends FastFormField<bool> {
     this.isThreeLine = false,
     this.materialTapTargetSize,
     this.mouseCursor,
+    this.offLabelColor,
     this.onActiveThumbImageError,
     this.onFocusChange,
     this.onInactiveThumbImageError,
+    this.onLabelColor,
     this.overlayColor,
     this.secondary,
     this.selectedTileColor,
@@ -85,9 +87,11 @@ class FastSwitch extends FastFormField<bool> {
   final bool isThreeLine;
   final MaterialTapTargetSize? materialTapTargetSize;
   final MouseCursor? mouseCursor;
+  final Color? offLabelColor;
   final void Function(Object, StackTrace?)? onActiveThumbImageError;
   final void Function(bool)? onFocusChange;
   final void Function(Object, StackTrace?)? onInactiveThumbImageError;
+  final Color? onLabelColor;
   final MaterialStateProperty<Color?>? overlayColor;
   final Widget? secondary;
   final Color? selectedTileColor;
@@ -183,6 +187,8 @@ Widget cupertinoSwitchBuilder(FormFieldState<bool> field) {
     helper: (widget.helperBuilder ?? helperBuilder)(field),
     error: (widget.errorBuilder ?? errorBuilder)(field),
     child: CupertinoSwitch(
+      offLabelColor: widget.offLabelColor,
+      onLabelColor: widget.onLabelColor,
       activeColor: widget.activeColor,
       applyTheme: widget.applyTheme,
       autofocus: widget.autofocus,

lib/src/date_time/date_picker.dart

@@ -37,6 +37,9 @@ class FastDatePicker extends FastFormField<DateTime> {
     super.validator,
     this.anchorPoint,
     this.backgroundColor,
+    this.barrierColor,
+    this.barrierDismissible = true,
+    this.barrierLabel,
     this.cancelText,
     this.confirmText,
     this.currentDate,
@@ -81,6 +84,9 @@ class FastDatePicker extends FastFormField<DateTime> {
 
   final Offset? anchorPoint;
   final Color? backgroundColor;
+  final Color? barrierColor;
+  final bool barrierDismissible;
+  final String? barrierLabel;
   final String? cancelText;
   final String? confirmText;
   final DateTime? currentDate;
@@ -224,6 +230,7 @@ Container cupertinoDatePickerModalPopupBuilder(
             minuteInterval: widget.minuteInterval,
             mode: widget.mode,
             onDateTimeChanged: (DateTime value) => modalValue = value,
+            showDayOfWeek: widget.showDayOfWeek,
             use24hFormat: widget.use24hFormat,
           ),
         ),
@@ -238,6 +245,9 @@ Widget materialDatePickerBuilder(FormFieldState<DateTime> field) {
   Future<DateTime?> show(DatePickerEntryMode entryMode) {
     return showDatePicker(
       anchorPoint: widget.anchorPoint,
+      barrierColor: widget.barrierColor,
+      barrierDismissible: widget.barrierDismissible,
+      barrierLabel: widget.barrierLabel,
       builder: widget.dialogBuilder,
       cancelText: widget.cancelText,
       confirmText: widget.confirmText,

lib/src/date_time/date_range_picker.dart

@@ -32,6 +32,9 @@ class FastDateRangePicker extends FastFormField<DateTimeRange> {
     super.restorationId,
     super.validator,
     this.anchorPoint,
+    this.barrierColor,
+    this.barrierDismissible = true,
+    this.barrierLabel,
     this.cancelText,
     this.confirmText,
     this.currentDate,
@@ -62,6 +65,9 @@ class FastDateRangePicker extends FastFormField<DateTimeRange> {
   }) : dateFormat = format ?? intl.DateFormat.yMd();
 
   final Offset? anchorPoint;
+  final Color? barrierColor;
+  final bool barrierDismissible;
+  final String? barrierLabel;
   final String? cancelText;
   final String? confirmText;
   final DateTime? currentDate;
@@ -130,6 +136,9 @@ Widget dateRangePickerBuilder(FormFieldState<DateTimeRange> field) {
   Future<DateTimeRange?> show(DatePickerEntryMode entryMode) {
     return showDateRangePicker(
       anchorPoint: widget.anchorPoint,
+      barrierColor: widget.barrierColor,
+      barrierDismissible: widget.barrierDismissible,
+      barrierLabel: widget.barrierLabel,
       builder: widget.dialogBuilder,
       cancelText: widget.cancelText,
       confirmText: widget.confirmText,

lib/src/date_time/time_picker.dart

@@ -29,6 +29,9 @@ class FastTimePicker extends FastFormField<TimeOfDay> {
     super.restorationId,
     super.validator,
     this.anchorPoint,
+    this.barrierColor,
+    this.barrierDismissible = true,
+    this.barrierLabel,
     this.cancelText,
     this.confirmText,
     this.dialogBuilder,
@@ -48,6 +51,9 @@ class FastTimePicker extends FastFormField<TimeOfDay> {
   });
 
   final Offset? anchorPoint;
+  final Color? barrierColor;
+  final bool barrierDismissible;
+  final String? barrierLabel;
   final String? cancelText;
   final String? confirmText;
   final TransitionBuilder? dialogBuilder;
@@ -105,6 +111,9 @@ Widget timePickerBuilder(FormFieldState<TimeOfDay> field) {
   Future<TimeOfDay?> show(TimePickerEntryMode entryMode) {
     return showTimePicker(
       anchorPoint: widget.anchorPoint,
+      barrierColor: widget.barrierColor,
+      barrierDismissible: widget.barrierDismissible,
+      barrierLabel: widget.barrierLabel,
       builder: widget.dialogBuilder,
       cancelText: widget.cancelText,
       confirmText: widget.confirmText,

lib/src/form.dart

@@ -30,7 +30,7 @@ class FastForm extends StatefulWidget {
   static FastFormState? of(BuildContext context) {
     final _FastFormScope? scope =
         context.dependOnInheritedWidgetOfExactType<_FastFormScope>();
-    return scope?._formState;
+    return scope?.formState;
   }
 
   @override
@@ -70,10 +70,10 @@ class FastFormState extends State<FastForm> {
 class _FastFormScope extends InheritedWidget {
   const _FastFormScope({
     required super.child,
-    required FastFormState formState,
-  }) : _formState = formState;
+    required this.formState,
+  });
 
-  final FastFormState _formState;
+  final FastFormState formState;
 
   @override
   bool updateShouldNotify(InheritedWidget oldWidget) => true;

lib/src/form_array.dart

@@ -76,27 +76,27 @@ class FastFormArrayState<T> extends FastFormFieldState<List<T?>> {
     didChange(newValue);
   }
 
-  void move(int oldIndex, int newIndex) {
-    if (newIndex >= 0 && newIndex < value!.length) {
-      final item = value![oldIndex];
-      final key = _keys[oldIndex];
-
-      _keys
-        ..removeAt(oldIndex)
-        ..insert(newIndex, key);
-
-      didChange([...value!]
-        ..removeAt(oldIndex)
-        ..insert(newIndex, item));
-    }
+  void move(int index, int newIndex) {
+    if (newIndex < 0 || newIndex >= value!.length) return;
+
+    final item = value![index];
+    final key = _keys[index];
+
+    _keys
+      ..removeAt(index)
+      ..insert(newIndex, key);
+
+    didChange([...value!]
+      ..removeAt(index)
+      ..insert(newIndex, item));
   }
 
   void remove(int index) {
-    if (value != null && index >= 0 && index < value!.length) {
-      _keys.removeAt(index);
-      final newValue = [...value!]..removeAt(index);
-      didChange(newValue);
-    }
+    if (value == null || index < 0 || index >= value!.length) return;
+
+    _keys.removeAt(index);
+    final newValue = [...value!]..removeAt(index);
+    didChange(newValue);
   }
 
   void _initKeys() {

lib/src/options/autocomplete.dart

@@ -33,6 +33,7 @@ class FastAutocomplete<O extends Object> extends FastFormField<String> {
     this.optionsBuilder,
     this.optionsMaxHeight = 200.00,
     this.optionsViewBuilder,
+    this.optionsViewOpenDirection = OptionsViewOpenDirection.down,
     this.willDisplayOption,
   })  : assert(options != null || optionsBuilder != null),
         _initialValue = initialValue,
@@ -49,6 +50,7 @@ class FastAutocomplete<O extends Object> extends FastFormField<String> {
   final AutocompleteOptionsBuilder<O>? optionsBuilder;
   final double optionsMaxHeight;
   final AutocompleteOptionsViewBuilder<O>? optionsViewBuilder;
+  final OptionsViewOpenDirection optionsViewOpenDirection;
   final FastAutocompleteWillDisplayOption<O>? willDisplayOption;
 
   @override
@@ -116,5 +118,6 @@ Widget autocompleteBuilder<O extends Object>(FormFieldState<String> field) {
     optionsBuilder: optionsBuilder,
     optionsMaxHeight: widget.optionsMaxHeight,
     optionsViewBuilder: widget.optionsViewBuilder,
+    optionsViewOpenDirection: widget.optionsViewOpenDirection,
   );
 }