Skip to content

Commit

Permalink
Merge pull request #34 from udos86/migrate-to-3.7.0
Browse files Browse the repository at this point in the history
v10.0.0
  • Loading branch information
udos86 authored Jan 27, 2023
2 parents c2d3657 + f65b9fe commit 24dfd71
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: '3.3.7'
flutter-version: '3.7.0'
channel: 'stable'

- name: Install Dependencies
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [10.0.0] - 01/29/2023

* upgrades to Flutter `3.7.0`
* minimum Dart SDK now is `2.19.0`
* removes `toolbarOptions` property from `FastTextField`
* adds `contextMenuBuilder` property to `FastTextField`

## [9.0.1] - 01/24/2023

* upgrades `intl`to `0.18.0`
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1

environment:
sdk: ">=2.17.0 <3.0.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/date_time/date_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Text datePickerTextBuilder(FastDatePickerState field) {

return Text(
value != null ? format(field.value!) : '',
style: theme.textTheme.subtitle1,
style: theme.textTheme.titleMedium,
textAlign: TextAlign.left,
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/date_time/date_range_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Text dateRangPickerTextBuilder(FastDateRangePickerState field) {

return Text(
value != null ? '${format(value.start)} - ${format(value.end)}' : '',
style: theme.textTheme.subtitle1,
style: theme.textTheme.titleMedium,
textAlign: TextAlign.left,
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/date_time/time_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Text timePickerTextBuilder(FastTimePickerState field) {

return Text(
field.value?.format(field.context) ?? '',
style: theme.textTheme.subtitle1,
style: theme.textTheme.titleMedium,
textAlign: TextAlign.left,
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/form.dart
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ InputDecoration _decorator(ThemeData theme, FastFormFieldState field) {
labelText: widget.labelText,
labelStyle: TextStyle(
color: field.enabled
? theme.textTheme.bodyText1!.color
? theme.textTheme.bodyLarge!.color
: theme.disabledColor,
),
enabled: field.enabled,
Expand Down
8 changes: 4 additions & 4 deletions lib/src/text/text_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class FastTextField extends FastFormField<String> {
this.autofillHints,
this.autofocus = false,
this.buildCounter,
this.contextMenuBuilder,
this.cursorColor,
this.cursorHeight,
this.cursorRadius,
Expand Down Expand Up @@ -70,14 +71,14 @@ class FastTextField extends FastFormField<String> {
this.textCapitalization = TextCapitalization.none,
this.textDirection,
this.textInputAction,
this.toolbarOptions,
this.trailing,
});

final bool autocorrect;
final Iterable<String>? autofillHints;
final bool autofocus;
final InputCounterWidgetBuilder? buildCounter;
final EditableTextContextMenuBuilder? contextMenuBuilder;
final Color? cursorColor;
final double? cursorHeight;
final Radius? cursorRadius;
Expand Down Expand Up @@ -120,7 +121,6 @@ class FastTextField extends FastFormField<String> {
final TextCapitalization textCapitalization;
final TextDirection? textDirection;
final TextInputAction? textInputAction;
final ToolbarOptions? toolbarOptions;
final Widget? trailing;

@override
Expand Down Expand Up @@ -173,6 +173,7 @@ Widget materialTextFieldBuilder(FormFieldState<String> field) {
autofocus: widget.autofocus,
autovalidateMode: field.autovalidateMode,
buildCounter: widget.buildCounter,
contextMenuBuilder: widget.contextMenuBuilder,
cursorColor: widget.cursorColor,
cursorHeight: widget.cursorHeight,
cursorRadius: widget.cursorRadius,
Expand Down Expand Up @@ -214,7 +215,6 @@ Widget materialTextFieldBuilder(FormFieldState<String> field) {
textCapitalization: widget.textCapitalization,
textDirection: widget.textDirection,
textInputAction: widget.textInputAction,
toolbarOptions: widget.toolbarOptions,
validator: widget.validator,
);
}
Expand All @@ -229,6 +229,7 @@ Widget cupertinoTextFieldBuilder(FormFieldState<String> field) {
autofillHints: widget.autofillHints,
autofocus: widget.autofocus,
autovalidateMode: field.autovalidateMode,
contextMenuBuilder: widget.contextMenuBuilder,
cursorColor: widget.cursorColor,
cursorHeight: widget.cursorHeight,
cursorWidth: widget.cursorWidth,
Expand Down Expand Up @@ -269,7 +270,6 @@ Widget cupertinoTextFieldBuilder(FormFieldState<String> field) {
textCapitalization: widget.textCapitalization,
textDirection: widget.textDirection,
textInputAction: widget.textInputAction,
toolbarOptions: widget.toolbarOptions,
validator: widget.validator,
);
}
Expand Down
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: flutter_fast_forms
description: Flutter Fast Forms is the only Dart package you'll ever need to build Flutter forms fast.
version: 9.0.1
version: 10.0.0
repository: https://github.com/udos86/flutter-fast-forms

environment:
sdk: ">=2.17.0 <3.0.0"
sdk: ">=2.19.0 <3.0.0"

dependencies:
flutter:
Expand All @@ -23,7 +23,7 @@ dev_dependencies:
# rules and activating additional ones.
flutter_lints: ^2.0.1

test: ^1.21.4
test: ^1.22.0

# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
Expand Down

0 comments on commit 24dfd71

Please sign in to comment.