From fb489860e111fa363949371d4cfe17096ad79297 Mon Sep 17 00:00:00 2001 From: Chen Peng Date: Tue, 26 Mar 2024 23:28:48 +0800 Subject: [PATCH] =?UTF-8?q?mate=5Fflutter=E9=A1=B9=E7=9B=AE=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=9A=82?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E7=94=A8=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bake | 35 ++- bake.bash | 2 +- mate_flutter/lib/animation.dart | 1 + mate_flutter/lib/mate_enums.g.dart | 87 +++---- mate_flutter/lib/mate_icons.g.dart | 2 +- mate_flutter/lib/services.dart | 1 + .../lib/src/animation/animation_style.dart | 58 +++++ .../lib/src/cupertino/activity_indicator.dart | 1 + .../lib/src/cupertino/icon_theme_data.dart | 11 +- .../lib/src/cupertino/text_field.dart | 22 +- .../lib/src/foundation/diagnostics.dart | 60 ++--- mate_flutter/lib/src/foundation/timeline.dart | 8 - mate_flutter/lib/src/gestures/scale.dart | 22 +- mate_flutter/lib/src/material/app.dart | 35 ++- mate_flutter/lib/src/material/card.dart | 222 ++++++++++++++++++ .../lib/src/material/dropdown_menu.dart | 11 +- .../lib/src/material/expansion_tile.dart | 51 +++- .../src/material/expansion_tile_theme.dart | 20 +- .../lib/src/material/filter_chip.dart | 78 +++++- .../input_date_picker_form_field.dart | 12 +- .../lib/src/material/menu_anchor.dart | 14 +- .../src/material/paginated_data_table.dart | 12 +- mate_flutter/lib/src/material/popup_menu.dart | 22 +- .../lib/src/material/search_anchor.dart | 86 ++++++- .../lib/src/material/slider_theme.dart | 11 +- mate_flutter/lib/src/material/snack_bar.dart | 8 +- .../lib/src/material/snack_bar_theme.dart | 12 +- mate_flutter/lib/src/material/text_field.dart | 87 ++++--- .../lib/src/material/text_form_field.dart | 31 ++- mate_flutter/lib/src/material/theme_data.dart | 11 +- mate_flutter/lib/src/material/tooltip.dart | 21 +- .../lib/src/material/tooltip_theme.dart | 11 +- mate_flutter/lib/src/painting/colors.dart | 4 +- .../lib/src/painting/matrix_utils.dart | 4 +- .../lib/src/rendering/animated_size.dart | 11 +- .../lib/src/rendering/shifted_box.dart | 13 +- mate_flutter/lib/src/semantics/semantics.dart | 26 +- .../lib/src/services/hardware_keyboard.dart | 40 +++- .../lib/src/services/process_text.dart | 39 +++ mate_flutter/lib/src/services/text_input.dart | 34 --- .../lib/src/widgets/animated_size.dart | 11 +- mate_flutter/lib/src/widgets/banner.dart | 2 +- mate_flutter/lib/src/widgets/basic.dart | 144 +++++++----- .../widgets/bottom_navigation_bar_item.dart | 22 +- mate_flutter/lib/src/widgets/drag_target.dart | 18 -- .../lib/src/widgets/fade_in_image.dart | 148 ++++++++++-- .../lib/src/widgets/focus_manager.dart | 18 -- mate_flutter/lib/src/widgets/focus_scope.dart | 9 - mate_flutter/lib/src/widgets/icon.dart | 11 +- mate_flutter/lib/src/widgets/icon_data.dart | 4 +- .../lib/src/widgets/icon_theme_data.dart | 11 +- .../src/widgets/list_wheel_scroll_view.dart | 61 +++-- mate_flutter/lib/src/widgets/overlay.dart | 12 +- mate_flutter/lib/src/widgets/page_view.dart | 115 +++++---- .../lib/src/widgets/platform_menu_bar.dart | 2 +- .../lib/src/widgets/scroll_controller.dart | 20 +- mate_flutter/lib/src/widgets/shortcuts.dart | 4 +- mate_flutter/lib/src/widgets/tap_region.dart | 36 ++- .../lib/src/widgets/text_selection.dart | 21 +- mate_flutter/lib/src/widgets/transitions.dart | 11 +- .../lib/src/widgets/undo_history.dart | 11 +- mate_flutter/lib/src/widgets/view.dart | 4 +- mate_flutter/tools/gen_mates.dart | 5 +- note/lib/note.dart | 19 +- note/lib/src/content_builtin.dart | 54 +++++ spaces/flutter_note/lib/notes.g.dart | 3 +- .../notes/core_concepts/layout/box/note.dart | 64 +++++ .../core_concepts/layout/box/note.g.dart | 41 ++++ .../layout/constraints/note.dart | 58 +---- .../layout/constraints/note.g.dart | 6 +- .../lib/notes/core_concepts/layout/note.dart | 6 +- .../notes/core_concepts/layout/note.g.dart | 8 +- spaces/flutter_note/pubspec.yaml | 1 + test/bake2_test.bash | 4 +- 74 files changed, 1662 insertions(+), 538 deletions(-) create mode 100644 mate_flutter/lib/src/animation/animation_style.dart create mode 100644 mate_flutter/lib/src/services/process_text.dart create mode 100644 spaces/flutter_note/lib/notes/core_concepts/layout/box/note.dart create mode 100644 spaces/flutter_note/lib/notes/core_concepts/layout/box/note.g.dart diff --git a/bake b/bake index c36f1386..621632f5 100755 --- a/bake +++ b/bake @@ -26,7 +26,7 @@ _exec() { local project project=$(basename "$PWD") # [[ "$PWD" == "$SCRIPT_DIR" ]] && project="_root" - echo "${FUNCNAME[1]}() ▶︎【$*】" + echo "$project -> ${FUNCNAME[1]}() ▶︎【$*】" "$@" return $? } @@ -52,10 +52,17 @@ https://github.com/chen56/note Examples: ./${SCRIPT_FILE} # same as './${SCRIPT_FILE} -h' ./${SCRIPT_FILE} -h # show all commands help - ./${SCRIPT_FILE} -h -v # show all commands help , include internal function - ./${SCRIPT_FILE} all pwd # run "pwd" on all mono projects - ./${SCRIPT_FILE} all flutter pub get # run "flutter pub get" on all mono projects - ./${SCRIPT_FILE} note flutter pub get # run "flutter pub get" on note project + ./${SCRIPT_FILE} -h --debug # show all commands help , include internal function + + ./${SCRIPT_FILE} test # test all projects + ./${SCRIPT_FILE} build # defalut build == flutter build web --web-renderer html + ./${SCRIPT_FILE} preview # defalut preview == run server at web build + ./${SCRIPT_FILE} test # test all projects + + ./${SCRIPT_FILE} p -h # show all mono project commands help + ./${SCRIPT_FILE} p note pwd # run "pwd" on note project dir + ./${SCRIPT_FILE} p all pwd # run "pwd" on all mono projects + ./${SCRIPT_FILE} p all flutter pub get # run "flutter pub get" on all mono projects EOF )" @@ -92,9 +99,9 @@ p.mate_flutter() (cd mate_flutter && _exec "$@") p.note_test() (cd note_test && _exec "$@") p.note_tools() (cd note_tools && _exec "$@") -get() { _exec all flutter pub get; } +get() { _exec p.all flutter pub get; } -test() { ./test/bake2_test.bash test ; _exec all flutter test ;} +test() { ./test/bake2_test.bash test ; _exec p.all flutter test ;} test.bake() { ./test/bake2_test.bash test ; } # get ip only work on macos @@ -104,27 +111,29 @@ run.web() { p.flutter_note flutter run --web-port 8888 --web-renderer html --dev run.macos() { p.flutter_note flutter run --device-id macos "$@"; } # skwasm无法运行 +build.macos() { _exec p.flutter_note flutter build macos -v --release --tree-shake-icons "$@"; } build.web_skwasm() { p.flutter_note flutter build web -v --release --tree-shake-icons --web-renderer skwasm "$@" ; } build.web_canvaskit() { p.flutter_note flutter build web -v --release --tree-shake-icons --web-renderer canvaskit "$@" ; } -build.web_html() { p.flutter_note flutter build web -v --release --tree-shake-icons --web-renderer html "$@" ; } +build() { p.flutter_note flutter build web -v --release --tree-shake-icons --web-renderer html "$@" ; } # http-server 不支持base href设置，所以单独build,并设置base-href为"/",而github-pages的base-href必须是repository名 # npx http-server ./flutter_note/build/web --port 8000 # flutter pub global activate dhttpd # _exec p.flutter_note dhttpd --path ./build/web --port 8080 '--headers=Cross-Origin-Embedder-Policy=credentialless;Cross-Origin-Opener-Policy=same-origin' -preview.web() { build "$@" ; _exec p.flutter_note deno run --allow-env --allow-read --allow-sys --allow-net npm:http-server ./build/web --port 8000 -g --brotli; } +preview() { _exec p.flutter_note deno run --allow-env --allow-read --allow-sys --allow-net npm:http-server ./build/web --port 8000 -g --brotli; } +preview.macos() ( _exec p.flutter_note open build/macos/Build/Products/Release/flutter_note.app ; ) # http-server 不支持base href设置，所以单独build,并设置base-href为"/",而github-pages的base-href必须是repository名 # build "$@" # npx http-server ./flutter_note/build/web --port 8000 web.serve() { _exec p.flutter_note deno run --allow-env --allow-read --allow-sys --allow-net npm:http-server ./build/web --port 8000 -g --brotli ;} -preview.macos() ( _exec p.flutter_note flutter build macos -v --release --tree-shake-icons "$@"; _exec p.flutter_note open build/macos/Build/Products/Release/flutter_note.app ; ) -clean() { all flutter clean; rm -rf build;} -gen.all() { _exec p.flutter_note dart run tools/gen.dart; _exec p.mate_flutter dart run tools/gen_mates.dart; _exec p.mate_flutter dart run tools/gen_mate_icons.dart; } +clean() { p.all flutter clean; rm -rf build;} + +gen.all() { gen.notes; } # gen.mate;不再用了 gen.notes() { _exec p.flutter_note dart run tools/gen.dart; _exec p.flutter_note flutter pub get; } gen.mate() ( _exec p.mate_flutter dart run tools/gen_mates.dart; _exec p.mate_flutter dart run tools/gen_mate_icons.dart ; ) -regen() { _exec rm -f p.flutter_note/lib/pages.g.dart; _exec rm -rf mate_flutter/lib; gen; } +gen.clean() { _exec rm -f p.flutter_note/lib/pages.g.dart; _exec rm -rf mate_flutter/lib; } docker.build() ( _exec docker build --progress plain --tag younpc/note:latest . ; _exec mkdir -p build/flutter_note/web; _exec sh -c "docker run --rm --workdir /usr/share/nginx/html/note younpc/note tar cf - ./ | ( cd build/flutter_note/web; tar xf -)";) docker.run() { _exec echo "note preview http://localhost:8888/note/"; _exec docker run --rm --name note -p 8888:80 -u root:root younpc/note;} diff --git a/bake.bash b/bake.bash index 5f84c831..c3916691 100755 --- a/bake.bash +++ b/bake.bash @@ -605,7 +605,7 @@ bake._show_cmd_help() { fi shift - echo "${FUNCNAME[0]}"-------------"$@" + eval "$(bake.parse "${FUNCNAME[0]}" "$@")" local usage diff --git a/mate_flutter/lib/animation.dart b/mate_flutter/lib/animation.dart index 2ccddbc1..bfc15f7a 100644 --- a/mate_flutter/lib/animation.dart +++ b/mate_flutter/lib/animation.dart @@ -4,6 +4,7 @@ library animation; export 'src/animation/animation.dart'; export 'src/animation/animation_controller.dart'; +export 'src/animation/animation_style.dart'; export 'src/animation/animations.dart'; export 'src/animation/curves.dart'; export 'src/animation/listener_helpers.dart'; diff --git a/mate_flutter/lib/mate_enums.g.dart b/mate_flutter/lib/mate_enums.g.dart index 3a5f2203..e504647c 100644 --- a/mate_flutter/lib/mate_enums.g.dart +++ b/mate_flutter/lib/mate_enums.g.dart @@ -12,9 +12,8 @@ import 'package:flutter/semantics.dart' as _i8; import 'package:flutter/gestures.dart' as _i9; import 'package:flutter/services.dart' as _i10; import 'package:flutter/rendering.dart' as _i11; -import 'package:meta/meta_meta.dart' as _i12; -import 'package:flutter/material.dart' as _i13; -import 'package:material_color_utilities/material_color_utilities.dart' as _i14; +import 'package:flutter/material.dart' as _i12; +import 'package:material_color_utilities/material_color_utilities.dart' as _i13; import 'package:mate/mate_core.dart'; EnumRegister registerEnum() { @@ -25,6 +24,7 @@ EnumRegister registerEnum() { result.register(_i2.AppLifecycleState.values); result.register(_i2.SchedulerServiceExtensions.values); result.register(_i3.KeyEventType.values); + result.register(_i3.KeyEventDeviceType.values); result.register(_i3.BlendMode.values); result.register(_i3.FilterQuality.values); result.register(_i3.StrokeCap.values); @@ -142,6 +142,7 @@ EnumRegister registerEnum() { result.register(_i8.Assertiveness.values); result.register(_i9.GestureDisposition.values); result.register(_i9.DragStartBehavior.values); + result.register(_i9.MultitouchDragStrategy.values); result.register(_i9.GestureRecognizerState.values); result.register(_i10.KeyDataTransitMode.values); result.register(_i10.KeyboardLockMode.values); @@ -164,47 +165,47 @@ EnumRegister registerEnum() { result.register(_i11.TextGranularity.values); result.register(_i11.SelectionExtendDirection.values); result.register(_i11.SelectionStatus.values); + result.register(_i11.OverflowBoxFit.values); result.register(_i11.CacheExtentStyle.values); result.register(_i11.ScrollDirection.values); - result.register(_i12.TargetKind.values); - result.register(_i13.ThemeMode.values); - result.register(_i13.MaterialBannerClosedReason.values); - result.register(_i13.BottomNavigationBarType.values); - result.register(_i13.BottomNavigationBarLandscapeLayout.values); - result.register(_i13.ButtonTextTheme.values); - result.register(_i13.ButtonBarLayoutBehavior.values); - result.register(_i13.DatePickerEntryMode.values); - result.register(_i13.DatePickerMode.values); - result.register(_i13.DrawerAlignment.values); - result.register(_i13.CollapseMode.values); - result.register(_i13.StretchMode.values); - result.register(_i13.FloatingLabelBehavior.values); - result.register(_i13.ListTileStyle.values); - result.register(_i13.ListTileControlAffinity.values); - result.register(_i13.ListTileTitleAlignment.values); - result.register(_i13.MaterialType.values); - result.register(_i13.MaterialState.values); - result.register(_i13.NavigationDestinationLabelBehavior.values); - result.register(_i13.NavigationRailLabelType.values); - result.register(_i13.PopupMenuPosition.values); - result.register(_i13.RefreshIndicatorTriggerMode.values); - result.register(_i13.SliderInteraction.values); - result.register(_i13.ShowValueIndicator.values); - result.register(_i13.Thumb.values); - result.register(_i13.SnackBarClosedReason.values); - result.register(_i13.SnackBarBehavior.values); - result.register(_i13.StepState.values); - result.register(_i13.StepperType.values); - result.register(_i13.TabBarIndicatorSize.values); - result.register(_i13.TabAlignment.values); - result.register(_i13.MaterialTapTargetSize.values); - result.register(_i13.DayPeriod.values); - result.register(_i13.TimeOfDayFormat.values); - result.register(_i13.HourFormat.values); - result.register(_i13.TimePickerEntryMode.values); - result.register(_i13.TooltipTriggerMode.values); - result.register(_i13.ScriptCategory.values); - result.register(_i14.Direction.values); - result.register(_i14.Variant.values); + result.register(_i12.ThemeMode.values); + result.register(_i12.MaterialBannerClosedReason.values); + result.register(_i12.BottomNavigationBarType.values); + result.register(_i12.BottomNavigationBarLandscapeLayout.values); + result.register(_i12.ButtonTextTheme.values); + result.register(_i12.ButtonBarLayoutBehavior.values); + result.register(_i12.DatePickerEntryMode.values); + result.register(_i12.DatePickerMode.values); + result.register(_i12.DrawerAlignment.values); + result.register(_i12.CollapseMode.values); + result.register(_i12.StretchMode.values); + result.register(_i12.FloatingLabelBehavior.values); + result.register(_i12.ListTileStyle.values); + result.register(_i12.ListTileControlAffinity.values); + result.register(_i12.ListTileTitleAlignment.values); + result.register(_i12.MaterialType.values); + result.register(_i12.MaterialState.values); + result.register(_i12.NavigationDestinationLabelBehavior.values); + result.register(_i12.NavigationRailLabelType.values); + result.register(_i12.PopupMenuPosition.values); + result.register(_i12.RefreshIndicatorTriggerMode.values); + result.register(_i12.SliderInteraction.values); + result.register(_i12.ShowValueIndicator.values); + result.register(_i12.Thumb.values); + result.register(_i12.SnackBarClosedReason.values); + result.register(_i12.SnackBarBehavior.values); + result.register(_i12.StepState.values); + result.register(_i12.StepperType.values); + result.register(_i12.TabBarIndicatorSize.values); + result.register(_i12.TabAlignment.values); + result.register(_i12.MaterialTapTargetSize.values); + result.register(_i12.DayPeriod.values); + result.register(_i12.TimeOfDayFormat.values); + result.register(_i12.HourFormat.values); + result.register(_i12.TimePickerEntryMode.values); + result.register(_i12.TooltipTriggerMode.values); + result.register(_i12.ScriptCategory.values); + result.register(_i13.Direction.values); + result.register(_i13.Variant.values); return result; } diff --git a/mate_flutter/lib/mate_icons.g.dart b/mate_flutter/lib/mate_icons.g.dart index ce728373..bd7c9594 100644 --- a/mate_flutter/lib/mate_icons.g.dart +++ b/mate_flutter/lib/mate_icons.g.dart @@ -16001,7 +16001,7 @@ IconRegister registerIcon() { ); result.register( _i1.Icons.info, - 'app_info', + 'info', ); result.register( _i1.Icons.info_sharp, diff --git a/mate_flutter/lib/services.dart b/mate_flutter/lib/services.dart index 366e9bc0..4925de0f 100644 --- a/mate_flutter/lib/services.dart +++ b/mate_flutter/lib/services.dart @@ -25,6 +25,7 @@ export 'src/services/mouse_cursor.dart'; export 'src/services/mouse_tracking.dart'; export 'src/services/platform_channel.dart'; export 'src/services/platform_views.dart'; +export 'src/services/process_text.dart'; export 'src/services/raw_keyboard.dart'; export 'src/services/raw_keyboard_android.dart'; export 'src/services/raw_keyboard_fuchsia.dart'; diff --git a/mate_flutter/lib/src/animation/animation_style.dart b/mate_flutter/lib/src/animation/animation_style.dart new file mode 100644 index 00000000..d222fafa --- /dev/null +++ b/mate_flutter/lib/src/animation/animation_style.dart @@ -0,0 +1,58 @@ +// /// Generated by gen_maters.dart, please don't edit! + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:flutter/src/animation/animation_style.dart' as _i1; +import 'package:mate/mate_core.dart' as _i2; +import 'package:flutter/src/animation/curves.dart' as _i3; + +/// class AnimationStyle with Diagnosticable +class AnimationStyle$Mate extends _i1.AnimationStyle with _i2.Mate { + /// AnimationStyle AnimationStyle({Curve? curve, Duration? duration, Curve? reverseCurve, Duration? reverseDuration}) + AnimationStyle$Mate({ + /// optionalParameters: {Curve? curve} , default:none + super.curve, + + /// optionalParameters: {Duration? duration} , default:none + super.duration, + + /// optionalParameters: {Curve? reverseCurve} , default:none + super.reverseCurve, + + /// optionalParameters: {Duration? reverseDuration} , default:none + super.reverseDuration, + }) : mateParams = { + 'curve': _i2.BuilderArg<_i3.Curve?>( + name: 'curve', + init: curve, + isNamed: true, + ), + 'duration': _i2.BuilderArg( + name: 'duration', + init: duration, + isNamed: true, + ), + 'reverseCurve': _i2.BuilderArg<_i3.Curve?>( + name: 'reverseCurve', + init: reverseCurve, + isNamed: true, + ), + 'reverseDuration': _i2.BuilderArg( + name: 'reverseDuration', + init: reverseDuration, + isNamed: true, + ), + }, + super() { + mateBuilderName = 'AnimationStyle'; + matePackageUrl = 'package:flutter/animation.dart'; + mateBuilder = (p) => AnimationStyle$Mate( + curve: p.get('curve').build(), + duration: p.get('duration').build(), + reverseCurve: p.get('reverseCurve').build(), + reverseDuration: p.get('reverseDuration').build(), + ); + } + + @override + final Map mateParams; +} diff --git a/mate_flutter/lib/src/cupertino/activity_indicator.dart b/mate_flutter/lib/src/cupertino/activity_indicator.dart index 5fa22253..a3fdc3e2 100644 --- a/mate_flutter/lib/src/cupertino/activity_indicator.dart +++ b/mate_flutter/lib/src/cupertino/activity_indicator.dart @@ -5,6 +5,7 @@ import 'package:flutter/src/cupertino/activity_indicator.dart' as _i1; import 'package:mate/mate_core.dart' as _i2; import 'package:flutter/src/foundation/key.dart' as _i3; import 'dart:ui' as _i4; + /// class CupertinoActivityIndicator extends StatefulWidget class CupertinoActivityIndicator$Mate extends _i1.CupertinoActivityIndicator with _i2.Mate { /// CupertinoActivityIndicator CupertinoActivityIndicator({Key? key, Color? color, bool animating = true, double radius = _kDefaultIndicatorRadius}) diff --git a/mate_flutter/lib/src/cupertino/icon_theme_data.dart b/mate_flutter/lib/src/cupertino/icon_theme_data.dart index e5135756..ec97ed0b 100644 --- a/mate_flutter/lib/src/cupertino/icon_theme_data.dart +++ b/mate_flutter/lib/src/cupertino/icon_theme_data.dart @@ -7,7 +7,7 @@ import 'dart:ui' as _i3; /// class CupertinoIconThemeData extends IconThemeData with Diagnosticable class CupertinoIconThemeData$Mate extends _i1.CupertinoIconThemeData with _i2.Mate { - /// CupertinoIconThemeData CupertinoIconThemeData({double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, double? opacity, List? shadows}) + /// CupertinoIconThemeData CupertinoIconThemeData({double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, double? opacity, List? shadows, bool? applyTextScaling}) CupertinoIconThemeData$Mate({ /// optionalParameters: {double? size} , default:none super.size, @@ -32,6 +32,9 @@ class CupertinoIconThemeData$Mate extends _i1.CupertinoIconThemeData with _i2.Ma /// optionalParameters: {List? shadows} , default:none super.shadows, + + /// optionalParameters: {bool? applyTextScaling} , default:none + super.applyTextScaling, }) : mateParams = { 'size': _i2.BuilderArg( name: 'size', @@ -73,6 +76,11 @@ class CupertinoIconThemeData$Mate extends _i1.CupertinoIconThemeData with _i2.Ma init: shadows, isNamed: true, ), + 'applyTextScaling': _i2.BuilderArg( + name: 'applyTextScaling', + init: applyTextScaling, + isNamed: true, + ), }, super() { mateBuilderName = 'CupertinoIconThemeData'; @@ -86,6 +94,7 @@ class CupertinoIconThemeData$Mate extends _i1.CupertinoIconThemeData with _i2.Ma color: p.get('color').build(), opacity: p.get('opacity').build(), shadows: p.get('shadows').build(), + applyTextScaling: p.get('applyTextScaling').build(), ); } diff --git a/mate_flutter/lib/src/cupertino/text_field.dart b/mate_flutter/lib/src/cupertino/text_field.dart index d97aa0e3..4701da9c 100644 --- a/mate_flutter/lib/src/cupertino/text_field.dart +++ b/mate_flutter/lib/src/cupertino/text_field.dart @@ -30,7 +30,7 @@ import 'package:flutter/src/widgets/magnifier.dart' as _i26; /// class CupertinoTextField extends StatefulWidget class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { - /// CupertinoTextField CupertinoTextField({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, BoxDecoration? decoration = _kDefaultRoundedBorderDecoration, EdgeInsetsGeometry padding = const EdgeInsets.all(7.0), String? placeholder, TextStyle? placeholderStyle = const TextStyle(fontWeight: FontWeight.w400, color: CupertinoColors.placeholderText), Widget? prefix, OverlayVisibilityMode prefixMode = OverlayVisibilityMode.always, Widget? suffix, OverlayVisibilityMode suffixMode = OverlayVisibilityMode.always, OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never, TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(PointerDownEvent)? onTapOutside, List? inputFormatters, bool enabled = true, double cursorWidth = 2.0, double? cursorHeight, Radius cursorRadius = const Radius.circular(2.0), bool cursorOpacityAnimates = true, Color? cursorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) + /// CupertinoTextField CupertinoTextField({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, BoxDecoration? decoration = _kDefaultRoundedBorderDecoration, EdgeInsetsGeometry padding = const EdgeInsets.all(7.0), String? placeholder, TextStyle? placeholderStyle = const TextStyle(fontWeight: FontWeight.w400, color: CupertinoColors.placeholderText), Widget? prefix, OverlayVisibilityMode prefixMode = OverlayVisibilityMode.always, Widget? suffix, OverlayVisibilityMode suffixMode = OverlayVisibilityMode.always, OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never, String? clearButtonSemanticLabel, TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(PointerDownEvent)? onTapOutside, List? inputFormatters, bool enabled = true, double cursorWidth = 2.0, double? cursorHeight, Radius cursorRadius = const Radius.circular(2.0), bool cursorOpacityAnimates = true, Color? cursorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) CupertinoTextField$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -71,6 +71,9 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { /// optionalParameters: {OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never} , default:processed=PrefixedIdentifierImpl super.clearButtonMode, + /// optionalParameters: {String? clearButtonSemanticLabel} , default:none + super.clearButtonSemanticLabel, + /// optionalParameters: {TextInputType? keyboardType} , default:none super.keyboardType, @@ -295,6 +298,11 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { isNamed: true, defaultValue: _i11.OverlayVisibilityMode.never, ), + 'clearButtonSemanticLabel': _i2.BuilderArg( + name: 'clearButtonSemanticLabel', + init: clearButtonSemanticLabel, + isNamed: true, + ), 'keyboardType': _i2.BuilderArg<_i12.TextInputType?>( name: 'keyboardType', init: keyboardType, @@ -590,6 +598,7 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { suffix: p.get('suffix').build(), suffixMode: p.get('suffixMode').build(), clearButtonMode: p.get('clearButtonMode').build(), + clearButtonSemanticLabel: p.get('clearButtonSemanticLabel').build(), keyboardType: p.get('keyboardType').build(), textInputAction: p.get('textInputAction').build(), textCapitalization: p.get('textCapitalization').build(), @@ -645,7 +654,7 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { ); } - /// CupertinoTextField CupertinoTextField.borderless({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, BoxDecoration? decoration, EdgeInsetsGeometry padding = const EdgeInsets.all(7.0), String? placeholder, TextStyle? placeholderStyle = _kDefaultPlaceholderStyle, Widget? prefix, OverlayVisibilityMode prefixMode = OverlayVisibilityMode.always, Widget? suffix, OverlayVisibilityMode suffixMode = OverlayVisibilityMode.always, OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never, TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(PointerDownEvent)? onTapOutside, List? inputFormatters, bool enabled = true, double cursorWidth = 2.0, double? cursorHeight, Radius cursorRadius = const Radius.circular(2.0), bool cursorOpacityAnimates = true, Color? cursorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) + /// CupertinoTextField CupertinoTextField.borderless({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, BoxDecoration? decoration, EdgeInsetsGeometry padding = const EdgeInsets.all(7.0), String? placeholder, TextStyle? placeholderStyle = _kDefaultPlaceholderStyle, Widget? prefix, OverlayVisibilityMode prefixMode = OverlayVisibilityMode.always, Widget? suffix, OverlayVisibilityMode suffixMode = OverlayVisibilityMode.always, OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never, String? clearButtonSemanticLabel, TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(PointerDownEvent)? onTapOutside, List? inputFormatters, bool enabled = true, double cursorWidth = 2.0, double? cursorHeight, Radius cursorRadius = const Radius.circular(2.0), bool cursorOpacityAnimates = true, Color? cursorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) CupertinoTextField$Mate.borderless({ /// optionalParameters: {Key? key} , default:none super.key, @@ -686,6 +695,9 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { /// optionalParameters: {OverlayVisibilityMode clearButtonMode = OverlayVisibilityMode.never} , default:processed=PrefixedIdentifierImpl super.clearButtonMode, + /// optionalParameters: {String? clearButtonSemanticLabel} , default:none + super.clearButtonSemanticLabel, + /// optionalParameters: {TextInputType? keyboardType} , default:none super.keyboardType, @@ -910,6 +922,11 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { isNamed: true, defaultValue: _i11.OverlayVisibilityMode.never, ), + 'clearButtonSemanticLabel': _i2.BuilderArg( + name: 'clearButtonSemanticLabel', + init: clearButtonSemanticLabel, + isNamed: true, + ), 'keyboardType': _i2.BuilderArg<_i12.TextInputType?>( name: 'keyboardType', init: keyboardType, @@ -1205,6 +1222,7 @@ class CupertinoTextField$Mate extends _i1.CupertinoTextField with _i2.Mate { suffix: p.get('suffix').build(), suffixMode: p.get('suffixMode').build(), clearButtonMode: p.get('clearButtonMode').build(), + clearButtonSemanticLabel: p.get('clearButtonSemanticLabel').build(), keyboardType: p.get('keyboardType').build(), textInputAction: p.get('textInputAction').build(), textCapitalization: p.get('textCapitalization').build(), diff --git a/mate_flutter/lib/src/foundation/diagnostics.dart b/mate_flutter/lib/src/foundation/diagnostics.dart index 94632811..374ff41f 100644 --- a/mate_flutter/lib/src/foundation/diagnostics.dart +++ b/mate_flutter/lib/src/foundation/diagnostics.dart @@ -322,7 +322,7 @@ class TextTreeRenderer$Mate extends _i1.TextTreeRenderer with _i2.Mate { /// class MessageProperty extends DiagnosticsProperty class MessageProperty$Mate extends _i1.MessageProperty with _i2.Mate { - /// MessageProperty MessageProperty(String name, String message, {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// MessageProperty MessageProperty(String name, String message, {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) MessageProperty$Mate( /// requiredParameters: String name super.name, @@ -332,7 +332,7 @@ class MessageProperty$Mate extends _i1.MessageProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -375,7 +375,7 @@ class MessageProperty$Mate extends _i1.MessageProperty with _i2.Mate { /// class StringProperty extends DiagnosticsProperty class StringProperty$Mate extends _i1.StringProperty with _i2.Mate { - /// StringProperty StringProperty(String name, String? value, {String? description, String? tooltip, bool showName = true, Object? defaultValue = kNoDefaultValue, bool quoted = true, String? ifEmpty, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// StringProperty StringProperty(String name, String? value, {String? description, String? tooltip, bool showName = true, Object? defaultValue = kNoDefaultValue, bool quoted = true, String? ifEmpty, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) StringProperty$Mate( /// requiredParameters: String name super.name, @@ -403,7 +403,7 @@ class StringProperty$Mate extends _i1.StringProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -484,7 +484,7 @@ class StringProperty$Mate extends _i1.StringProperty with _i2.Mate { /// class DoubleProperty extends _NumProperty class DoubleProperty$Mate extends _i1.DoubleProperty with _i2.Mate { - /// DoubleProperty DoubleProperty(String name, double? value, {String? ifNull, String? unit, String? tooltip, Object? defaultValue = kNoDefaultValue, bool showName = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// DoubleProperty DoubleProperty(String name, double? value, {String? ifNull, String? unit, String? tooltip, Object? defaultValue = kNoDefaultValue, bool showName = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) DoubleProperty$Mate( /// requiredParameters: String name super.name, @@ -509,7 +509,7 @@ class DoubleProperty$Mate extends _i1.DoubleProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -577,7 +577,7 @@ class DoubleProperty$Mate extends _i1.DoubleProperty with _i2.Mate { ); } - /// DoubleProperty DoubleProperty.lazy(String name, double? Function() computeValue, {String? ifNull, bool showName = true, String? unit, String? tooltip, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// DoubleProperty DoubleProperty.lazy(String name, double? Function() computeValue, {String? ifNull, bool showName = true, String? unit, String? tooltip, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.info}) DoubleProperty$Mate.lazy( /// requiredParameters: String name super.name, @@ -599,7 +599,7 @@ class DoubleProperty$Mate extends _i1.DoubleProperty with _i2.Mate { /// optionalParameters: {Object? defaultValue = kNoDefaultValue} , default:unprocessed=SimpleIdentifierImpl super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -666,7 +666,7 @@ class DoubleProperty$Mate extends _i1.DoubleProperty with _i2.Mate { /// class IntProperty extends _NumProperty class IntProperty$Mate extends _i1.IntProperty with _i2.Mate { - /// IntProperty IntProperty(String name, int? value, {String? ifNull, bool showName = true, String? unit, Object? defaultValue = kNoDefaultValue, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// IntProperty IntProperty(String name, int? value, {String? ifNull, bool showName = true, String? unit, Object? defaultValue = kNoDefaultValue, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) IntProperty$Mate( /// requiredParameters: String name super.name, @@ -688,7 +688,7 @@ class IntProperty$Mate extends _i1.IntProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -756,7 +756,7 @@ class IntProperty$Mate extends _i1.IntProperty with _i2.Mate { /// class PercentProperty extends DoubleProperty class PercentProperty$Mate extends _i1.PercentProperty with _i2.Mate { - /// PercentProperty PercentProperty(String name, double? fraction, {String? ifNull, bool showName = true, String? tooltip, String? unit, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// PercentProperty PercentProperty(String name, double? fraction, {String? ifNull, bool showName = true, String? tooltip, String? unit, DiagnosticLevel level = DiagnosticLevel.info}) PercentProperty$Mate( /// requiredParameters: String name super.name, @@ -775,7 +775,7 @@ class PercentProperty$Mate extends _i1.PercentProperty with _i2.Mate { /// optionalParameters: {String? unit} , default:none super.unit, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -836,7 +836,7 @@ class PercentProperty$Mate extends _i1.PercentProperty with _i2.Mate { /// class FlagProperty extends DiagnosticsProperty class FlagProperty$Mate extends _i1.FlagProperty with _i2.Mate { - /// FlagProperty FlagProperty(String name, {required bool? value, String? ifTrue, String? ifFalse, bool showName = false, Object? defaultValue, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// FlagProperty FlagProperty(String name, {required bool? value, String? ifTrue, String? ifFalse, bool showName = false, Object? defaultValue, DiagnosticLevel level = DiagnosticLevel.info}) FlagProperty$Mate( /// requiredParameters: String name super.name, { @@ -855,7 +855,7 @@ class FlagProperty$Mate extends _i1.FlagProperty with _i2.Mate { /// optionalParameters: {Object? defaultValue} , default:none super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -916,7 +916,7 @@ class FlagProperty$Mate extends _i1.FlagProperty with _i2.Mate { /// class IterableProperty extends DiagnosticsProperty> class IterableProperty$Mate extends _i1.IterableProperty with _i2.Mate { - /// IterableProperty IterableProperty(String name, Iterable? value, {Object? defaultValue = kNoDefaultValue, String? ifNull, String? ifEmpty = '[]', DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, bool showName = true, bool showSeparator = true, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// IterableProperty IterableProperty(String name, Iterable? value, {Object? defaultValue = kNoDefaultValue, String? ifNull, String? ifEmpty = '[]', DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, bool showName = true, bool showSeparator = true, DiagnosticLevel level = DiagnosticLevel.info}) IterableProperty$Mate( /// requiredParameters: String name super.name, @@ -941,7 +941,7 @@ class IterableProperty$Mate extends _i1.IterableProperty with _i2.Mate { /// optionalParameters: {bool showSeparator = true} , default:processed=BooleanLiteralImpl super.showSeparator, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1017,7 +1017,7 @@ class IterableProperty$Mate extends _i1.IterableProperty with _i2.Mate { /// class EnumProperty extends DiagnosticsProperty class EnumProperty$Mate extends _i1.EnumProperty with _i2.Mate { - /// EnumProperty EnumProperty(String name, T? value, {Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// EnumProperty EnumProperty(String name, T? value, {Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.info}) EnumProperty$Mate( /// requiredParameters: String name super.name, @@ -1027,7 +1027,7 @@ class EnumProperty$Mate extends _i1.EnumProperty with _i2.Ma /// optionalParameters: {Object? defaultValue = kNoDefaultValue} , default:unprocessed=SimpleIdentifierImpl super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1069,7 +1069,7 @@ class EnumProperty$Mate extends _i1.EnumProperty with _i2.Ma /// class ObjectFlagProperty extends DiagnosticsProperty class ObjectFlagProperty$Mate extends _i1.ObjectFlagProperty with _i2.Mate { - /// ObjectFlagProperty ObjectFlagProperty(String name, T? value, {String? ifPresent, String? ifNull, bool showName = false, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// ObjectFlagProperty ObjectFlagProperty(String name, T? value, {String? ifPresent, String? ifNull, bool showName = false, DiagnosticLevel level = DiagnosticLevel.info}) ObjectFlagProperty$Mate( /// requiredParameters: String name super.name, @@ -1085,7 +1085,7 @@ class ObjectFlagProperty$Mate extends _i1.ObjectFlagProperty with _i2.Mate /// optionalParameters: {bool showName = false} , default:processed=BooleanLiteralImpl super.showName, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1134,14 +1134,14 @@ class ObjectFlagProperty$Mate extends _i1.ObjectFlagProperty with _i2.Mate ); } - /// ObjectFlagProperty ObjectFlagProperty.has(String name, T? value, {DiagnosticLevel level = DiagnosticLevel.app_info}) + /// ObjectFlagProperty ObjectFlagProperty.has(String name, T? value, {DiagnosticLevel level = DiagnosticLevel.info}) ObjectFlagProperty$Mate.has( /// requiredParameters: String name super.name, /// requiredParameters: T? value super.value, { - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1177,7 +1177,7 @@ class ObjectFlagProperty$Mate extends _i1.ObjectFlagProperty with _i2.Mate /// class FlagsSummary extends DiagnosticsProperty> class FlagsSummary$Mate extends _i1.FlagsSummary with _i2.Mate { - /// FlagsSummary FlagsSummary(String name, Map value, {String? ifEmpty, bool showName = true, bool showSeparator = true, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// FlagsSummary FlagsSummary(String name, Map value, {String? ifEmpty, bool showName = true, bool showSeparator = true, DiagnosticLevel level = DiagnosticLevel.info}) FlagsSummary$Mate( /// requiredParameters: String name super.name, @@ -1193,7 +1193,7 @@ class FlagsSummary$Mate extends _i1.FlagsSummary with _i2.Mate { /// optionalParameters: {bool showSeparator = true} , default:processed=BooleanLiteralImpl super.showSeparator, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1249,7 +1249,7 @@ class FlagsSummary$Mate extends _i1.FlagsSummary with _i2.Mate { /// class DiagnosticsProperty extends DiagnosticsNode class DiagnosticsProperty$Mate extends _i1.DiagnosticsProperty with _i2.Mate { - /// DiagnosticsProperty DiagnosticsProperty(String? name, T? value, {String? description, String? ifNull, String? ifEmpty, bool showName = true, bool showSeparator = true, Object? defaultValue = kNoDefaultValue, String? tooltip, bool missingIfNull = false, String? linePrefix, bool expandableValue = false, bool allowWrap = true, bool allowNameWrap = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// DiagnosticsProperty DiagnosticsProperty(String? name, T? value, {String? description, String? ifNull, String? ifEmpty, bool showName = true, bool showSeparator = true, Object? defaultValue = kNoDefaultValue, String? tooltip, bool missingIfNull = false, String? linePrefix, bool expandableValue = false, bool allowWrap = true, bool allowNameWrap = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) DiagnosticsProperty$Mate( /// requiredParameters: String? name super.name, @@ -1295,7 +1295,7 @@ class DiagnosticsProperty$Mate extends _i1.DiagnosticsProperty with _i2.Ma /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1410,7 +1410,7 @@ class DiagnosticsProperty$Mate extends _i1.DiagnosticsProperty with _i2.Ma ); } - /// DiagnosticsProperty DiagnosticsProperty.lazy(String? name, T? Function() computeValue, {String? description, String? ifNull, String? ifEmpty, bool showName = true, bool showSeparator = true, Object? defaultValue = kNoDefaultValue, String? tooltip, bool missingIfNull = false, bool expandableValue = false, bool allowWrap = true, bool allowNameWrap = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// DiagnosticsProperty DiagnosticsProperty.lazy(String? name, T? Function() computeValue, {String? description, String? ifNull, String? ifEmpty, bool showName = true, bool showSeparator = true, Object? defaultValue = kNoDefaultValue, String? tooltip, bool missingIfNull = false, bool expandableValue = false, bool allowWrap = true, bool allowNameWrap = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) DiagnosticsProperty$Mate.lazy( /// requiredParameters: String? name super.name, @@ -1453,7 +1453,7 @@ class DiagnosticsProperty$Mate extends _i1.DiagnosticsProperty with _i2.Ma /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( @@ -1678,7 +1678,7 @@ class DiagnosticPropertiesBuilder$Mate extends _i1.DiagnosticPropertiesBuilder w /// class DiagnosticsBlock extends DiagnosticsNode class DiagnosticsBlock$Mate extends _i1.DiagnosticsBlock with _i2.Mate { - /// DiagnosticsBlock DiagnosticsBlock({String? name, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.whitespace, bool showName = true, bool showSeparator = true, String? linePrefix, Object? value, String? description, DiagnosticLevel level = DiagnosticLevel.app_info, bool allowTruncate = false, List children = const [], List properties = const []}) + /// DiagnosticsBlock DiagnosticsBlock({String? name, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.whitespace, bool showName = true, bool showSeparator = true, String? linePrefix, Object? value, String? description, DiagnosticLevel level = DiagnosticLevel.info, bool allowTruncate = false, List children = const [], List properties = const []}) DiagnosticsBlock$Mate({ /// optionalParameters: {String? name} , default:none super.name, @@ -1701,7 +1701,7 @@ class DiagnosticsBlock$Mate extends _i1.DiagnosticsBlock with _i2.Mate { /// optionalParameters: {String? description} , default:none super.description, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, /// optionalParameters: {bool allowTruncate = false} , default:processed=BooleanLiteralImpl diff --git a/mate_flutter/lib/src/foundation/timeline.dart b/mate_flutter/lib/src/foundation/timeline.dart index 7c89d43c..d34a23cd 100644 --- a/mate_flutter/lib/src/foundation/timeline.dart +++ b/mate_flutter/lib/src/foundation/timeline.dart @@ -1,9 +1 @@ // /// Generated by gen_maters.dart, please don't edit! - -// ignore_for_file: no_leading_underscores_for_library_prefixes - -/// final class TimedBlock - -/// final class AggregatedTimings - -/// final class AggregatedTimedBlock diff --git a/mate_flutter/lib/src/gestures/scale.dart b/mate_flutter/lib/src/gestures/scale.dart index 83c22a5d..e5b973a8 100644 --- a/mate_flutter/lib/src/gestures/scale.dart +++ b/mate_flutter/lib/src/gestures/scale.dart @@ -12,7 +12,7 @@ import 'package:flutter/gestures.dart' as _i8; /// class ScaleStartDetails class ScaleStartDetails$Mate extends _i1.ScaleStartDetails with _i2.Mate { - /// ScaleStartDetails ScaleStartDetails({Offset focalPoint = Offset.zero, Offset? localFocalPoint, int pointerCount = 0}) + /// ScaleStartDetails ScaleStartDetails({Offset focalPoint = Offset.zero, Offset? localFocalPoint, int pointerCount = 0, Duration? sourceTimeStamp}) ScaleStartDetails$Mate({ /// optionalParameters: {Offset focalPoint = Offset.zero} , default:processed=PrefixedIdentifierImpl super.focalPoint, @@ -22,6 +22,9 @@ class ScaleStartDetails$Mate extends _i1.ScaleStartDetails with _i2.Mate { /// optionalParameters: {int pointerCount = 0} , default:processed=IntegerLiteralImpl super.pointerCount, + + /// optionalParameters: {Duration? sourceTimeStamp} , default:none + super.sourceTimeStamp, }) : mateParams = { 'focalPoint': _i2.BuilderArg<_i3.Offset>( name: 'focalPoint', @@ -40,6 +43,11 @@ class ScaleStartDetails$Mate extends _i1.ScaleStartDetails with _i2.Mate { isNamed: true, defaultValue: 0, ), + 'sourceTimeStamp': _i2.BuilderArg( + name: 'sourceTimeStamp', + init: sourceTimeStamp, + isNamed: true, + ), }, super() { mateBuilderName = 'ScaleStartDetails'; @@ -48,6 +56,7 @@ class ScaleStartDetails$Mate extends _i1.ScaleStartDetails with _i2.Mate { focalPoint: p.get('focalPoint').build(), localFocalPoint: p.get('localFocalPoint').build(), pointerCount: p.get('pointerCount').build(), + sourceTimeStamp: p.get('sourceTimeStamp').build(), ); } @@ -57,7 +66,7 @@ class ScaleStartDetails$Mate extends _i1.ScaleStartDetails with _i2.Mate { /// class ScaleUpdateDetails class ScaleUpdateDetails$Mate extends _i1.ScaleUpdateDetails with _i2.Mate { - /// ScaleUpdateDetails ScaleUpdateDetails({Offset focalPoint = Offset.zero, Offset? localFocalPoint, double scale = 1.0, double horizontalScale = 1.0, double verticalScale = 1.0, double rotation = 0.0, int pointerCount = 0, Offset focalPointDelta = Offset.zero}) + /// ScaleUpdateDetails ScaleUpdateDetails({Offset focalPoint = Offset.zero, Offset? localFocalPoint, double scale = 1.0, double horizontalScale = 1.0, double verticalScale = 1.0, double rotation = 0.0, int pointerCount = 0, Offset focalPointDelta = Offset.zero, Duration? sourceTimeStamp}) ScaleUpdateDetails$Mate({ /// optionalParameters: {Offset focalPoint = Offset.zero} , default:processed=PrefixedIdentifierImpl super.focalPoint, @@ -82,6 +91,9 @@ class ScaleUpdateDetails$Mate extends _i1.ScaleUpdateDetails with _i2.Mate { /// optionalParameters: {Offset focalPointDelta = Offset.zero} , default:processed=PrefixedIdentifierImpl super.focalPointDelta, + + /// optionalParameters: {Duration? sourceTimeStamp} , default:none + super.sourceTimeStamp, }) : mateParams = { 'focalPoint': _i2.BuilderArg<_i3.Offset>( name: 'focalPoint', @@ -130,6 +142,11 @@ class ScaleUpdateDetails$Mate extends _i1.ScaleUpdateDetails with _i2.Mate { isNamed: true, defaultValue: _i4.Offset.zero, ), + 'sourceTimeStamp': _i2.BuilderArg( + name: 'sourceTimeStamp', + init: sourceTimeStamp, + isNamed: true, + ), }, super() { mateBuilderName = 'ScaleUpdateDetails'; @@ -143,6 +160,7 @@ class ScaleUpdateDetails$Mate extends _i1.ScaleUpdateDetails with _i2.Mate { rotation: p.get('rotation').build(), pointerCount: p.get('pointerCount').build(), focalPointDelta: p.get('focalPointDelta').build(), + sourceTimeStamp: p.get('sourceTimeStamp').build(), ); } diff --git a/mate_flutter/lib/src/material/app.dart b/mate_flutter/lib/src/material/app.dart index f889fd39..7a0f87d7 100644 --- a/mate_flutter/lib/src/material/app.dart +++ b/mate_flutter/lib/src/material/app.dart @@ -18,11 +18,12 @@ import 'package:flutter/src/widgets/localizations.dart' as _i14; import 'package:flutter/src/widgets/shortcuts.dart' as _i15; import 'package:flutter/src/widgets/actions.dart' as _i16; import 'package:flutter/src/widgets/scroll_configuration.dart' as _i17; -import 'package:flutter/src/widgets/router.dart' as _i18; +import 'package:flutter/src/animation/animation_style.dart' as _i18; +import 'package:flutter/src/widgets/router.dart' as _i19; /// class MaterialApp extends StatefulWidget class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { - /// MaterialApp MaterialApp({Key? key, GlobalKey? navigatorKey, GlobalKey? scaffoldMessengerKey, Widget? home, Map routes = const {}, String? initialRoute, Route? Function(RouteSettings)? onGenerateRoute, List> Function(String)? onGenerateInitialRoutes, Route? Function(RouteSettings)? onUnknownRoute, bool Function(NavigationNotification)? onNavigationNotification, List navigatorObservers = const [], Widget Function(BuildContext, Widget?)? builder, String title = '', String Function(BuildContext)? onGenerateTitle, Color? color, ThemeData? theme, ThemeData? darkTheme, ThemeData? highContrastTheme, ThemeData? highContrastDarkTheme, ThemeMode? themeMode = ThemeMode.system, Duration themeAnimationDuration = kThemeAnimationDuration, Curve themeAnimationCurve = Curves.linear, Locale? locale, Iterable>? localizationsDelegates, Locale? Function(List?, Iterable)? localeListResolutionCallback, Locale? Function(Locale?, Iterable)? localeResolutionCallback, Iterable supportedLocales = const [Locale('en', 'US')], bool debugShowMaterialGrid = false, bool showPerformanceOverlay = false, bool checkerboardRasterCacheImages = false, bool checkerboardOffscreenLayers = false, bool showSemanticsDebugger = false, bool debugShowCheckedModeBanner = true, Map? shortcuts, Map>? actions, String? restorationScopeId, ScrollBehavior? scrollBehavior, bool useInheritedMediaQuery = false}) + /// MaterialApp MaterialApp({Key? key, GlobalKey? navigatorKey, GlobalKey? scaffoldMessengerKey, Widget? home, Map routes = const {}, String? initialRoute, Route? Function(RouteSettings)? onGenerateRoute, List> Function(String)? onGenerateInitialRoutes, Route? Function(RouteSettings)? onUnknownRoute, bool Function(NavigationNotification)? onNavigationNotification, List navigatorObservers = const [], Widget Function(BuildContext, Widget?)? builder, String title = '', String Function(BuildContext)? onGenerateTitle, Color? color, ThemeData? theme, ThemeData? darkTheme, ThemeData? highContrastTheme, ThemeData? highContrastDarkTheme, ThemeMode? themeMode = ThemeMode.system, Duration themeAnimationDuration = kThemeAnimationDuration, Curve themeAnimationCurve = Curves.linear, Locale? locale, Iterable>? localizationsDelegates, Locale? Function(List?, Iterable)? localeListResolutionCallback, Locale? Function(Locale?, Iterable)? localeResolutionCallback, Iterable supportedLocales = const [Locale('en', 'US')], bool debugShowMaterialGrid = false, bool showPerformanceOverlay = false, bool checkerboardRasterCacheImages = false, bool checkerboardOffscreenLayers = false, bool showSemanticsDebugger = false, bool debugShowCheckedModeBanner = true, Map? shortcuts, Map>? actions, String? restorationScopeId, ScrollBehavior? scrollBehavior, bool useInheritedMediaQuery = false, AnimationStyle? themeAnimationStyle}) MaterialApp$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -134,6 +135,9 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { /// optionalParameters: {ScrollBehavior? scrollBehavior} , default:none super.scrollBehavior, + + /// optionalParameters: {AnimationStyle? themeAnimationStyle} , default:none + super.themeAnimationStyle, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -329,6 +333,11 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { init: scrollBehavior, isNamed: true, ), + 'themeAnimationStyle': _i2.BuilderArg<_i18.AnimationStyle?>( + name: 'themeAnimationStyle', + init: themeAnimationStyle, + isNamed: true, + ), }, super() { mateBuilderName = 'MaterialApp'; @@ -371,10 +380,11 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { actions: p.get('actions').build(), restorationScopeId: p.get('restorationScopeId').build(), scrollBehavior: p.get('scrollBehavior').build(), + themeAnimationStyle: p.get('themeAnimationStyle').build(), ); } - /// MaterialApp MaterialApp.router({Key? key, GlobalKey? scaffoldMessengerKey, RouteInformationProvider? routeInformationProvider, RouteInformationParser? routeInformationParser, RouterDelegate? routerDelegate, RouterConfig? routerConfig, BackButtonDispatcher? backButtonDispatcher, Widget Function(BuildContext, Widget?)? builder, String title = '', String Function(BuildContext)? onGenerateTitle, bool Function(NavigationNotification)? onNavigationNotification, Color? color, ThemeData? theme, ThemeData? darkTheme, ThemeData? highContrastTheme, ThemeData? highContrastDarkTheme, ThemeMode? themeMode = ThemeMode.system, Duration themeAnimationDuration = kThemeAnimationDuration, Curve themeAnimationCurve = Curves.linear, Locale? locale, Iterable>? localizationsDelegates, Locale? Function(List?, Iterable)? localeListResolutionCallback, Locale? Function(Locale?, Iterable)? localeResolutionCallback, Iterable supportedLocales = const [Locale('en', 'US')], bool debugShowMaterialGrid = false, bool showPerformanceOverlay = false, bool checkerboardRasterCacheImages = false, bool checkerboardOffscreenLayers = false, bool showSemanticsDebugger = false, bool debugShowCheckedModeBanner = true, Map? shortcuts, Map>? actions, String? restorationScopeId, ScrollBehavior? scrollBehavior, bool useInheritedMediaQuery = false}) + /// MaterialApp MaterialApp.router({Key? key, GlobalKey? scaffoldMessengerKey, RouteInformationProvider? routeInformationProvider, RouteInformationParser? routeInformationParser, RouterDelegate? routerDelegate, RouterConfig? routerConfig, BackButtonDispatcher? backButtonDispatcher, Widget Function(BuildContext, Widget?)? builder, String title = '', String Function(BuildContext)? onGenerateTitle, bool Function(NavigationNotification)? onNavigationNotification, Color? color, ThemeData? theme, ThemeData? darkTheme, ThemeData? highContrastTheme, ThemeData? highContrastDarkTheme, ThemeMode? themeMode = ThemeMode.system, Duration themeAnimationDuration = kThemeAnimationDuration, Curve themeAnimationCurve = Curves.linear, Locale? locale, Iterable>? localizationsDelegates, Locale? Function(List?, Iterable)? localeListResolutionCallback, Locale? Function(Locale?, Iterable)? localeResolutionCallback, Iterable supportedLocales = const [Locale('en', 'US')], bool debugShowMaterialGrid = false, bool showPerformanceOverlay = false, bool checkerboardRasterCacheImages = false, bool checkerboardOffscreenLayers = false, bool showSemanticsDebugger = false, bool debugShowCheckedModeBanner = true, Map? shortcuts, Map>? actions, String? restorationScopeId, ScrollBehavior? scrollBehavior, bool useInheritedMediaQuery = false, AnimationStyle? themeAnimationStyle}) MaterialApp$Mate.router({ /// optionalParameters: {Key? key} , default:none super.key, @@ -477,6 +487,9 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { /// optionalParameters: {ScrollBehavior? scrollBehavior} , default:none super.scrollBehavior, + + /// optionalParameters: {AnimationStyle? themeAnimationStyle} , default:none + super.themeAnimationStyle, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -488,27 +501,27 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { init: scaffoldMessengerKey, isNamed: true, ), - 'routeInformationProvider': _i2.BuilderArg<_i18.RouteInformationProvider?>( + 'routeInformationProvider': _i2.BuilderArg<_i19.RouteInformationProvider?>( name: 'routeInformationProvider', init: routeInformationProvider, isNamed: true, ), - 'routeInformationParser': _i2.BuilderArg<_i18.RouteInformationParser?>( + 'routeInformationParser': _i2.BuilderArg<_i19.RouteInformationParser?>( name: 'routeInformationParser', init: routeInformationParser, isNamed: true, ), - 'routerDelegate': _i2.BuilderArg<_i18.RouterDelegate?>( + 'routerDelegate': _i2.BuilderArg<_i19.RouterDelegate?>( name: 'routerDelegate', init: routerDelegate, isNamed: true, ), - 'routerConfig': _i2.BuilderArg<_i18.RouterConfig?>( + 'routerConfig': _i2.BuilderArg<_i19.RouterConfig?>( name: 'routerConfig', init: routerConfig, isNamed: true, ), - 'backButtonDispatcher': _i2.BuilderArg<_i18.BackButtonDispatcher?>( + 'backButtonDispatcher': _i2.BuilderArg<_i19.BackButtonDispatcher?>( name: 'backButtonDispatcher', init: backButtonDispatcher, isNamed: true, @@ -657,6 +670,11 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { init: scrollBehavior, isNamed: true, ), + 'themeAnimationStyle': _i2.BuilderArg<_i18.AnimationStyle?>( + name: 'themeAnimationStyle', + init: themeAnimationStyle, + isNamed: true, + ), }, super.router() { mateBuilderName = 'MaterialApp.router'; @@ -696,6 +714,7 @@ class MaterialApp$Mate extends _i1.MaterialApp with _i2.Mate { actions: p.get('actions').build(), restorationScopeId: p.get('restorationScopeId').build(), scrollBehavior: p.get('scrollBehavior').build(), + themeAnimationStyle: p.get('themeAnimationStyle').build(), ); } diff --git a/mate_flutter/lib/src/material/card.dart b/mate_flutter/lib/src/material/card.dart index 52c2e7b2..f3ae8257 100644 --- a/mate_flutter/lib/src/material/card.dart +++ b/mate_flutter/lib/src/material/card.dart @@ -122,6 +122,228 @@ class Card$Mate extends _i1.Card with _i2.Mate { ); } + /// Card Card.filled({Key? key, Color? color, Color? shadowColor, Color? surfaceTintColor, double? elevation, ShapeBorder? shape, bool borderOnForeground = true, EdgeInsetsGeometry? margin, Clip? clipBehavior, Widget? child, bool semanticContainer = true}) + Card$Mate.filled({ + /// optionalParameters: {Key? key} , default:none + super.key, + + /// optionalParameters: {Color? color} , default:none + super.color, + + /// optionalParameters: {Color? shadowColor} , default:none + super.shadowColor, + + /// optionalParameters: {Color? surfaceTintColor} , default:none + super.surfaceTintColor, + + /// optionalParameters: {double? elevation} , default:none + super.elevation, + + /// optionalParameters: {ShapeBorder? shape} , default:none + super.shape, + + /// optionalParameters: {bool borderOnForeground = true} , default:processed=BooleanLiteralImpl + super.borderOnForeground, + + /// optionalParameters: {EdgeInsetsGeometry? margin} , default:none + super.margin, + + /// optionalParameters: {Clip? clipBehavior} , default:none + super.clipBehavior, + + /// optionalParameters: {Widget? child} , default:none + super.child, + + /// optionalParameters: {bool semanticContainer = true} , default:processed=BooleanLiteralImpl + super.semanticContainer, + }) : mateParams = { + 'key': _i2.BuilderArg<_i3.Key?>( + name: 'key', + init: key, + isNamed: true, + ), + 'color': _i2.BuilderArg<_i4.Color?>( + name: 'color', + init: color, + isNamed: true, + ), + 'shadowColor': _i2.BuilderArg<_i4.Color?>( + name: 'shadowColor', + init: shadowColor, + isNamed: true, + ), + 'surfaceTintColor': _i2.BuilderArg<_i4.Color?>( + name: 'surfaceTintColor', + init: surfaceTintColor, + isNamed: true, + ), + 'elevation': _i2.BuilderArg( + name: 'elevation', + init: elevation, + isNamed: true, + ), + 'shape': _i2.BuilderArg<_i5.ShapeBorder?>( + name: 'shape', + init: shape, + isNamed: true, + ), + 'borderOnForeground': _i2.BuilderArg( + name: 'borderOnForeground', + init: borderOnForeground, + isNamed: true, + defaultValue: true, + ), + 'margin': _i2.BuilderArg<_i6.EdgeInsetsGeometry?>( + name: 'margin', + init: margin, + isNamed: true, + ), + 'clipBehavior': _i2.BuilderArg<_i4.Clip?>( + name: 'clipBehavior', + init: clipBehavior, + isNamed: true, + ), + 'child': _i2.BuilderArg<_i7.Widget?>( + name: 'child', + init: child, + isNamed: true, + ), + 'semanticContainer': _i2.BuilderArg( + name: 'semanticContainer', + init: semanticContainer, + isNamed: true, + defaultValue: true, + ), + }, + super.filled() { + mateBuilderName = 'Card.filled'; + matePackageUrl = 'package:flutter/material.dart'; + mateBuilder = (p) => Card$Mate.filled( + key: p.get('key').build(), + color: p.get('color').build(), + shadowColor: p.get('shadowColor').build(), + surfaceTintColor: p.get('surfaceTintColor').build(), + elevation: p.get('elevation').build(), + shape: p.get('shape').build(), + borderOnForeground: p.get('borderOnForeground').build(), + margin: p.get('margin').build(), + clipBehavior: p.get('clipBehavior').build(), + child: p.get('child').build(), + semanticContainer: p.get('semanticContainer').build(), + ); + } + + /// Card Card.outlined({Key? key, Color? color, Color? shadowColor, Color? surfaceTintColor, double? elevation, ShapeBorder? shape, bool borderOnForeground = true, EdgeInsetsGeometry? margin, Clip? clipBehavior, Widget? child, bool semanticContainer = true}) + Card$Mate.outlined({ + /// optionalParameters: {Key? key} , default:none + super.key, + + /// optionalParameters: {Color? color} , default:none + super.color, + + /// optionalParameters: {Color? shadowColor} , default:none + super.shadowColor, + + /// optionalParameters: {Color? surfaceTintColor} , default:none + super.surfaceTintColor, + + /// optionalParameters: {double? elevation} , default:none + super.elevation, + + /// optionalParameters: {ShapeBorder? shape} , default:none + super.shape, + + /// optionalParameters: {bool borderOnForeground = true} , default:processed=BooleanLiteralImpl + super.borderOnForeground, + + /// optionalParameters: {EdgeInsetsGeometry? margin} , default:none + super.margin, + + /// optionalParameters: {Clip? clipBehavior} , default:none + super.clipBehavior, + + /// optionalParameters: {Widget? child} , default:none + super.child, + + /// optionalParameters: {bool semanticContainer = true} , default:processed=BooleanLiteralImpl + super.semanticContainer, + }) : mateParams = { + 'key': _i2.BuilderArg<_i3.Key?>( + name: 'key', + init: key, + isNamed: true, + ), + 'color': _i2.BuilderArg<_i4.Color?>( + name: 'color', + init: color, + isNamed: true, + ), + 'shadowColor': _i2.BuilderArg<_i4.Color?>( + name: 'shadowColor', + init: shadowColor, + isNamed: true, + ), + 'surfaceTintColor': _i2.BuilderArg<_i4.Color?>( + name: 'surfaceTintColor', + init: surfaceTintColor, + isNamed: true, + ), + 'elevation': _i2.BuilderArg( + name: 'elevation', + init: elevation, + isNamed: true, + ), + 'shape': _i2.BuilderArg<_i5.ShapeBorder?>( + name: 'shape', + init: shape, + isNamed: true, + ), + 'borderOnForeground': _i2.BuilderArg( + name: 'borderOnForeground', + init: borderOnForeground, + isNamed: true, + defaultValue: true, + ), + 'margin': _i2.BuilderArg<_i6.EdgeInsetsGeometry?>( + name: 'margin', + init: margin, + isNamed: true, + ), + 'clipBehavior': _i2.BuilderArg<_i4.Clip?>( + name: 'clipBehavior', + init: clipBehavior, + isNamed: true, + ), + 'child': _i2.BuilderArg<_i7.Widget?>( + name: 'child', + init: child, + isNamed: true, + ), + 'semanticContainer': _i2.BuilderArg( + name: 'semanticContainer', + init: semanticContainer, + isNamed: true, + defaultValue: true, + ), + }, + super.outlined() { + mateBuilderName = 'Card.outlined'; + matePackageUrl = 'package:flutter/material.dart'; + mateBuilder = (p) => Card$Mate.outlined( + key: p.get('key').build(), + color: p.get('color').build(), + shadowColor: p.get('shadowColor').build(), + surfaceTintColor: p.get('surfaceTintColor').build(), + elevation: p.get('elevation').build(), + shape: p.get('shape').build(), + borderOnForeground: p.get('borderOnForeground').build(), + margin: p.get('margin').build(), + clipBehavior: p.get('clipBehavior').build(), + child: p.get('child').build(), + semanticContainer: p.get('semanticContainer').build(), + ); + } + @override final Map mateParams; } diff --git a/mate_flutter/lib/src/material/dropdown_menu.dart b/mate_flutter/lib/src/material/dropdown_menu.dart index 6d943d16..cd8483b6 100644 --- a/mate_flutter/lib/src/material/dropdown_menu.dart +++ b/mate_flutter/lib/src/material/dropdown_menu.dart @@ -95,7 +95,7 @@ class DropdownMenuEntry$Mate extends _i1.DropdownMenuEntry with _i2.Mate { /// class DropdownMenu extends StatefulWidget class DropdownMenu$Mate extends _i1.DropdownMenu with _i2.Mate { - /// DropdownMenu DropdownMenu({Key? key, bool enabled = true, double? width, double? menuHeight, Widget? leadingIcon, Widget? trailingIcon, Widget? label, String? hintText, String? helperText, String? errorText, Widget? selectedTrailingIcon, bool enableFilter = false, bool enableSearch = true, TextStyle? textStyle, InputDecorationTheme? inputDecorationTheme, MenuStyle? menuStyle, TextEditingController? controller, T? initialSelection, void Function(T?)? onSelected, bool? requestFocusOnTap, EdgeInsets? expandedInsets, required List> dropdownMenuEntries}) + /// DropdownMenu DropdownMenu({Key? key, bool enabled = true, double? width, double? menuHeight, Widget? leadingIcon, Widget? trailingIcon, Widget? label, String? hintText, String? helperText, String? errorText, Widget? selectedTrailingIcon, bool enableFilter = false, bool enableSearch = true, TextStyle? textStyle, InputDecorationTheme? inputDecorationTheme, MenuStyle? menuStyle, TextEditingController? controller, T? initialSelection, void Function(T?)? onSelected, bool? requestFocusOnTap, EdgeInsets? expandedInsets, int? Function(List>, String)? searchCallback, required List> dropdownMenuEntries}) DropdownMenu$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -160,6 +160,9 @@ class DropdownMenu$Mate extends _i1.DropdownMenu with _i2.Mate { /// optionalParameters: {EdgeInsets? expandedInsets} , default:none super.expandedInsets, + /// optionalParameters: {int? Function(List>, String)? searchCallback} , default:none + super.searchCallback, + /// optionalParameters: {required List> dropdownMenuEntries} , default:none required super.dropdownMenuEntries, }) : mateParams = { @@ -271,6 +274,11 @@ class DropdownMenu$Mate extends _i1.DropdownMenu with _i2.Mate { init: expandedInsets, isNamed: true, ), + 'searchCallback': _i2.BuilderArg<_i1.SearchCallback?>( + name: 'searchCallback', + init: searchCallback, + isNamed: true, + ), 'dropdownMenuEntries': _i2.BuilderArg>>( name: 'dropdownMenuEntries', init: dropdownMenuEntries, @@ -302,6 +310,7 @@ class DropdownMenu$Mate extends _i1.DropdownMenu with _i2.Mate { onSelected: p.get('onSelected').build(), requestFocusOnTap: p.get('requestFocusOnTap').build(), expandedInsets: p.get('expandedInsets').build(), + searchCallback: p.get('searchCallback').build(), dropdownMenuEntries: p.get('dropdownMenuEntries').build(), ); } diff --git a/mate_flutter/lib/src/material/expansion_tile.dart b/mate_flutter/lib/src/material/expansion_tile.dart index a7dda4af..6c3ad3b3 100644 --- a/mate_flutter/lib/src/material/expansion_tile.dart +++ b/mate_flutter/lib/src/material/expansion_tile.dart @@ -12,10 +12,12 @@ import 'package:flutter/src/painting/alignment.dart' as _i8; import 'dart:ui' as _i9; import 'package:flutter/src/painting/borders.dart' as _i10; import 'package:flutter/src/material/list_tile.dart' as _i11; +import 'package:flutter/src/material/theme_data.dart' as _i12; +import 'package:flutter/src/animation/animation_style.dart' as _i13; /// class ExpansionTile extends StatefulWidget class ExpansionTile$Mate extends _i1.ExpansionTile with _i2.Mate { - /// ExpansionTile ExpansionTile({Key? key, Widget? leading, required Widget title, Widget? subtitle, void Function(bool)? onExpansionChanged, List children = const [], Widget? trailing, bool initiallyExpanded = false, bool maintainState = false, EdgeInsetsGeometry? tilePadding, CrossAxisAlignment? expandedCrossAxisAlignment, Alignment? expandedAlignment, EdgeInsetsGeometry? childrenPadding, Color? backgroundColor, Color? collapsedBackgroundColor, Color? textColor, Color? collapsedTextColor, Color? iconColor, Color? collapsedIconColor, ShapeBorder? shape, ShapeBorder? collapsedShape, Clip? clipBehavior, ListTileControlAffinity? controlAffinity, ExpansionTileController? controller}) + /// ExpansionTile ExpansionTile({Key? key, Widget? leading, required Widget title, Widget? subtitle, void Function(bool)? onExpansionChanged, List children = const [], Widget? trailing, bool initiallyExpanded = false, bool maintainState = false, EdgeInsetsGeometry? tilePadding, CrossAxisAlignment? expandedCrossAxisAlignment, Alignment? expandedAlignment, EdgeInsetsGeometry? childrenPadding, Color? backgroundColor, Color? collapsedBackgroundColor, Color? textColor, Color? collapsedTextColor, Color? iconColor, Color? collapsedIconColor, ShapeBorder? shape, ShapeBorder? collapsedShape, Clip? clipBehavior, ListTileControlAffinity? controlAffinity, ExpansionTileController? controller, bool? dense, VisualDensity? visualDensity, bool? enableFeedback = true, bool enabled = true, AnimationStyle? expansionAnimationStyle}) ExpansionTile$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -88,6 +90,21 @@ class ExpansionTile$Mate extends _i1.ExpansionTile with _i2.Mate { /// optionalParameters: {ExpansionTileController? controller} , default:none super.controller, + + /// optionalParameters: {bool? dense} , default:none + super.dense, + + /// optionalParameters: {VisualDensity? visualDensity} , default:none + super.visualDensity, + + /// optionalParameters: {bool? enableFeedback = true} , default:processed=BooleanLiteralImpl + super.enableFeedback, + + /// optionalParameters: {bool enabled = true} , default:processed=BooleanLiteralImpl + super.enabled, + + /// optionalParameters: {AnimationStyle? expansionAnimationStyle} , default:none + super.expansionAnimationStyle, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -211,6 +228,33 @@ class ExpansionTile$Mate extends _i1.ExpansionTile with _i2.Mate { init: controller, isNamed: true, ), + 'dense': _i2.BuilderArg( + name: 'dense', + init: dense, + isNamed: true, + ), + 'visualDensity': _i2.BuilderArg<_i12.VisualDensity?>( + name: 'visualDensity', + init: visualDensity, + isNamed: true, + ), + 'enableFeedback': _i2.BuilderArg( + name: 'enableFeedback', + init: enableFeedback, + isNamed: true, + defaultValue: true, + ), + 'enabled': _i2.BuilderArg( + name: 'enabled', + init: enabled, + isNamed: true, + defaultValue: true, + ), + 'expansionAnimationStyle': _i2.BuilderArg<_i13.AnimationStyle?>( + name: 'expansionAnimationStyle', + init: expansionAnimationStyle, + isNamed: true, + ), }, super() { mateBuilderName = 'ExpansionTile'; @@ -240,6 +284,11 @@ class ExpansionTile$Mate extends _i1.ExpansionTile with _i2.Mate { clipBehavior: p.get('clipBehavior').build(), controlAffinity: p.get('controlAffinity').build(), controller: p.get('controller').build(), + dense: p.get('dense').build(), + visualDensity: p.get('visualDensity').build(), + enableFeedback: p.get('enableFeedback').build(), + enabled: p.get('enabled').build(), + expansionAnimationStyle: p.get('expansionAnimationStyle').build(), ); } diff --git a/mate_flutter/lib/src/material/expansion_tile_theme.dart b/mate_flutter/lib/src/material/expansion_tile_theme.dart index 594eb20d..76850cbf 100644 --- a/mate_flutter/lib/src/material/expansion_tile_theme.dart +++ b/mate_flutter/lib/src/material/expansion_tile_theme.dart @@ -7,12 +7,13 @@ import 'dart:ui' as _i3; import 'package:flutter/src/painting/edge_insets.dart' as _i4; import 'package:flutter/src/painting/alignment.dart' as _i5; import 'package:flutter/src/painting/borders.dart' as _i6; -import 'package:flutter/src/foundation/key.dart' as _i7; -import 'package:flutter/src/widgets/framework.dart' as _i8; +import 'package:flutter/src/animation/animation_style.dart' as _i7; +import 'package:flutter/src/foundation/key.dart' as _i8; +import 'package:flutter/src/widgets/framework.dart' as _i9; /// class ExpansionTileThemeData with Diagnosticable class ExpansionTileThemeData$Mate extends _i1.ExpansionTileThemeData with _i2.Mate { - /// ExpansionTileThemeData ExpansionTileThemeData({Color? backgroundColor, Color? collapsedBackgroundColor, EdgeInsetsGeometry? tilePadding, AlignmentGeometry? expandedAlignment, EdgeInsetsGeometry? childrenPadding, Color? iconColor, Color? collapsedIconColor, Color? textColor, Color? collapsedTextColor, ShapeBorder? shape, ShapeBorder? collapsedShape, Clip? clipBehavior}) + /// ExpansionTileThemeData ExpansionTileThemeData({Color? backgroundColor, Color? collapsedBackgroundColor, EdgeInsetsGeometry? tilePadding, AlignmentGeometry? expandedAlignment, EdgeInsetsGeometry? childrenPadding, Color? iconColor, Color? collapsedIconColor, Color? textColor, Color? collapsedTextColor, ShapeBorder? shape, ShapeBorder? collapsedShape, Clip? clipBehavior, AnimationStyle? expansionAnimationStyle}) ExpansionTileThemeData$Mate({ /// optionalParameters: {Color? backgroundColor} , default:none super.backgroundColor, @@ -49,6 +50,9 @@ class ExpansionTileThemeData$Mate extends _i1.ExpansionTileThemeData with _i2.Ma /// optionalParameters: {Clip? clipBehavior} , default:none super.clipBehavior, + + /// optionalParameters: {AnimationStyle? expansionAnimationStyle} , default:none + super.expansionAnimationStyle, }) : mateParams = { 'backgroundColor': _i2.BuilderArg<_i3.Color?>( name: 'backgroundColor', @@ -110,6 +114,11 @@ class ExpansionTileThemeData$Mate extends _i1.ExpansionTileThemeData with _i2.Ma init: clipBehavior, isNamed: true, ), + 'expansionAnimationStyle': _i2.BuilderArg<_i7.AnimationStyle?>( + name: 'expansionAnimationStyle', + init: expansionAnimationStyle, + isNamed: true, + ), }, super() { mateBuilderName = 'ExpansionTileThemeData'; @@ -127,6 +136,7 @@ class ExpansionTileThemeData$Mate extends _i1.ExpansionTileThemeData with _i2.Ma shape: p.get('shape').build(), collapsedShape: p.get('collapsedShape').build(), clipBehavior: p.get('clipBehavior').build(), + expansionAnimationStyle: p.get('expansionAnimationStyle').build(), ); } @@ -147,7 +157,7 @@ class ExpansionTileTheme$Mate extends _i1.ExpansionTileTheme with _i2.Mate { /// optionalParameters: {required Widget child} , default:none required super.child, }) : mateParams = { - 'key': _i2.BuilderArg<_i7.Key?>( + 'key': _i2.BuilderArg<_i8.Key?>( name: 'key', init: key, isNamed: true, @@ -157,7 +167,7 @@ class ExpansionTileTheme$Mate extends _i1.ExpansionTileTheme with _i2.Mate { init: data, isNamed: true, ), - 'child': _i2.BuilderArg<_i8.Widget>( + 'child': _i2.BuilderArg<_i9.Widget>( name: 'child', init: child, isNamed: true, diff --git a/mate_flutter/lib/src/material/filter_chip.dart b/mate_flutter/lib/src/material/filter_chip.dart index 82b0de9d..db3f024b 100644 --- a/mate_flutter/lib/src/material/filter_chip.dart +++ b/mate_flutter/lib/src/material/filter_chip.dart @@ -15,9 +15,9 @@ import 'package:flutter/src/material/material_state.dart' as _i11; import 'package:flutter/src/material/theme_data.dart' as _i12; import 'package:flutter/src/widgets/icon_theme_data.dart' as _i13; -/// class FilterChip extends StatelessWidget implements ChipAttributes, SelectableChipAttributes, CheckmarkableChipAttributes, DisabledChipAttributes +/// class FilterChip extends StatelessWidget implements ChipAttributes, DeletableChipAttributes, SelectableChipAttributes, CheckmarkableChipAttributes, DisabledChipAttributes class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { - /// FilterChip FilterChip({Key? key, Widget? avatar, required Widget label, TextStyle? labelStyle, EdgeInsetsGeometry? labelPadding, bool selected = false, required void Function(bool)? onSelected, double? pressElevation, Color? disabledColor, Color? selectedColor, String? tooltip, BorderSide? side, OutlinedBorder? shape, Clip clipBehavior = Clip.none, FocusNode? focusNode, bool autofocus = false, MaterialStateProperty? color, Color? backgroundColor, EdgeInsetsGeometry? padding, VisualDensity? visualDensity, MaterialTapTargetSize? materialTapTargetSize, double? elevation, Color? shadowColor, Color? surfaceTintColor, IconThemeData? iconTheme, Color? selectedShadowColor, bool? showCheckmark, Color? checkmarkColor, ShapeBorder avatarBorder = const CircleBorder()}) + /// FilterChip FilterChip({Key? key, Widget? avatar, required Widget label, TextStyle? labelStyle, EdgeInsetsGeometry? labelPadding, bool selected = false, required void Function(bool)? onSelected, Widget? deleteIcon, void Function()? onDeleted, Color? deleteIconColor, String? deleteButtonTooltipMessage, double? pressElevation, Color? disabledColor, Color? selectedColor, String? tooltip, BorderSide? side, OutlinedBorder? shape, Clip clipBehavior = Clip.none, FocusNode? focusNode, bool autofocus = false, MaterialStateProperty? color, Color? backgroundColor, EdgeInsetsGeometry? padding, VisualDensity? visualDensity, MaterialTapTargetSize? materialTapTargetSize, double? elevation, Color? shadowColor, Color? surfaceTintColor, IconThemeData? iconTheme, Color? selectedShadowColor, bool? showCheckmark, Color? checkmarkColor, ShapeBorder avatarBorder = const CircleBorder()}) FilterChip$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -40,6 +40,18 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { /// optionalParameters: {required void Function(bool)? onSelected} , default:none required super.onSelected, + /// optionalParameters: {Widget? deleteIcon} , default:none + super.deleteIcon, + + /// optionalParameters: {void Function()? onDeleted} , default:none + super.onDeleted, + + /// optionalParameters: {Color? deleteIconColor} , default:none + super.deleteIconColor, + + /// optionalParameters: {String? deleteButtonTooltipMessage} , default:none + super.deleteButtonTooltipMessage, + /// optionalParameters: {double? pressElevation} , default:none super.pressElevation, @@ -142,6 +154,26 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { init: onSelected, isNamed: true, ), + 'deleteIcon': _i2.BuilderArg<_i4.Widget?>( + name: 'deleteIcon', + init: deleteIcon, + isNamed: true, + ), + 'onDeleted': _i2.BuilderArg<_i8.VoidCallback?>( + name: 'onDeleted', + init: onDeleted, + isNamed: true, + ), + 'deleteIconColor': _i2.BuilderArg<_i8.Color?>( + name: 'deleteIconColor', + init: deleteIconColor, + isNamed: true, + ), + 'deleteButtonTooltipMessage': _i2.BuilderArg( + name: 'deleteButtonTooltipMessage', + init: deleteButtonTooltipMessage, + isNamed: true, + ), 'pressElevation': _i2.BuilderArg( name: 'pressElevation', init: pressElevation, @@ -266,6 +298,10 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { labelPadding: p.get('labelPadding').build(), selected: p.get('selected').build(), onSelected: p.get('onSelected').build(), + deleteIcon: p.get('deleteIcon').build(), + onDeleted: p.get('onDeleted').build(), + deleteIconColor: p.get('deleteIconColor').build(), + deleteButtonTooltipMessage: p.get('deleteButtonTooltipMessage').build(), pressElevation: p.get('pressElevation').build(), disabledColor: p.get('disabledColor').build(), selectedColor: p.get('selectedColor').build(), @@ -291,7 +327,7 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { ); } - /// FilterChip FilterChip.elevated({Key? key, Widget? avatar, required Widget label, TextStyle? labelStyle, EdgeInsetsGeometry? labelPadding, bool selected = false, required void Function(bool)? onSelected, double? pressElevation, Color? disabledColor, Color? selectedColor, String? tooltip, BorderSide? side, OutlinedBorder? shape, Clip clipBehavior = Clip.none, FocusNode? focusNode, bool autofocus = false, MaterialStateProperty? color, Color? backgroundColor, EdgeInsetsGeometry? padding, VisualDensity? visualDensity, MaterialTapTargetSize? materialTapTargetSize, double? elevation, Color? shadowColor, Color? surfaceTintColor, IconThemeData? iconTheme, Color? selectedShadowColor, bool? showCheckmark, Color? checkmarkColor, ShapeBorder avatarBorder = const CircleBorder()}) + /// FilterChip FilterChip.elevated({Key? key, Widget? avatar, required Widget label, TextStyle? labelStyle, EdgeInsetsGeometry? labelPadding, bool selected = false, required void Function(bool)? onSelected, Widget? deleteIcon, void Function()? onDeleted, Color? deleteIconColor, String? deleteButtonTooltipMessage, double? pressElevation, Color? disabledColor, Color? selectedColor, String? tooltip, BorderSide? side, OutlinedBorder? shape, Clip clipBehavior = Clip.none, FocusNode? focusNode, bool autofocus = false, MaterialStateProperty? color, Color? backgroundColor, EdgeInsetsGeometry? padding, VisualDensity? visualDensity, MaterialTapTargetSize? materialTapTargetSize, double? elevation, Color? shadowColor, Color? surfaceTintColor, IconThemeData? iconTheme, Color? selectedShadowColor, bool? showCheckmark, Color? checkmarkColor, ShapeBorder avatarBorder = const CircleBorder()}) FilterChip$Mate.elevated({ /// optionalParameters: {Key? key} , default:none super.key, @@ -314,6 +350,18 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { /// optionalParameters: {required void Function(bool)? onSelected} , default:none required super.onSelected, + /// optionalParameters: {Widget? deleteIcon} , default:none + super.deleteIcon, + + /// optionalParameters: {void Function()? onDeleted} , default:none + super.onDeleted, + + /// optionalParameters: {Color? deleteIconColor} , default:none + super.deleteIconColor, + + /// optionalParameters: {String? deleteButtonTooltipMessage} , default:none + super.deleteButtonTooltipMessage, + /// optionalParameters: {double? pressElevation} , default:none super.pressElevation, @@ -416,6 +464,26 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { init: onSelected, isNamed: true, ), + 'deleteIcon': _i2.BuilderArg<_i4.Widget?>( + name: 'deleteIcon', + init: deleteIcon, + isNamed: true, + ), + 'onDeleted': _i2.BuilderArg<_i8.VoidCallback?>( + name: 'onDeleted', + init: onDeleted, + isNamed: true, + ), + 'deleteIconColor': _i2.BuilderArg<_i8.Color?>( + name: 'deleteIconColor', + init: deleteIconColor, + isNamed: true, + ), + 'deleteButtonTooltipMessage': _i2.BuilderArg( + name: 'deleteButtonTooltipMessage', + init: deleteButtonTooltipMessage, + isNamed: true, + ), 'pressElevation': _i2.BuilderArg( name: 'pressElevation', init: pressElevation, @@ -540,6 +608,10 @@ class FilterChip$Mate extends _i1.FilterChip with _i2.Mate { labelPadding: p.get('labelPadding').build(), selected: p.get('selected').build(), onSelected: p.get('onSelected').build(), + deleteIcon: p.get('deleteIcon').build(), + onDeleted: p.get('onDeleted').build(), + deleteIconColor: p.get('deleteIconColor').build(), + deleteButtonTooltipMessage: p.get('deleteButtonTooltipMessage').build(), pressElevation: p.get('pressElevation').build(), disabledColor: p.get('disabledColor').build(), selectedColor: p.get('selectedColor').build(), diff --git a/mate_flutter/lib/src/material/input_date_picker_form_field.dart b/mate_flutter/lib/src/material/input_date_picker_form_field.dart index 9bac4d2b..d084cfe4 100644 --- a/mate_flutter/lib/src/material/input_date_picker_form_field.dart +++ b/mate_flutter/lib/src/material/input_date_picker_form_field.dart @@ -7,10 +7,11 @@ import 'package:flutter/src/foundation/key.dart' as _i3; import 'package:flutter/src/foundation/basic_types.dart' as _i4; import 'package:flutter/src/material/date.dart' as _i5; import 'package:flutter/src/services/text_input.dart' as _i6; +import 'package:flutter/src/widgets/focus_manager.dart' as _i7; /// class InputDatePickerFormField extends StatefulWidget class InputDatePickerFormField$Mate extends _i1.InputDatePickerFormField with _i2.Mate { - /// InputDatePickerFormField InputDatePickerFormField({Key? key, DateTime? initialDate, required DateTime firstDate, required DateTime lastDate, void Function(DateTime)? onDateSubmitted, void Function(DateTime)? onDateSaved, bool Function(DateTime)? selectableDayPredicate, String? errorFormatText, String? errorInvalidText, String? fieldHintText, String? fieldLabelText, TextInputType? keyboardType, bool autofocus = false, bool acceptEmptyDate = false}) + /// InputDatePickerFormField InputDatePickerFormField({Key? key, DateTime? initialDate, required DateTime firstDate, required DateTime lastDate, void Function(DateTime)? onDateSubmitted, void Function(DateTime)? onDateSaved, bool Function(DateTime)? selectableDayPredicate, String? errorFormatText, String? errorInvalidText, String? fieldHintText, String? fieldLabelText, TextInputType? keyboardType, bool autofocus = false, bool acceptEmptyDate = false, FocusNode? focusNode}) InputDatePickerFormField$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -53,6 +54,9 @@ class InputDatePickerFormField$Mate extends _i1.InputDatePickerFormField with _i /// optionalParameters: {bool acceptEmptyDate = false} , default:processed=BooleanLiteralImpl super.acceptEmptyDate, + + /// optionalParameters: {FocusNode? focusNode} , default:none + super.focusNode, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -126,6 +130,11 @@ class InputDatePickerFormField$Mate extends _i1.InputDatePickerFormField with _i isNamed: true, defaultValue: false, ), + 'focusNode': _i2.BuilderArg<_i7.FocusNode?>( + name: 'focusNode', + init: focusNode, + isNamed: true, + ), }, super() { mateBuilderName = 'InputDatePickerFormField'; @@ -145,6 +154,7 @@ class InputDatePickerFormField$Mate extends _i1.InputDatePickerFormField with _i keyboardType: p.get('keyboardType').build(), autofocus: p.get('autofocus').build(), acceptEmptyDate: p.get('acceptEmptyDate').build(), + focusNode: p.get('focusNode').build(), ); } diff --git a/mate_flutter/lib/src/material/menu_anchor.dart b/mate_flutter/lib/src/material/menu_anchor.dart index 9a46689e..07d47702 100644 --- a/mate_flutter/lib/src/material/menu_anchor.dart +++ b/mate_flutter/lib/src/material/menu_anchor.dart @@ -16,7 +16,7 @@ import 'package:flutter/src/material/material_state.dart' as _i12; /// class MenuAnchor extends StatefulWidget class MenuAnchor$Mate extends _i1.MenuAnchor with _i2.Mate { - /// MenuAnchor MenuAnchor({Key? key, MenuController? controller, FocusNode? childFocusNode, MenuStyle? style, Offset? alignmentOffset = Offset.zero, Clip clipBehavior = Clip.hardEdge, bool anchorTapClosesMenu = false, void Function()? onOpen, void Function()? onClose, bool crossAxisUnconstrained = true, required List menuChildren, Widget Function(BuildContext, MenuController, Widget?)? builder, Widget? child}) + /// MenuAnchor MenuAnchor({Key? key, MenuController? controller, FocusNode? childFocusNode, MenuStyle? style, Offset? alignmentOffset = Offset.zero, Clip clipBehavior = Clip.hardEdge, bool anchorTapClosesMenu = false, bool consumeOutsideTap = false, void Function()? onOpen, void Function()? onClose, bool crossAxisUnconstrained = true, required List menuChildren, Widget Function(BuildContext, MenuController, Widget?)? builder, Widget? child}) MenuAnchor$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -36,8 +36,8 @@ class MenuAnchor$Mate extends _i1.MenuAnchor with _i2.Mate { /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl super.clipBehavior, - /// optionalParameters: {bool anchorTapClosesMenu = false} , default:processed=BooleanLiteralImpl - super.anchorTapClosesMenu, + /// optionalParameters: {bool consumeOutsideTap = false} , default:processed=BooleanLiteralImpl + super.consumeOutsideTap, /// optionalParameters: {void Function()? onOpen} , default:none super.onOpen, @@ -89,9 +89,9 @@ class MenuAnchor$Mate extends _i1.MenuAnchor with _i2.Mate { isNamed: true, defaultValue: _i6.Clip.hardEdge, ), - 'anchorTapClosesMenu': _i2.BuilderArg( - name: 'anchorTapClosesMenu', - init: anchorTapClosesMenu, + 'consumeOutsideTap': _i2.BuilderArg( + name: 'consumeOutsideTap', + init: consumeOutsideTap, isNamed: true, defaultValue: false, ), @@ -137,7 +137,7 @@ class MenuAnchor$Mate extends _i1.MenuAnchor with _i2.Mate { style: p.get('style').build(), alignmentOffset: p.get('alignmentOffset').build(), clipBehavior: p.get('clipBehavior').build(), - anchorTapClosesMenu: p.get('anchorTapClosesMenu').build(), + consumeOutsideTap: p.get('consumeOutsideTap').build(), onOpen: p.get('onOpen').build(), onClose: p.get('onClose').build(), crossAxisUnconstrained: p.get('crossAxisUnconstrained').build(), diff --git a/mate_flutter/lib/src/material/paginated_data_table.dart b/mate_flutter/lib/src/material/paginated_data_table.dart index c9b6e5e4..4a1f1f1c 100644 --- a/mate_flutter/lib/src/material/paginated_data_table.dart +++ b/mate_flutter/lib/src/material/paginated_data_table.dart @@ -16,7 +16,7 @@ import 'package:flutter/src/material/material_state.dart' as _i12; /// class PaginatedDataTable extends StatefulWidget class PaginatedDataTable$Mate extends _i1.PaginatedDataTable with _i2.Mate { - /// PaginatedDataTable PaginatedDataTable({Key? key, Widget? header, List? actions, required List columns, int? sortColumnIndex, bool sortAscending = true, void Function(bool?)? onSelectAll, double? dataRowHeight, double? dataRowMinHeight, double? dataRowMaxHeight, double headingRowHeight = 56.0, double horizontalMargin = 24.0, double columnSpacing = 56.0, bool showCheckboxColumn = true, bool showFirstLastButtons = false, int? initialFirstRowIndex = 0, void Function(int)? onPageChanged, int rowsPerPage = defaultRowsPerPage, List availableRowsPerPage = const [defaultRowsPerPage, defaultRowsPerPage * 2, defaultRowsPerPage * 5, defaultRowsPerPage * 10], void Function(int?)? onRowsPerPageChanged, DragStartBehavior dragStartBehavior = DragStartBehavior.start, Color? arrowHeadColor, required DataTableSource source, double? checkboxHorizontalMargin, ScrollController? controller, bool? primary, MaterialStateProperty? headingRowColor}) + /// PaginatedDataTable PaginatedDataTable({Key? key, Widget? header, List? actions, required List columns, int? sortColumnIndex, bool sortAscending = true, void Function(bool?)? onSelectAll, double? dataRowHeight, double? dataRowMinHeight, double? dataRowMaxHeight, double headingRowHeight = 56.0, double horizontalMargin = 24.0, double columnSpacing = 56.0, bool showCheckboxColumn = true, bool showFirstLastButtons = false, int? initialFirstRowIndex = 0, void Function(int)? onPageChanged, int rowsPerPage = defaultRowsPerPage, List availableRowsPerPage = const [defaultRowsPerPage, defaultRowsPerPage * 2, defaultRowsPerPage * 5, defaultRowsPerPage * 10], void Function(int?)? onRowsPerPageChanged, DragStartBehavior dragStartBehavior = DragStartBehavior.start, Color? arrowHeadColor, required DataTableSource source, double? checkboxHorizontalMargin, ScrollController? controller, bool? primary, MaterialStateProperty? headingRowColor, bool showEmptyRows = true}) PaginatedDataTable$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -95,6 +95,9 @@ class PaginatedDataTable$Mate extends _i1.PaginatedDataTable with _i2.Mate { /// optionalParameters: {MaterialStateProperty? headingRowColor} , default:none super.headingRowColor, + + /// optionalParameters: {bool showEmptyRows = true} , default:processed=BooleanLiteralImpl + super.showEmptyRows, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -234,6 +237,12 @@ class PaginatedDataTable$Mate extends _i1.PaginatedDataTable with _i2.Mate { init: headingRowColor, isNamed: true, ), + 'showEmptyRows': _i2.BuilderArg( + name: 'showEmptyRows', + init: showEmptyRows, + isNamed: true, + defaultValue: true, + ), }, super() { mateBuilderName = 'PaginatedDataTable'; @@ -265,6 +274,7 @@ class PaginatedDataTable$Mate extends _i1.PaginatedDataTable with _i2.Mate { controller: p.get('controller').build(), primary: p.get('primary').build(), headingRowColor: p.get('headingRowColor').build(), + showEmptyRows: p.get('showEmptyRows').build(), ); } diff --git a/mate_flutter/lib/src/material/popup_menu.dart b/mate_flutter/lib/src/material/popup_menu.dart index 0c80c9e8..e6284fb9 100644 --- a/mate_flutter/lib/src/material/popup_menu.dart +++ b/mate_flutter/lib/src/material/popup_menu.dart @@ -14,6 +14,7 @@ import 'package:flutter/animation.dart' as _i10; import 'package:flutter/src/painting/borders.dart' as _i11; import 'package:flutter/src/rendering/box.dart' as _i12; import 'package:flutter/src/material/popup_menu_theme.dart' as _i13; +import 'package:flutter/src/animation/animation_style.dart' as _i14; /// class PopupMenuDivider extends PopupMenuEntry class PopupMenuDivider$Mate extends _i1.PopupMenuDivider with _i2.Mate { @@ -266,7 +267,7 @@ class CheckedPopupMenuItem$Mate extends _i1.CheckedPopupMenuItem with _i2. /// class PopupMenuButton extends StatefulWidget class PopupMenuButton$Mate extends _i1.PopupMenuButton with _i2.Mate { - /// PopupMenuButton PopupMenuButton({Key? key, required List> Function(BuildContext) itemBuilder, T? initialValue, void Function()? onOpened, void Function(T)? onSelected, void Function()? onCanceled, String? tooltip, double? elevation, Color? shadowColor, Color? surfaceTintColor, EdgeInsetsGeometry padding = const EdgeInsets.all(8.0), Widget? child, double? splashRadius, Widget? icon, double? iconSize, Offset offset = Offset.zero, bool enabled = true, ShapeBorder? shape, Color? color, Color? iconColor, bool? enableFeedback, BoxConstraints? constraints, PopupMenuPosition? position, Clip clipBehavior = Clip.none}) + /// PopupMenuButton PopupMenuButton({Key? key, required List> Function(BuildContext) itemBuilder, T? initialValue, void Function()? onOpened, void Function(T)? onSelected, void Function()? onCanceled, String? tooltip, double? elevation, Color? shadowColor, Color? surfaceTintColor, EdgeInsetsGeometry padding = const EdgeInsets.all(8.0), Widget? child, double? splashRadius, Widget? icon, double? iconSize, Offset offset = Offset.zero, bool enabled = true, ShapeBorder? shape, Color? color, Color? iconColor, bool? enableFeedback, BoxConstraints? constraints, PopupMenuPosition? position, Clip clipBehavior = Clip.none, bool useRootNavigator = false, AnimationStyle? popUpAnimationStyle}) PopupMenuButton$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -339,6 +340,12 @@ class PopupMenuButton$Mate extends _i1.PopupMenuButton with _i2.Mate { /// optionalParameters: {Clip clipBehavior = Clip.none} , default:processed=PrefixedIdentifierImpl super.clipBehavior, + + /// optionalParameters: {bool useRootNavigator = false} , default:processed=BooleanLiteralImpl + super.useRootNavigator, + + /// optionalParameters: {AnimationStyle? popUpAnimationStyle} , default:none + super.popUpAnimationStyle, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -463,6 +470,17 @@ class PopupMenuButton$Mate extends _i1.PopupMenuButton with _i2.Mate { isNamed: true, defaultValue: _i4.Clip.none, ), + 'useRootNavigator': _i2.BuilderArg( + name: 'useRootNavigator', + init: useRootNavigator, + isNamed: true, + defaultValue: false, + ), + 'popUpAnimationStyle': _i2.BuilderArg<_i14.AnimationStyle?>( + name: 'popUpAnimationStyle', + init: popUpAnimationStyle, + isNamed: true, + ), }, super() { mateBuilderName = 'PopupMenuButton'; @@ -492,6 +510,8 @@ class PopupMenuButton$Mate extends _i1.PopupMenuButton with _i2.Mate { constraints: p.get('constraints').build(), position: p.get('position').build(), clipBehavior: p.get('clipBehavior').build(), + useRootNavigator: p.get('useRootNavigator').build(), + popUpAnimationStyle: p.get('popUpAnimationStyle').build(), ); } diff --git a/mate_flutter/lib/src/material/search_anchor.dart b/mate_flutter/lib/src/material/search_anchor.dart index 792fda35..131292fc 100644 --- a/mate_flutter/lib/src/material/search_anchor.dart +++ b/mate_flutter/lib/src/material/search_anchor.dart @@ -10,16 +10,16 @@ import 'package:flutter/src/painting/borders.dart' as _i6; import 'package:flutter/src/painting/text_style.dart' as _i7; import 'package:flutter/src/rendering/box.dart' as _i8; import 'package:flutter/src/services/text_input.dart' as _i9; -import 'package:flutter/src/widgets/editable_text.dart' as _i10; -import 'package:flutter/src/widgets/focus_manager.dart' as _i11; -import 'package:flutter/src/gestures/tap.dart' as _i12; -import 'package:flutter/src/foundation/basic_types.dart' as _i13; +import 'package:flutter/src/foundation/basic_types.dart' as _i10; +import 'package:flutter/src/widgets/editable_text.dart' as _i11; +import 'package:flutter/src/widgets/focus_manager.dart' as _i12; +import 'package:flutter/src/gestures/tap.dart' as _i13; import 'package:flutter/src/material/material_state.dart' as _i14; import 'package:flutter/src/painting/edge_insets.dart' as _i15; /// class SearchAnchor extends StatefulWidget class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { - /// SearchAnchor SearchAnchor({Key? key, bool? isFullScreen, SearchController? searchController, Widget Function(Iterable)? viewBuilder, Widget? viewLeading, Iterable? viewTrailing, String? viewHintText, Color? viewBackgroundColor, double? viewElevation, Color? viewSurfaceTintColor, BorderSide? viewSide, OutlinedBorder? viewShape, TextStyle? headerTextStyle, TextStyle? headerHintStyle, Color? dividerColor, BoxConstraints? viewConstraints, TextCapitalization? textCapitalization, required Widget Function(BuildContext, SearchController) builder, required FutureOr> Function(BuildContext, SearchController) suggestionsBuilder}) + /// SearchAnchor SearchAnchor({Key? key, bool? isFullScreen, SearchController? searchController, Widget Function(Iterable)? viewBuilder, Widget? viewLeading, Iterable? viewTrailing, String? viewHintText, Color? viewBackgroundColor, double? viewElevation, Color? viewSurfaceTintColor, BorderSide? viewSide, OutlinedBorder? viewShape, TextStyle? headerTextStyle, TextStyle? headerHintStyle, Color? dividerColor, BoxConstraints? viewConstraints, TextCapitalization? textCapitalization, void Function(String)? viewOnChanged, void Function(String)? viewOnSubmitted, required Widget Function(BuildContext, SearchController) builder, required FutureOr> Function(BuildContext, SearchController) suggestionsBuilder, TextInputAction? textInputAction, TextInputType? keyboardType}) SearchAnchor$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -72,11 +72,23 @@ class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { /// optionalParameters: {TextCapitalization? textCapitalization} , default:none super.textCapitalization, + /// optionalParameters: {void Function(String)? viewOnChanged} , default:none + super.viewOnChanged, + + /// optionalParameters: {void Function(String)? viewOnSubmitted} , default:none + super.viewOnSubmitted, + /// optionalParameters: {required Widget Function(BuildContext, SearchController) builder} , default:none required super.builder, /// optionalParameters: {required FutureOr> Function(BuildContext, SearchController) suggestionsBuilder} , default:none required super.suggestionsBuilder, + + /// optionalParameters: {TextInputAction? textInputAction} , default:none + super.textInputAction, + + /// optionalParameters: {TextInputType? keyboardType} , default:none + super.keyboardType, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -163,6 +175,16 @@ class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { init: textCapitalization, isNamed: true, ), + 'viewOnChanged': _i2.BuilderArg<_i10.ValueChanged?>( + name: 'viewOnChanged', + init: viewOnChanged, + isNamed: true, + ), + 'viewOnSubmitted': _i2.BuilderArg<_i10.ValueChanged?>( + name: 'viewOnSubmitted', + init: viewOnSubmitted, + isNamed: true, + ), 'builder': _i2.BuilderArg<_i1.SearchAnchorChildBuilder>( name: 'builder', init: builder, @@ -173,6 +195,16 @@ class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { init: suggestionsBuilder, isNamed: true, ), + 'textInputAction': _i2.BuilderArg<_i9.TextInputAction?>( + name: 'textInputAction', + init: textInputAction, + isNamed: true, + ), + 'keyboardType': _i2.BuilderArg<_i9.TextInputType?>( + name: 'keyboardType', + init: keyboardType, + isNamed: true, + ), }, super() { mateBuilderName = 'SearchAnchor'; @@ -195,8 +227,12 @@ class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { dividerColor: p.get('dividerColor').build(), viewConstraints: p.get('viewConstraints').build(), textCapitalization: p.get('textCapitalization').build(), + viewOnChanged: p.get('viewOnChanged').build(), + viewOnSubmitted: p.get('viewOnSubmitted').build(), builder: p.get('builder').build(), suggestionsBuilder: p.get('suggestionsBuilder').build(), + textInputAction: p.get('textInputAction').build(), + keyboardType: p.get('keyboardType').build(), ); } @@ -206,7 +242,7 @@ class SearchAnchor$Mate extends _i1.SearchAnchor with _i2.Mate { /// class SearchBar extends StatefulWidget class SearchBar$Mate extends _i1.SearchBar with _i2.Mate { - /// SearchBar SearchBar({Key? key, TextEditingController? controller, FocusNode? focusNode, String? hintText, Widget? leading, Iterable? trailing, void Function()? onTap, void Function(String)? onChanged, void Function(String)? onSubmitted, BoxConstraints? constraints, MaterialStateProperty? elevation, MaterialStateProperty? backgroundColor, MaterialStateProperty? shadowColor, MaterialStateProperty? surfaceTintColor, MaterialStateProperty? overlayColor, MaterialStateProperty? side, MaterialStateProperty? shape, MaterialStateProperty? padding, MaterialStateProperty? textStyle, MaterialStateProperty? hintStyle, TextCapitalization? textCapitalization}) + /// SearchBar SearchBar({Key? key, TextEditingController? controller, FocusNode? focusNode, String? hintText, Widget? leading, Iterable? trailing, void Function()? onTap, void Function(String)? onChanged, void Function(String)? onSubmitted, BoxConstraints? constraints, MaterialStateProperty? elevation, MaterialStateProperty? backgroundColor, MaterialStateProperty? shadowColor, MaterialStateProperty? surfaceTintColor, MaterialStateProperty? overlayColor, MaterialStateProperty? side, MaterialStateProperty? shape, MaterialStateProperty? padding, MaterialStateProperty? textStyle, MaterialStateProperty? hintStyle, TextCapitalization? textCapitalization, bool autoFocus = false, TextInputAction? textInputAction, TextInputType? keyboardType}) SearchBar$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -270,18 +306,27 @@ class SearchBar$Mate extends _i1.SearchBar with _i2.Mate { /// optionalParameters: {TextCapitalization? textCapitalization} , default:none super.textCapitalization, + + /// optionalParameters: {bool autoFocus = false} , default:processed=BooleanLiteralImpl + super.autoFocus, + + /// optionalParameters: {TextInputAction? textInputAction} , default:none + super.textInputAction, + + /// optionalParameters: {TextInputType? keyboardType} , default:none + super.keyboardType, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', init: key, isNamed: true, ), - 'controller': _i2.BuilderArg<_i10.TextEditingController?>( + 'controller': _i2.BuilderArg<_i11.TextEditingController?>( name: 'controller', init: controller, isNamed: true, ), - 'focusNode': _i2.BuilderArg<_i11.FocusNode?>( + 'focusNode': _i2.BuilderArg<_i12.FocusNode?>( name: 'focusNode', init: focusNode, isNamed: true, @@ -301,17 +346,17 @@ class SearchBar$Mate extends _i1.SearchBar with _i2.Mate { init: trailing, isNamed: true, ), - 'onTap': _i2.BuilderArg<_i12.GestureTapCallback?>( + 'onTap': _i2.BuilderArg<_i13.GestureTapCallback?>( name: 'onTap', init: onTap, isNamed: true, ), - 'onChanged': _i2.BuilderArg<_i13.ValueChanged?>( + 'onChanged': _i2.BuilderArg<_i10.ValueChanged?>( name: 'onChanged', init: onChanged, isNamed: true, ), - 'onSubmitted': _i2.BuilderArg<_i13.ValueChanged?>( + 'onSubmitted': _i2.BuilderArg<_i10.ValueChanged?>( name: 'onSubmitted', init: onSubmitted, isNamed: true, @@ -376,6 +421,22 @@ class SearchBar$Mate extends _i1.SearchBar with _i2.Mate { init: textCapitalization, isNamed: true, ), + 'autoFocus': _i2.BuilderArg( + name: 'autoFocus', + init: autoFocus, + isNamed: true, + defaultValue: false, + ), + 'textInputAction': _i2.BuilderArg<_i9.TextInputAction?>( + name: 'textInputAction', + init: textInputAction, + isNamed: true, + ), + 'keyboardType': _i2.BuilderArg<_i9.TextInputType?>( + name: 'keyboardType', + init: keyboardType, + isNamed: true, + ), }, super() { mateBuilderName = 'SearchBar'; @@ -402,6 +463,9 @@ class SearchBar$Mate extends _i1.SearchBar with _i2.Mate { textStyle: p.get('textStyle').build(), hintStyle: p.get('hintStyle').build(), textCapitalization: p.get('textCapitalization').build(), + autoFocus: p.get('autoFocus').build(), + textInputAction: p.get('textInputAction').build(), + keyboardType: p.get('keyboardType').build(), ); } diff --git a/mate_flutter/lib/src/material/slider_theme.dart b/mate_flutter/lib/src/material/slider_theme.dart index 61f862f3..48c94c84 100644 --- a/mate_flutter/lib/src/material/slider_theme.dart +++ b/mate_flutter/lib/src/material/slider_theme.dart @@ -56,7 +56,7 @@ class SliderTheme$Mate extends _i1.SliderTheme with _i2.Mate { /// class SliderThemeData with Diagnosticable class SliderThemeData$Mate extends _i1.SliderThemeData with _i2.Mate { - /// SliderThemeData SliderThemeData({double? trackHeight, Color? activeTrackColor, Color? inactiveTrackColor, Color? secondaryActiveTrackColor, Color? disabledActiveTrackColor, Color? disabledInactiveTrackColor, Color? disabledSecondaryActiveTrackColor, Color? activeTickMarkColor, Color? inactiveTickMarkColor, Color? disabledActiveTickMarkColor, Color? disabledInactiveTickMarkColor, Color? thumbColor, Color? overlappingShapeStrokeColor, Color? disabledThumbColor, Color? overlayColor, Color? valueIndicatorColor, SliderComponentShape? overlayShape, SliderTickMarkShape? tickMarkShape, SliderComponentShape? thumbShape, SliderTrackShape? trackShape, SliderComponentShape? valueIndicatorShape, RangeSliderTickMarkShape? rangeTickMarkShape, RangeSliderThumbShape? rangeThumbShape, RangeSliderTrackShape? rangeTrackShape, RangeSliderValueIndicatorShape? rangeValueIndicatorShape, ShowValueIndicator? showValueIndicator, TextStyle? valueIndicatorTextStyle, double? minThumbSeparation, Thumb? Function(TextDirection, RangeValues, double, Size, Size, double)? thumbSelector, MaterialStateProperty? mouseCursor, SliderInteraction? allowedInteraction}) + /// SliderThemeData SliderThemeData({double? trackHeight, Color? activeTrackColor, Color? inactiveTrackColor, Color? secondaryActiveTrackColor, Color? disabledActiveTrackColor, Color? disabledInactiveTrackColor, Color? disabledSecondaryActiveTrackColor, Color? activeTickMarkColor, Color? inactiveTickMarkColor, Color? disabledActiveTickMarkColor, Color? disabledInactiveTickMarkColor, Color? thumbColor, Color? overlappingShapeStrokeColor, Color? disabledThumbColor, Color? overlayColor, Color? valueIndicatorColor, Color? valueIndicatorStrokeColor, SliderComponentShape? overlayShape, SliderTickMarkShape? tickMarkShape, SliderComponentShape? thumbShape, SliderTrackShape? trackShape, SliderComponentShape? valueIndicatorShape, RangeSliderTickMarkShape? rangeTickMarkShape, RangeSliderThumbShape? rangeThumbShape, RangeSliderTrackShape? rangeTrackShape, RangeSliderValueIndicatorShape? rangeValueIndicatorShape, ShowValueIndicator? showValueIndicator, TextStyle? valueIndicatorTextStyle, double? minThumbSeparation, Thumb? Function(TextDirection, RangeValues, double, Size, Size, double)? thumbSelector, MaterialStateProperty? mouseCursor, SliderInteraction? allowedInteraction}) SliderThemeData$Mate({ /// optionalParameters: {double? trackHeight} , default:none super.trackHeight, @@ -106,6 +106,9 @@ class SliderThemeData$Mate extends _i1.SliderThemeData with _i2.Mate { /// optionalParameters: {Color? valueIndicatorColor} , default:none super.valueIndicatorColor, + /// optionalParameters: {Color? valueIndicatorStrokeColor} , default:none + super.valueIndicatorStrokeColor, + /// optionalParameters: {SliderComponentShape? overlayShape} , default:none super.overlayShape, @@ -231,6 +234,11 @@ class SliderThemeData$Mate extends _i1.SliderThemeData with _i2.Mate { init: valueIndicatorColor, isNamed: true, ), + 'valueIndicatorStrokeColor': _i2.BuilderArg<_i5.Color?>( + name: 'valueIndicatorStrokeColor', + init: valueIndicatorStrokeColor, + isNamed: true, + ), 'overlayShape': _i2.BuilderArg<_i1.SliderComponentShape?>( name: 'overlayShape', init: overlayShape, @@ -327,6 +335,7 @@ class SliderThemeData$Mate extends _i1.SliderThemeData with _i2.Mate { disabledThumbColor: p.get('disabledThumbColor').build(), overlayColor: p.get('overlayColor').build(), valueIndicatorColor: p.get('valueIndicatorColor').build(), + valueIndicatorStrokeColor: p.get('valueIndicatorStrokeColor').build(), overlayShape: p.get('overlayShape').build(), tickMarkShape: p.get('tickMarkShape').build(), thumbShape: p.get('thumbShape').build(), diff --git a/mate_flutter/lib/src/material/snack_bar.dart b/mate_flutter/lib/src/material/snack_bar.dart index 3472491c..f132a107 100644 --- a/mate_flutter/lib/src/material/snack_bar.dart +++ b/mate_flutter/lib/src/material/snack_bar.dart @@ -12,7 +12,6 @@ import 'package:flutter/src/rendering/proxy_box.dart' as _i8; import 'package:flutter/src/material/snack_bar_theme.dart' as _i9; import 'package:flutter/src/animation/animation.dart' as _i10; import 'package:flutter/src/widgets/dismissible.dart' as _i11; -import 'package:flutter/cupertino.dart' as _i12; /// class SnackBarAction extends StatefulWidget class SnackBarAction$Mate extends _i1.SnackBarAction with _i2.Mate { @@ -95,7 +94,7 @@ class SnackBarAction$Mate extends _i1.SnackBarAction with _i2.Mate { /// class SnackBar extends StatefulWidget class SnackBar$Mate extends _i1.SnackBar with _i2.Mate { - /// SnackBar SnackBar({Key? key, required Widget content, Color? backgroundColor, double? elevation, EdgeInsetsGeometry? margin, EdgeInsetsGeometry? padding, double? width, ShapeBorder? shape, HitTestBehavior? hitTestBehavior, SnackBarBehavior? behavior, SnackBarAction? action, double? actionOverflowThreshold, bool? showCloseIcon, Color? closeIconColor, Duration duration = _snackBarDisplayDuration, Animation? animation, void Function()? onVisible, DismissDirection dismissDirection = DismissDirection.down, Clip clipBehavior = Clip.hardEdge}) + /// SnackBar SnackBar({Key? key, required Widget content, Color? backgroundColor, double? elevation, EdgeInsetsGeometry? margin, EdgeInsetsGeometry? padding, double? width, ShapeBorder? shape, HitTestBehavior? hitTestBehavior, SnackBarBehavior? behavior, SnackBarAction? action, double? actionOverflowThreshold, bool? showCloseIcon, Color? closeIconColor, Duration duration = _snackBarDisplayDuration, Animation? animation, void Function()? onVisible, DismissDirection? dismissDirection, Clip clipBehavior = Clip.hardEdge}) SnackBar$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -148,7 +147,7 @@ class SnackBar$Mate extends _i1.SnackBar with _i2.Mate { /// optionalParameters: {void Function()? onVisible} , default:none super.onVisible, - /// optionalParameters: {DismissDirection dismissDirection = DismissDirection.down} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DismissDirection? dismissDirection} , default:none super.dismissDirection, /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl @@ -239,11 +238,10 @@ class SnackBar$Mate extends _i1.SnackBar with _i2.Mate { init: onVisible, isNamed: true, ), - 'dismissDirection': _i2.BuilderArg<_i11.DismissDirection>( + 'dismissDirection': _i2.BuilderArg<_i11.DismissDirection?>( name: 'dismissDirection', init: dismissDirection, isNamed: true, - defaultValue: _i12.DismissDirection.down, ), 'clipBehavior': _i2.BuilderArg<_i4.Clip>( name: 'clipBehavior', diff --git a/mate_flutter/lib/src/material/snack_bar_theme.dart b/mate_flutter/lib/src/material/snack_bar_theme.dart index 2b4913a1..d47aacb5 100644 --- a/mate_flutter/lib/src/material/snack_bar_theme.dart +++ b/mate_flutter/lib/src/material/snack_bar_theme.dart @@ -7,10 +7,11 @@ import 'dart:ui' as _i3; import 'package:flutter/src/painting/text_style.dart' as _i4; import 'package:flutter/src/painting/borders.dart' as _i5; import 'package:flutter/src/painting/edge_insets.dart' as _i6; +import 'package:flutter/src/widgets/dismissible.dart' as _i7; /// class SnackBarThemeData with Diagnosticable class SnackBarThemeData$Mate extends _i1.SnackBarThemeData with _i2.Mate { - /// SnackBarThemeData SnackBarThemeData({Color? backgroundColor, Color? actionTextColor, Color? disabledActionTextColor, TextStyle? contentTextStyle, double? elevation, ShapeBorder? shape, SnackBarBehavior? behavior, double? width, EdgeInsets? insetPadding, bool? showCloseIcon, Color? closeIconColor, double? actionOverflowThreshold, Color? actionBackgroundColor, Color? disabledActionBackgroundColor}) + /// SnackBarThemeData SnackBarThemeData({Color? backgroundColor, Color? actionTextColor, Color? disabledActionTextColor, TextStyle? contentTextStyle, double? elevation, ShapeBorder? shape, SnackBarBehavior? behavior, double? width, EdgeInsets? insetPadding, bool? showCloseIcon, Color? closeIconColor, double? actionOverflowThreshold, Color? actionBackgroundColor, Color? disabledActionBackgroundColor, DismissDirection? dismissDirection}) SnackBarThemeData$Mate({ /// optionalParameters: {Color? backgroundColor} , default:none super.backgroundColor, @@ -53,6 +54,9 @@ class SnackBarThemeData$Mate extends _i1.SnackBarThemeData with _i2.Mate { /// optionalParameters: {Color? disabledActionBackgroundColor} , default:none super.disabledActionBackgroundColor, + + /// optionalParameters: {DismissDirection? dismissDirection} , default:none + super.dismissDirection, }) : mateParams = { 'backgroundColor': _i2.BuilderArg<_i3.Color?>( name: 'backgroundColor', @@ -124,6 +128,11 @@ class SnackBarThemeData$Mate extends _i1.SnackBarThemeData with _i2.Mate { init: disabledActionBackgroundColor, isNamed: true, ), + 'dismissDirection': _i2.BuilderArg<_i7.DismissDirection?>( + name: 'dismissDirection', + init: dismissDirection, + isNamed: true, + ), }, super() { mateBuilderName = 'SnackBarThemeData'; @@ -143,6 +152,7 @@ class SnackBarThemeData$Mate extends _i1.SnackBarThemeData with _i2.Mate { actionOverflowThreshold: p.get('actionOverflowThreshold').build(), actionBackgroundColor: p.get('actionBackgroundColor').build(), disabledActionBackgroundColor: p.get('disabledActionBackgroundColor').build(), + dismissDirection: p.get('dismissDirection').build(), ); } diff --git a/mate_flutter/lib/src/material/text_field.dart b/mate_flutter/lib/src/material/text_field.dart index 883f8b5b..eb6b7af4 100644 --- a/mate_flutter/lib/src/material/text_field.dart +++ b/mate_flutter/lib/src/material/text_field.dart @@ -14,23 +14,24 @@ import 'package:flutter/src/painting/text_style.dart' as _i10; import 'package:flutter/src/painting/strut_style.dart' as _i11; import 'dart:ui' as _i12; import 'package:flutter/src/painting/alignment.dart' as _i13; -import 'package:flutter/src/services/text_formatter.dart' as _i14; -import 'package:flutter/src/foundation/basic_types.dart' as _i15; -import 'package:flutter/src/painting/edge_insets.dart' as _i16; -import 'package:flutter/src/gestures/recognizer.dart' as _i17; -import 'package:flutter/gestures.dart' as _i18; -import 'package:flutter/src/widgets/text_selection.dart' as _i19; -import 'package:flutter/src/gestures/tap.dart' as _i20; -import 'package:flutter/src/widgets/tap_region.dart' as _i21; -import 'package:flutter/src/services/mouse_cursor.dart' as _i22; -import 'package:flutter/src/widgets/scroll_controller.dart' as _i23; -import 'package:flutter/src/widgets/scroll_physics.dart' as _i24; -import 'package:flutter/src/widgets/spell_check.dart' as _i25; -import 'package:flutter/src/widgets/magnifier.dart' as _i26; +import 'package:flutter/src/material/material_state.dart' as _i14; +import 'package:flutter/src/services/text_formatter.dart' as _i15; +import 'package:flutter/src/foundation/basic_types.dart' as _i16; +import 'package:flutter/src/painting/edge_insets.dart' as _i17; +import 'package:flutter/src/gestures/recognizer.dart' as _i18; +import 'package:flutter/gestures.dart' as _i19; +import 'package:flutter/src/widgets/text_selection.dart' as _i20; +import 'package:flutter/src/gestures/tap.dart' as _i21; +import 'package:flutter/src/widgets/tap_region.dart' as _i22; +import 'package:flutter/src/services/mouse_cursor.dart' as _i23; +import 'package:flutter/src/widgets/scroll_controller.dart' as _i24; +import 'package:flutter/src/widgets/scroll_physics.dart' as _i25; +import 'package:flutter/src/widgets/spell_check.dart' as _i26; +import 'package:flutter/src/widgets/magnifier.dart' as _i27; /// class TextField extends StatefulWidget class TextField$Mate extends _i1.TextField with _i2.Mate { - /// TextField TextField({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, InputDecoration? decoration = const InputDecoration(), TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(String, Map)? onAppPrivateCommand, List? inputFormatters, bool? enabled, double cursorWidth = 2.0, double? cursorHeight, Radius? cursorRadius, bool? cursorOpacityAnimates, Color? cursorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, void Function(PointerDownEvent)? onTapOutside, MouseCursor? mouseCursor, Widget? Function(BuildContext, {required int currentLength, required bool isFocused, required int? maxLength})? buildCounter, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, bool canRequestFocus = true, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) + /// TextField TextField({Key? key, TextEditingController? controller, FocusNode? focusNode, UndoHistoryController? undoController, InputDecoration? decoration = const InputDecoration(), TextInputType? keyboardType, TextInputAction? textInputAction, TextCapitalization textCapitalization = TextCapitalization.none, TextStyle? style, StrutStyle? strutStyle, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, TextDirection? textDirection, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, bool autofocus = false, MaterialStatesController? statesController, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, MaxLengthEnforcement? maxLengthEnforcement, void Function(String)? onChanged, void Function()? onEditingComplete, void Function(String)? onSubmitted, void Function(String, Map)? onAppPrivateCommand, List? inputFormatters, bool? enabled, double cursorWidth = 2.0, double? cursorHeight, Radius? cursorRadius, bool? cursorOpacityAnimates, Color? cursorColor, Color? cursorErrorColor, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), DragStartBehavior dragStartBehavior = DragStartBehavior.start, bool? enableInteractiveSelection, TextSelectionControls? selectionControls, void Function()? onTap, bool onTapAlwaysCalled = false, void Function(PointerDownEvent)? onTapOutside, MouseCursor? mouseCursor, Widget? Function(BuildContext, {required int currentLength, required bool isFocused, required int? maxLength})? buildCounter, ScrollController? scrollController, ScrollPhysics? scrollPhysics, Iterable? autofillHints = const [], ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, String? restorationId, bool scribbleEnabled = true, bool enableIMEPersonalizedLearning = true, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, bool canRequestFocus = true, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration}) TextField$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -80,6 +81,9 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { /// optionalParameters: {bool autofocus = false} , default:processed=BooleanLiteralImpl super.autofocus, + /// optionalParameters: {MaterialStatesController? statesController} , default:none + super.statesController, + /// optionalParameters: {String obscuringCharacter = '•'} , default:processed=SimpleStringLiteralImpl super.obscuringCharacter, @@ -146,6 +150,9 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { /// optionalParameters: {Color? cursorColor} , default:none super.cursorColor, + /// optionalParameters: {Color? cursorErrorColor} , default:none + super.cursorErrorColor, + /// optionalParameters: {BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight} , default:unprocessed=PropertyAccessImpl super.selectionHeightStyle, @@ -170,6 +177,9 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { /// optionalParameters: {void Function()? onTap} , default:none super.onTap, + /// optionalParameters: {bool onTapAlwaysCalled = false} , default:processed=BooleanLiteralImpl + super.onTapAlwaysCalled, + /// optionalParameters: {void Function(PointerDownEvent)? onTapOutside} , default:none super.onTapOutside, @@ -299,6 +309,11 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { isNamed: true, defaultValue: false, ), + 'statesController': _i2.BuilderArg<_i14.MaterialStatesController?>( + name: 'statesController', + init: statesController, + isNamed: true, + ), 'obscuringCharacter': _i2.BuilderArg( name: 'obscuringCharacter', init: obscuringCharacter, @@ -355,12 +370,12 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: maxLength, isNamed: true, ), - 'maxLengthEnforcement': _i2.BuilderArg<_i14.MaxLengthEnforcement?>( + 'maxLengthEnforcement': _i2.BuilderArg<_i15.MaxLengthEnforcement?>( name: 'maxLengthEnforcement', init: maxLengthEnforcement, isNamed: true, ), - 'onChanged': _i2.BuilderArg<_i15.ValueChanged?>( + 'onChanged': _i2.BuilderArg<_i16.ValueChanged?>( name: 'onChanged', init: onChanged, isNamed: true, @@ -370,7 +385,7 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: onEditingComplete, isNamed: true, ), - 'onSubmitted': _i2.BuilderArg<_i15.ValueChanged?>( + 'onSubmitted': _i2.BuilderArg<_i16.ValueChanged?>( name: 'onSubmitted', init: onSubmitted, isNamed: true, @@ -380,7 +395,7 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: onAppPrivateCommand, isNamed: true, ), - 'inputFormatters': _i2.BuilderArg?>( + 'inputFormatters': _i2.BuilderArg?>( name: 'inputFormatters', init: inputFormatters, isNamed: true, @@ -416,6 +431,11 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: cursorColor, isNamed: true, ), + 'cursorErrorColor': _i2.BuilderArg<_i12.Color?>( + name: 'cursorErrorColor', + init: cursorErrorColor, + isNamed: true, + ), 'selectionHeightStyle': _i2.BuilderArg<_i12.BoxHeightStyle>( name: 'selectionHeightStyle', init: selectionHeightStyle, @@ -431,38 +451,44 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: keyboardAppearance, isNamed: true, ), - 'scrollPadding': _i2.BuilderArg<_i16.EdgeInsets>( + 'scrollPadding': _i2.BuilderArg<_i17.EdgeInsets>( name: 'scrollPadding', init: scrollPadding, isNamed: true, ), - 'dragStartBehavior': _i2.BuilderArg<_i17.DragStartBehavior>( + 'dragStartBehavior': _i2.BuilderArg<_i18.DragStartBehavior>( name: 'dragStartBehavior', init: dragStartBehavior, isNamed: true, - defaultValue: _i18.DragStartBehavior.start, + defaultValue: _i19.DragStartBehavior.start, ), 'enableInteractiveSelection': _i2.BuilderArg( name: 'enableInteractiveSelection', init: enableInteractiveSelection, isNamed: true, ), - 'selectionControls': _i2.BuilderArg<_i19.TextSelectionControls?>( + 'selectionControls': _i2.BuilderArg<_i20.TextSelectionControls?>( name: 'selectionControls', init: selectionControls, isNamed: true, ), - 'onTap': _i2.BuilderArg<_i20.GestureTapCallback?>( + 'onTap': _i2.BuilderArg<_i21.GestureTapCallback?>( name: 'onTap', init: onTap, isNamed: true, ), - 'onTapOutside': _i2.BuilderArg<_i21.TapRegionCallback?>( + 'onTapAlwaysCalled': _i2.BuilderArg( + name: 'onTapAlwaysCalled', + init: onTapAlwaysCalled, + isNamed: true, + defaultValue: false, + ), + 'onTapOutside': _i2.BuilderArg<_i22.TapRegionCallback?>( name: 'onTapOutside', init: onTapOutside, isNamed: true, ), - 'mouseCursor': _i2.BuilderArg<_i22.MouseCursor?>( + 'mouseCursor': _i2.BuilderArg<_i23.MouseCursor?>( name: 'mouseCursor', init: mouseCursor, isNamed: true, @@ -472,12 +498,12 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { init: buildCounter, isNamed: true, ), - 'scrollController': _i2.BuilderArg<_i23.ScrollController?>( + 'scrollController': _i2.BuilderArg<_i24.ScrollController?>( name: 'scrollController', init: scrollController, isNamed: true, ), - 'scrollPhysics': _i2.BuilderArg<_i24.ScrollPhysics?>( + 'scrollPhysics': _i2.BuilderArg<_i25.ScrollPhysics?>( name: 'scrollPhysics', init: scrollPhysics, isNamed: true, @@ -526,12 +552,12 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { isNamed: true, defaultValue: true, ), - 'spellCheckConfiguration': _i2.BuilderArg<_i25.SpellCheckConfiguration?>( + 'spellCheckConfiguration': _i2.BuilderArg<_i26.SpellCheckConfiguration?>( name: 'spellCheckConfiguration', init: spellCheckConfiguration, isNamed: true, ), - 'magnifierConfiguration': _i2.BuilderArg<_i26.TextMagnifierConfiguration?>( + 'magnifierConfiguration': _i2.BuilderArg<_i27.TextMagnifierConfiguration?>( name: 'magnifierConfiguration', init: magnifierConfiguration, isNamed: true, @@ -557,6 +583,7 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { readOnly: p.get('readOnly').build(), showCursor: p.get('showCursor').build(), autofocus: p.get('autofocus').build(), + statesController: p.get('statesController').build(), obscuringCharacter: p.get('obscuringCharacter').build(), obscureText: p.get('obscureText').build(), autocorrect: p.get('autocorrect').build(), @@ -579,6 +606,7 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { cursorRadius: p.get('cursorRadius').build(), cursorOpacityAnimates: p.get('cursorOpacityAnimates').build(), cursorColor: p.get('cursorColor').build(), + cursorErrorColor: p.get('cursorErrorColor').build(), selectionHeightStyle: p.get('selectionHeightStyle').build(), selectionWidthStyle: p.get('selectionWidthStyle').build(), keyboardAppearance: p.get('keyboardAppearance').build(), @@ -587,6 +615,7 @@ class TextField$Mate extends _i1.TextField with _i2.Mate { enableInteractiveSelection: p.get('enableInteractiveSelection').build(), selectionControls: p.get('selectionControls').build(), onTap: p.get('onTap').build(), + onTapAlwaysCalled: p.get('onTapAlwaysCalled').build(), onTapOutside: p.get('onTapOutside').build(), mouseCursor: p.get('mouseCursor').build(), buildCounter: p.get('buildCounter').build(), diff --git a/mate_flutter/lib/src/material/text_form_field.dart b/mate_flutter/lib/src/material/text_form_field.dart index 983c4366..a3b316f6 100644 --- a/mate_flutter/lib/src/material/text_form_field.dart +++ b/mate_flutter/lib/src/material/text_form_field.dart @@ -29,10 +29,11 @@ import 'package:flutter/src/widgets/magnifier.dart' as _i25; import 'package:flutter/src/widgets/undo_history.dart' as _i26; import 'package:flutter/src/gestures/recognizer.dart' as _i27; import 'package:flutter/gestures.dart' as _i28; +import 'package:flutter/src/material/material_state.dart' as _i29; /// class TextFormField extends FormField class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { - /// TextFormField TextFormField({Key? key, TextEditingController? controller, String? initialValue, FocusNode? focusNode, InputDecoration? decoration = const InputDecoration(), TextInputType? keyboardType, TextCapitalization textCapitalization = TextCapitalization.none, TextInputAction? textInputAction, TextStyle? style, StrutStyle? strutStyle, TextDirection? textDirection, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, bool autofocus = false, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, MaxLengthEnforcement? maxLengthEnforcement, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, void Function(String)? onChanged, void Function()? onTap, void Function(PointerDownEvent)? onTapOutside, void Function()? onEditingComplete, void Function(String)? onFieldSubmitted, void Function(String?)? onSaved, String? Function(String?)? validator, List? inputFormatters, bool? enabled, double cursorWidth = 2.0, double? cursorHeight, Radius? cursorRadius, Color? cursorColor, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), bool? enableInteractiveSelection, TextSelectionControls? selectionControls, Widget? Function(BuildContext, {required int currentLength, required bool isFocused, required int? maxLength})? buildCounter, ScrollPhysics? scrollPhysics, Iterable? autofillHints, AutovalidateMode? autovalidateMode, ScrollController? scrollController, String? restorationId, bool enableIMEPersonalizedLearning = true, MouseCursor? mouseCursor, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration, UndoHistoryController? undoController, void Function(String, Map)? onAppPrivateCommand, bool? cursorOpacityAnimates, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, DragStartBehavior dragStartBehavior = DragStartBehavior.start, ContentInsertionConfiguration? contentInsertionConfiguration, Clip clipBehavior = Clip.hardEdge, bool scribbleEnabled = true, bool canRequestFocus = true}) + /// TextFormField TextFormField({Key? key, TextEditingController? controller, String? initialValue, FocusNode? focusNode, InputDecoration? decoration = const InputDecoration(), TextInputType? keyboardType, TextCapitalization textCapitalization = TextCapitalization.none, TextInputAction? textInputAction, TextStyle? style, StrutStyle? strutStyle, TextDirection? textDirection, TextAlign textAlign = TextAlign.start, TextAlignVertical? textAlignVertical, bool autofocus = false, bool readOnly = false, ToolbarOptions? toolbarOptions, bool? showCursor, String obscuringCharacter = '•', bool obscureText = false, bool autocorrect = true, SmartDashesType? smartDashesType, SmartQuotesType? smartQuotesType, bool enableSuggestions = true, MaxLengthEnforcement? maxLengthEnforcement, int? maxLines = 1, int? minLines, bool expands = false, int? maxLength, void Function(String)? onChanged, void Function()? onTap, bool onTapAlwaysCalled = false, void Function(PointerDownEvent)? onTapOutside, void Function()? onEditingComplete, void Function(String)? onFieldSubmitted, void Function(String?)? onSaved, String? Function(String?)? validator, List? inputFormatters, bool? enabled, double cursorWidth = 2.0, double? cursorHeight, Radius? cursorRadius, Color? cursorColor, Color? cursorErrorColor, Brightness? keyboardAppearance, EdgeInsets scrollPadding = const EdgeInsets.all(20.0), bool? enableInteractiveSelection, TextSelectionControls? selectionControls, Widget? Function(BuildContext, {required int currentLength, required bool isFocused, required int? maxLength})? buildCounter, ScrollPhysics? scrollPhysics, Iterable? autofillHints, AutovalidateMode? autovalidateMode, ScrollController? scrollController, String? restorationId, bool enableIMEPersonalizedLearning = true, MouseCursor? mouseCursor, Widget Function(BuildContext, EditableTextState)? contextMenuBuilder = _defaultContextMenuBuilder, SpellCheckConfiguration? spellCheckConfiguration, TextMagnifierConfiguration? magnifierConfiguration, UndoHistoryController? undoController, void Function(String, Map)? onAppPrivateCommand, bool? cursorOpacityAnimates, BoxHeightStyle selectionHeightStyle = ui.BoxHeightStyle.tight, BoxWidthStyle selectionWidthStyle = ui.BoxWidthStyle.tight, DragStartBehavior dragStartBehavior = DragStartBehavior.start, ContentInsertionConfiguration? contentInsertionConfiguration, MaterialStatesController? statesController, Clip clipBehavior = Clip.hardEdge, bool scribbleEnabled = true, bool canRequestFocus = true}) TextFormField$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -121,6 +122,9 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { /// optionalParameters: {void Function()? onTap} , default:none super.onTap, + /// optionalParameters: {bool onTapAlwaysCalled = false} , default:processed=BooleanLiteralImpl + super.onTapAlwaysCalled, + /// optionalParameters: {void Function(PointerDownEvent)? onTapOutside} , default:none super.onTapOutside, @@ -154,6 +158,9 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { /// optionalParameters: {Color? cursorColor} , default:none super.cursorColor, + /// optionalParameters: {Color? cursorErrorColor} , default:none + super.cursorErrorColor, + /// optionalParameters: {Brightness? keyboardAppearance} , default:none super.keyboardAppearance, @@ -220,6 +227,9 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { /// optionalParameters: {ContentInsertionConfiguration? contentInsertionConfiguration} , default:none super.contentInsertionConfiguration, + /// optionalParameters: {MaterialStatesController? statesController} , default:none + super.statesController, + /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl super.clipBehavior, @@ -384,6 +394,12 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { init: onTap, isNamed: true, ), + 'onTapAlwaysCalled': _i2.BuilderArg( + name: 'onTapAlwaysCalled', + init: onTapAlwaysCalled, + isNamed: true, + defaultValue: false, + ), 'onTapOutside': _i2.BuilderArg<_i16.TapRegionCallback?>( name: 'onTapOutside', init: onTapOutside, @@ -440,6 +456,11 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { init: cursorColor, isNamed: true, ), + 'cursorErrorColor': _i2.BuilderArg<_i11.Color?>( + name: 'cursorErrorColor', + init: cursorErrorColor, + isNamed: true, + ), 'keyboardAppearance': _i2.BuilderArg<_i11.Brightness?>( name: 'keyboardAppearance', init: keyboardAppearance, @@ -552,6 +573,11 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { init: contentInsertionConfiguration, isNamed: true, ), + 'statesController': _i2.BuilderArg<_i29.MaterialStatesController?>( + name: 'statesController', + init: statesController, + isNamed: true, + ), 'clipBehavior': _i2.BuilderArg<_i11.Clip>( name: 'clipBehavior', init: clipBehavior, @@ -604,6 +630,7 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { maxLength: p.get('maxLength').build(), onChanged: p.get('onChanged').build(), onTap: p.get('onTap').build(), + onTapAlwaysCalled: p.get('onTapAlwaysCalled').build(), onTapOutside: p.get('onTapOutside').build(), onEditingComplete: p.get('onEditingComplete').build(), onFieldSubmitted: p.get('onFieldSubmitted').build(), @@ -615,6 +642,7 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { cursorHeight: p.get('cursorHeight').build(), cursorRadius: p.get('cursorRadius').build(), cursorColor: p.get('cursorColor').build(), + cursorErrorColor: p.get('cursorErrorColor').build(), keyboardAppearance: p.get('keyboardAppearance').build(), scrollPadding: p.get('scrollPadding').build(), enableInteractiveSelection: p.get('enableInteractiveSelection').build(), @@ -637,6 +665,7 @@ class TextFormField$Mate extends _i1.TextFormField with _i2.Mate { selectionWidthStyle: p.get('selectionWidthStyle').build(), dragStartBehavior: p.get('dragStartBehavior').build(), contentInsertionConfiguration: p.get('contentInsertionConfiguration').build(), + statesController: p.get('statesController').build(), clipBehavior: p.get('clipBehavior').build(), scribbleEnabled: p.get('scribbleEnabled').build(), canRequestFocus: p.get('canRequestFocus').build(), diff --git a/mate_flutter/lib/src/material/theme_data.dart b/mate_flutter/lib/src/material/theme_data.dart index bfea64fb..7f6508c6 100644 --- a/mate_flutter/lib/src/material/theme_data.dart +++ b/mate_flutter/lib/src/material/theme_data.dart @@ -63,8 +63,11 @@ import 'package:flutter/src/material/tooltip_theme.dart' as _i59; /// class ThemeData with Diagnosticable class ThemeData$Mate extends _i1.ThemeData with _i2.Mate { - /// ThemeData ThemeData.raw({required bool applyElevationOverlayColor, required NoDefaultCupertinoThemeData? cupertinoOverrideTheme, required Map> extensions, required InputDecorationTheme inputDecorationTheme, required MaterialTapTargetSize materialTapTargetSize, required PageTransitionsTheme pageTransitionsTheme, required TargetPlatform platform, required ScrollbarThemeData scrollbarTheme, required InteractiveInkFeatureFactory splashFactory, required bool useMaterial3, required VisualDensity visualDensity, required Color canvasColor, required Color cardColor, required ColorScheme colorScheme, required Color dialogBackgroundColor, required Color disabledColor, required Color dividerColor, required Color focusColor, required Color highlightColor, required Color hintColor, required Color hoverColor, required Color indicatorColor, required Color primaryColor, required Color primaryColorDark, required Color primaryColorLight, required Color scaffoldBackgroundColor, required Color secondaryHeaderColor, required Color shadowColor, required Color splashColor, required Color unselectedWidgetColor, required IconThemeData iconTheme, required IconThemeData primaryIconTheme, required TextTheme primaryTextTheme, required TextTheme textTheme, required Typography typography, required ActionIconThemeData? actionIconTheme, required AppBarTheme appBarTheme, required BadgeThemeData badgeTheme, required MaterialBannerThemeData bannerTheme, required BottomAppBarTheme bottomAppBarTheme, required BottomNavigationBarThemeData bottomNavigationBarTheme, required BottomSheetThemeData bottomSheetTheme, required ButtonBarThemeData buttonBarTheme, required ButtonThemeData buttonTheme, required CardTheme cardTheme, required CheckboxThemeData checkboxTheme, required ChipThemeData chipTheme, required DataTableThemeData dataTableTheme, required DatePickerThemeData datePickerTheme, required DialogTheme dialogTheme, required DividerThemeData dividerTheme, required DrawerThemeData drawerTheme, required DropdownMenuThemeData dropdownMenuTheme, required ElevatedButtonThemeData elevatedButtonTheme, required ExpansionTileThemeData expansionTileTheme, required FilledButtonThemeData filledButtonTheme, required FloatingActionButtonThemeData floatingActionButtonTheme, required IconButtonThemeData iconButtonTheme, required ListTileThemeData listTileTheme, required MenuBarThemeData menuBarTheme, required MenuButtonThemeData menuButtonTheme, required MenuThemeData menuTheme, required NavigationBarThemeData navigationBarTheme, required NavigationDrawerThemeData navigationDrawerTheme, required NavigationRailThemeData navigationRailTheme, required OutlinedButtonThemeData outlinedButtonTheme, required PopupMenuThemeData popupMenuTheme, required ProgressIndicatorThemeData progressIndicatorTheme, required RadioThemeData radioTheme, required SearchBarThemeData searchBarTheme, required SearchViewThemeData searchViewTheme, required SegmentedButtonThemeData segmentedButtonTheme, required SliderThemeData sliderTheme, required SnackBarThemeData snackBarTheme, required SwitchThemeData switchTheme, required TabBarTheme tabBarTheme, required TextButtonThemeData textButtonTheme, required TextSelectionThemeData textSelectionTheme, required TimePickerThemeData timePickerTheme, required ToggleButtonsThemeData toggleButtonsTheme, required TooltipThemeData tooltipTheme, Color? toggleableActiveColor, Color? selectedRowColor, Color? errorColor, Color? backgroundColor, Color? bottomAppBarColor}) + /// ThemeData ThemeData.raw({required Map> adaptationMap, required bool applyElevationOverlayColor, required NoDefaultCupertinoThemeData? cupertinoOverrideTheme, required Map> extensions, required InputDecorationTheme inputDecorationTheme, required MaterialTapTargetSize materialTapTargetSize, required PageTransitionsTheme pageTransitionsTheme, required TargetPlatform platform, required ScrollbarThemeData scrollbarTheme, required InteractiveInkFeatureFactory splashFactory, required bool useMaterial3, required VisualDensity visualDensity, required Color canvasColor, required Color cardColor, required ColorScheme colorScheme, required Color dialogBackgroundColor, required Color disabledColor, required Color dividerColor, required Color focusColor, required Color highlightColor, required Color hintColor, required Color hoverColor, required Color indicatorColor, required Color primaryColor, required Color primaryColorDark, required Color primaryColorLight, required Color scaffoldBackgroundColor, required Color secondaryHeaderColor, required Color shadowColor, required Color splashColor, required Color unselectedWidgetColor, required IconThemeData iconTheme, required IconThemeData primaryIconTheme, required TextTheme primaryTextTheme, required TextTheme textTheme, required Typography typography, required ActionIconThemeData? actionIconTheme, required AppBarTheme appBarTheme, required BadgeThemeData badgeTheme, required MaterialBannerThemeData bannerTheme, required BottomAppBarTheme bottomAppBarTheme, required BottomNavigationBarThemeData bottomNavigationBarTheme, required BottomSheetThemeData bottomSheetTheme, required ButtonBarThemeData buttonBarTheme, required ButtonThemeData buttonTheme, required CardTheme cardTheme, required CheckboxThemeData checkboxTheme, required ChipThemeData chipTheme, required DataTableThemeData dataTableTheme, required DatePickerThemeData datePickerTheme, required DialogTheme dialogTheme, required DividerThemeData dividerTheme, required DrawerThemeData drawerTheme, required DropdownMenuThemeData dropdownMenuTheme, required ElevatedButtonThemeData elevatedButtonTheme, required ExpansionTileThemeData expansionTileTheme, required FilledButtonThemeData filledButtonTheme, required FloatingActionButtonThemeData floatingActionButtonTheme, required IconButtonThemeData iconButtonTheme, required ListTileThemeData listTileTheme, required MenuBarThemeData menuBarTheme, required MenuButtonThemeData menuButtonTheme, required MenuThemeData menuTheme, required NavigationBarThemeData navigationBarTheme, required NavigationDrawerThemeData navigationDrawerTheme, required NavigationRailThemeData navigationRailTheme, required OutlinedButtonThemeData outlinedButtonTheme, required PopupMenuThemeData popupMenuTheme, required ProgressIndicatorThemeData progressIndicatorTheme, required RadioThemeData radioTheme, required SearchBarThemeData searchBarTheme, required SearchViewThemeData searchViewTheme, required SegmentedButtonThemeData segmentedButtonTheme, required SliderThemeData sliderTheme, required SnackBarThemeData snackBarTheme, required SwitchThemeData switchTheme, required TabBarTheme tabBarTheme, required TextButtonThemeData textButtonTheme, required TextSelectionThemeData textSelectionTheme, required TimePickerThemeData timePickerTheme, required ToggleButtonsThemeData toggleButtonsTheme, required TooltipThemeData tooltipTheme, Color? toggleableActiveColor, Color? errorColor, Color? backgroundColor, Color? bottomAppBarColor}) ThemeData$Mate.raw({ + /// optionalParameters: {required Map> adaptationMap} , default:none + required super.adaptationMap, + /// optionalParameters: {required bool applyElevationOverlayColor} , default:none required super.applyElevationOverlayColor, @@ -308,6 +311,11 @@ class ThemeData$Mate extends _i1.ThemeData with _i2.Mate { /// optionalParameters: {required TooltipThemeData tooltipTheme} , default:none required super.tooltipTheme, }) : mateParams = { + 'adaptationMap': _i2.BuilderArg>>( + name: 'adaptationMap', + init: adaptationMap, + isNamed: true, + ), 'applyElevationOverlayColor': _i2.BuilderArg( name: 'applyElevationOverlayColor', init: applyElevationOverlayColor, @@ -718,6 +726,7 @@ class ThemeData$Mate extends _i1.ThemeData with _i2.Mate { mateBuilderName = 'ThemeData.raw'; matePackageUrl = 'package:flutter/material.dart'; mateBuilder = (p) => ThemeData$Mate.raw( + adaptationMap: p.get('adaptationMap').build(), applyElevationOverlayColor: p.get('applyElevationOverlayColor').build(), cupertinoOverrideTheme: p.get('cupertinoOverrideTheme').build(), extensions: p.get('extensions').build(), diff --git a/mate_flutter/lib/src/material/tooltip.dart b/mate_flutter/lib/src/material/tooltip.dart index 6eda03ae..bb674bc5 100644 --- a/mate_flutter/lib/src/material/tooltip.dart +++ b/mate_flutter/lib/src/material/tooltip.dart @@ -14,7 +14,7 @@ import 'package:flutter/src/widgets/framework.dart' as _i10; /// class Tooltip extends StatefulWidget class Tooltip$Mate extends _i1.Tooltip with _i2.Mate { - /// Tooltip Tooltip({Key? key, String? message, InlineSpan? richMessage, double? height, EdgeInsetsGeometry? padding, EdgeInsetsGeometry? margin, double? verticalOffset, bool? preferBelow, bool? excludeFromSemantics, Decoration? decoration, TextStyle? textStyle, TextAlign? textAlign, Duration? waitDuration, Duration? showDuration, TooltipTriggerMode? triggerMode, bool? enableFeedback, void Function()? onTriggered, Widget? child}) + /// Tooltip Tooltip({Key? key, String? message, InlineSpan? richMessage, double? height, EdgeInsetsGeometry? padding, EdgeInsetsGeometry? margin, double? verticalOffset, bool? preferBelow, bool? excludeFromSemantics, Decoration? decoration, TextStyle? textStyle, TextAlign? textAlign, Duration? waitDuration, Duration? showDuration, Duration? exitDuration, bool enableTapToDismiss = true, TooltipTriggerMode? triggerMode, bool? enableFeedback, void Function()? onTriggered, Widget? child}) Tooltip$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -58,6 +58,12 @@ class Tooltip$Mate extends _i1.Tooltip with _i2.Mate { /// optionalParameters: {Duration? showDuration} , default:none super.showDuration, + /// optionalParameters: {Duration? exitDuration} , default:none + super.exitDuration, + + /// optionalParameters: {bool enableTapToDismiss = true} , default:processed=BooleanLiteralImpl + super.enableTapToDismiss, + /// optionalParameters: {TooltipTriggerMode? triggerMode} , default:none super.triggerMode, @@ -140,6 +146,17 @@ class Tooltip$Mate extends _i1.Tooltip with _i2.Mate { init: showDuration, isNamed: true, ), + 'exitDuration': _i2.BuilderArg( + name: 'exitDuration', + init: exitDuration, + isNamed: true, + ), + 'enableTapToDismiss': _i2.BuilderArg( + name: 'enableTapToDismiss', + init: enableTapToDismiss, + isNamed: true, + defaultValue: true, + ), 'triggerMode': _i2.BuilderArg<_i9.TooltipTriggerMode?>( name: 'triggerMode', init: triggerMode, @@ -179,6 +196,8 @@ class Tooltip$Mate extends _i1.Tooltip with _i2.Mate { textAlign: p.get('textAlign').build(), waitDuration: p.get('waitDuration').build(), showDuration: p.get('showDuration').build(), + exitDuration: p.get('exitDuration').build(), + enableTapToDismiss: p.get('enableTapToDismiss').build(), triggerMode: p.get('triggerMode').build(), enableFeedback: p.get('enableFeedback').build(), onTriggered: p.get('onTriggered').build(), diff --git a/mate_flutter/lib/src/material/tooltip_theme.dart b/mate_flutter/lib/src/material/tooltip_theme.dart index 31da9c4f..8cbcefec 100644 --- a/mate_flutter/lib/src/material/tooltip_theme.dart +++ b/mate_flutter/lib/src/material/tooltip_theme.dart @@ -12,7 +12,7 @@ import 'package:flutter/src/widgets/framework.dart' as _i8; /// class TooltipThemeData with Diagnosticable class TooltipThemeData$Mate extends _i1.TooltipThemeData with _i2.Mate { - /// TooltipThemeData TooltipThemeData({double? height, EdgeInsetsGeometry? padding, EdgeInsetsGeometry? margin, double? verticalOffset, bool? preferBelow, bool? excludeFromSemantics, Decoration? decoration, TextStyle? textStyle, TextAlign? textAlign, Duration? waitDuration, Duration? showDuration, TooltipTriggerMode? triggerMode, bool? enableFeedback}) + /// TooltipThemeData TooltipThemeData({double? height, EdgeInsetsGeometry? padding, EdgeInsetsGeometry? margin, double? verticalOffset, bool? preferBelow, bool? excludeFromSemantics, Decoration? decoration, TextStyle? textStyle, TextAlign? textAlign, Duration? waitDuration, Duration? showDuration, Duration? exitDuration, TooltipTriggerMode? triggerMode, bool? enableFeedback}) TooltipThemeData$Mate({ /// optionalParameters: {double? height} , default:none super.height, @@ -47,6 +47,9 @@ class TooltipThemeData$Mate extends _i1.TooltipThemeData with _i2.Mate { /// optionalParameters: {Duration? showDuration} , default:none super.showDuration, + /// optionalParameters: {Duration? exitDuration} , default:none + super.exitDuration, + /// optionalParameters: {TooltipTriggerMode? triggerMode} , default:none super.triggerMode, @@ -108,6 +111,11 @@ class TooltipThemeData$Mate extends _i1.TooltipThemeData with _i2.Mate { init: showDuration, isNamed: true, ), + 'exitDuration': _i2.BuilderArg( + name: 'exitDuration', + init: exitDuration, + isNamed: true, + ), 'triggerMode': _i2.BuilderArg<_i1.TooltipTriggerMode?>( name: 'triggerMode', init: triggerMode, @@ -134,6 +142,7 @@ class TooltipThemeData$Mate extends _i1.TooltipThemeData with _i2.Mate { textAlign: p.get('textAlign').build(), waitDuration: p.get('waitDuration').build(), showDuration: p.get('showDuration').build(), + exitDuration: p.get('exitDuration').build(), triggerMode: p.get('triggerMode').build(), enableFeedback: p.get('enableFeedback').build(), ); diff --git a/mate_flutter/lib/src/painting/colors.dart b/mate_flutter/lib/src/painting/colors.dart index fd622538..99bccff3 100644 --- a/mate_flutter/lib/src/painting/colors.dart +++ b/mate_flutter/lib/src/painting/colors.dart @@ -147,7 +147,7 @@ class ColorSwatch$Mate extends _i1.ColorSwatch with _i2.Mate { /// class ColorProperty extends DiagnosticsProperty class ColorProperty$Mate extends _i1.ColorProperty with _i2.Mate { - /// ColorProperty ColorProperty(String name, Color? value, {bool showName = true, Object? defaultValue = kNoDefaultValue, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// ColorProperty ColorProperty(String name, Color? value, {bool showName = true, Object? defaultValue = kNoDefaultValue, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) ColorProperty$Mate( /// requiredParameters: String name super.name, @@ -163,7 +163,7 @@ class ColorProperty$Mate extends _i1.ColorProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( diff --git a/mate_flutter/lib/src/painting/matrix_utils.dart b/mate_flutter/lib/src/painting/matrix_utils.dart index 9fc96b6c..ad924d92 100644 --- a/mate_flutter/lib/src/painting/matrix_utils.dart +++ b/mate_flutter/lib/src/painting/matrix_utils.dart @@ -9,7 +9,7 @@ import 'package:flutter/foundation.dart' as _i5; /// class TransformProperty extends DiagnosticsProperty class TransformProperty$Mate extends _i1.TransformProperty with _i2.Mate { - /// TransformProperty TransformProperty(String name, Matrix4? value, {bool showName = true, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// TransformProperty TransformProperty(String name, Matrix4? value, {bool showName = true, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.info}) TransformProperty$Mate( /// requiredParameters: String name super.name, @@ -22,7 +22,7 @@ class TransformProperty$Mate extends _i1.TransformProperty with _i2.Mate { /// optionalParameters: {Object? defaultValue = kNoDefaultValue} , default:unprocessed=SimpleIdentifierImpl super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( diff --git a/mate_flutter/lib/src/rendering/animated_size.dart b/mate_flutter/lib/src/rendering/animated_size.dart index 2cdf226d..4cfe9757 100644 --- a/mate_flutter/lib/src/rendering/animated_size.dart +++ b/mate_flutter/lib/src/rendering/animated_size.dart @@ -13,7 +13,7 @@ import 'package:flutter/src/rendering/box.dart' as _i9; /// class RenderAnimatedSize extends RenderAligningShiftedBox class RenderAnimatedSize$Mate extends _i1.RenderAnimatedSize with _i2.Mate { - /// RenderAnimatedSize RenderAnimatedSize({required TickerProvider vsync, required Duration duration, Duration? reverseDuration, Curve curve = Curves.linear, AlignmentGeometry alignment = Alignment.center, TextDirection? textDirection, RenderBox? child, Clip clipBehavior = Clip.hardEdge}) + /// RenderAnimatedSize RenderAnimatedSize({required TickerProvider vsync, required Duration duration, Duration? reverseDuration, Curve curve = Curves.linear, AlignmentGeometry alignment = Alignment.center, TextDirection? textDirection, RenderBox? child, Clip clipBehavior = Clip.hardEdge, void Function()? onEnd}) RenderAnimatedSize$Mate({ /// optionalParameters: {required TickerProvider vsync} , default:none required super.vsync, @@ -38,6 +38,9 @@ class RenderAnimatedSize$Mate extends _i1.RenderAnimatedSize with _i2.Mate { /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl super.clipBehavior, + + /// optionalParameters: {void Function()? onEnd} , default:none + super.onEnd, }) : mateParams = { 'vsync': _i2.BuilderArg<_i3.TickerProvider>( name: 'vsync', @@ -82,6 +85,11 @@ class RenderAnimatedSize$Mate extends _i1.RenderAnimatedSize with _i2.Mate { isNamed: true, defaultValue: _i8.Clip.hardEdge, ), + 'onEnd': _i2.BuilderArg<_i8.VoidCallback?>( + name: 'onEnd', + init: onEnd, + isNamed: true, + ), }, super() { mateBuilderName = 'RenderAnimatedSize'; @@ -95,6 +103,7 @@ class RenderAnimatedSize$Mate extends _i1.RenderAnimatedSize with _i2.Mate { textDirection: p.get('textDirection').build(), child: p.get('child').build(), clipBehavior: p.get('clipBehavior').build(), + onEnd: p.get('onEnd').build(), ); } diff --git a/mate_flutter/lib/src/rendering/shifted_box.dart b/mate_flutter/lib/src/rendering/shifted_box.dart index e6330080..d78ee022 100644 --- a/mate_flutter/lib/src/rendering/shifted_box.dart +++ b/mate_flutter/lib/src/rendering/shifted_box.dart @@ -8,6 +8,7 @@ import 'dart:ui' as _i4; import 'package:flutter/src/rendering/box.dart' as _i5; import 'package:flutter/src/painting/alignment.dart' as _i6; import 'package:flutter/cupertino.dart' as _i7; +import 'package:flutter/rendering.dart' as _i8; /// class RenderPadding extends RenderShiftedBox class RenderPadding$Mate extends _i1.RenderPadding with _i2.Mate { @@ -116,7 +117,7 @@ class RenderPositionedBox$Mate extends _i1.RenderPositionedBox with _i2.Mate { /// class RenderConstrainedOverflowBox extends RenderAligningShiftedBox class RenderConstrainedOverflowBox$Mate extends _i1.RenderConstrainedOverflowBox with _i2.Mate { - /// RenderConstrainedOverflowBox RenderConstrainedOverflowBox({RenderBox? child, double? minWidth, double? maxWidth, double? minHeight, double? maxHeight, AlignmentGeometry alignment = Alignment.center, TextDirection? textDirection}) + /// RenderConstrainedOverflowBox RenderConstrainedOverflowBox({RenderBox? child, double? minWidth, double? maxWidth, double? minHeight, double? maxHeight, OverflowBoxFit fit = OverflowBoxFit.max, AlignmentGeometry alignment = Alignment.center, TextDirection? textDirection}) RenderConstrainedOverflowBox$Mate({ /// optionalParameters: {RenderBox? child} , default:none super.child, @@ -133,6 +134,9 @@ class RenderConstrainedOverflowBox$Mate extends _i1.RenderConstrainedOverflowBox /// optionalParameters: {double? maxHeight} , default:none super.maxHeight, + /// optionalParameters: {OverflowBoxFit fit = OverflowBoxFit.max} , default:processed=PrefixedIdentifierImpl + super.fit, + /// optionalParameters: {AlignmentGeometry alignment = Alignment.center} , default:processed=PrefixedIdentifierImpl super.alignment, @@ -164,6 +168,12 @@ class RenderConstrainedOverflowBox$Mate extends _i1.RenderConstrainedOverflowBox init: maxHeight, isNamed: true, ), + 'fit': _i2.BuilderArg<_i1.OverflowBoxFit>( + name: 'fit', + init: fit, + isNamed: true, + defaultValue: _i8.OverflowBoxFit.max, + ), 'alignment': _i2.BuilderArg<_i6.AlignmentGeometry>( name: 'alignment', init: alignment, @@ -185,6 +195,7 @@ class RenderConstrainedOverflowBox$Mate extends _i1.RenderConstrainedOverflowBox maxWidth: p.get('maxWidth').build(), minHeight: p.get('minHeight').build(), maxHeight: p.get('maxHeight').build(), + fit: p.get('fit').build(), alignment: p.get('alignment').build(), textDirection: p.get('textDirection').build(), ); diff --git a/mate_flutter/lib/src/semantics/semantics.dart b/mate_flutter/lib/src/semantics/semantics.dart index 88fc2c8a..4b309a8b 100644 --- a/mate_flutter/lib/src/semantics/semantics.dart +++ b/mate_flutter/lib/src/semantics/semantics.dart @@ -121,7 +121,7 @@ class AttributedString$Mate extends _i1.AttributedString with _i2.Mate { /// class AttributedStringProperty extends DiagnosticsProperty class AttributedStringProperty$Mate extends _i1.AttributedStringProperty with _i2.Mate { - /// AttributedStringProperty AttributedStringProperty(String name, AttributedString? value, {bool showName = true, bool showWhenEmpty = false, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.app_info, String? description}) + /// AttributedStringProperty AttributedStringProperty(String name, AttributedString? value, {bool showName = true, bool showWhenEmpty = false, Object? defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.info, String? description}) AttributedStringProperty$Mate( /// requiredParameters: String name super.name, @@ -137,7 +137,7 @@ class AttributedStringProperty$Mate extends _i1.AttributedStringProperty with _i /// optionalParameters: {Object? defaultValue = kNoDefaultValue} , default:unprocessed=SimpleIdentifierImpl super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, /// optionalParameters: {String? description} , default:none @@ -202,7 +202,7 @@ class AttributedStringProperty$Mate extends _i1.AttributedStringProperty with _i /// class SemanticsData with Diagnosticable class SemanticsData$Mate extends _i1.SemanticsData with _i2.Mate { - /// SemanticsData SemanticsData({required int flags, required int actions, required AttributedString attributedLabel, required AttributedString attributedValue, required AttributedString attributedIncreasedValue, required AttributedString attributedDecreasedValue, required AttributedString attributedHint, required String tooltip, required TextDirection? textDirection, required Rect rect, required double elevation, required double thickness, required TextSelection? textSelection, required int? scrollIndex, required int? scrollChildCount, required double? scrollPosition, required double? scrollExtentMax, required double? scrollExtentMin, required int? platformViewId, required int? maxValueLength, required int? currentValueLength, Set? tags, Matrix4? transform, List? customSemanticsActionIds}) + /// SemanticsData SemanticsData({required int flags, required int actions, required String identifier, required AttributedString attributedLabel, required AttributedString attributedValue, required AttributedString attributedIncreasedValue, required AttributedString attributedDecreasedValue, required AttributedString attributedHint, required String tooltip, required TextDirection? textDirection, required Rect rect, required double elevation, required double thickness, required TextSelection? textSelection, required int? scrollIndex, required int? scrollChildCount, required double? scrollPosition, required double? scrollExtentMax, required double? scrollExtentMin, required int? platformViewId, required int? maxValueLength, required int? currentValueLength, Set? tags, Matrix4? transform, List? customSemanticsActionIds}) SemanticsData$Mate({ /// optionalParameters: {required int flags} , default:none required super.flags, @@ -210,6 +210,9 @@ class SemanticsData$Mate extends _i1.SemanticsData with _i2.Mate { /// optionalParameters: {required int actions} , default:none required super.actions, + /// optionalParameters: {required String identifier} , default:none + required super.identifier, + /// optionalParameters: {required AttributedString attributedLabel} , default:none required super.attributedLabel, @@ -286,6 +289,11 @@ class SemanticsData$Mate extends _i1.SemanticsData with _i2.Mate { init: actions, isNamed: true, ), + 'identifier': _i2.BuilderArg( + name: 'identifier', + init: identifier, + isNamed: true, + ), 'attributedLabel': _i2.BuilderArg<_i1.AttributedString>( name: 'attributedLabel', init: attributedLabel, @@ -403,6 +411,7 @@ class SemanticsData$Mate extends _i1.SemanticsData with _i2.Mate { mateBuilder = (p) => SemanticsData$Mate( flags: p.get('flags').build(), actions: p.get('actions').build(), + identifier: p.get('identifier').build(), attributedLabel: p.get('attributedLabel').build(), attributedValue: p.get('attributedValue').build(), attributedIncreasedValue: p.get('attributedIncreasedValue').build(), @@ -468,7 +477,7 @@ class SemanticsHintOverrides$Mate extends _i1.SemanticsHintOverrides with _i2.Ma /// class SemanticsProperties extends DiagnosticableTree class SemanticsProperties$Mate extends _i1.SemanticsProperties with _i2.Mate { - /// SemanticsProperties SemanticsProperties({bool? enabled, bool? checked, bool? mixed, bool? expanded, bool? selected, bool? toggled, bool? button, bool? link, bool? header, bool? textField, bool? slider, bool? keyboardKey, bool? readOnly, bool? focusable, bool? focused, bool? inMutuallyExclusiveGroup, bool? hidden, bool? obscured, bool? multiline, bool? scopesRoute, bool? namesRoute, bool? image, bool? liveRegion, int? maxValueLength, int? currentValueLength, String? label, AttributedString? attributedLabel, String? value, AttributedString? attributedValue, String? increasedValue, AttributedString? attributedIncreasedValue, String? decreasedValue, AttributedString? attributedDecreasedValue, String? hint, String? tooltip, AttributedString? attributedHint, SemanticsHintOverrides? hintOverrides, TextDirection? textDirection, SemanticsSortKey? sortKey, SemanticsTag? tagForChildren, void Function()? onTap, void Function()? onLongPress, void Function()? onScrollLeft, void Function()? onScrollRight, void Function()? onScrollUp, void Function()? onScrollDown, void Function()? onIncrease, void Function()? onDecrease, void Function()? onCopy, void Function()? onCut, void Function()? onPaste, void Function(bool)? onMoveCursorForwardByCharacter, void Function(bool)? onMoveCursorBackwardByCharacter, void Function(bool)? onMoveCursorForwardByWord, void Function(bool)? onMoveCursorBackwardByWord, void Function(TextSelection)? onSetSelection, void Function(String)? onSetText, void Function()? onDidGainAccessibilityFocus, void Function()? onDidLoseAccessibilityFocus, void Function()? onDismiss, Map? customSemanticsActions}) + /// SemanticsProperties SemanticsProperties({bool? enabled, bool? checked, bool? mixed, bool? expanded, bool? selected, bool? toggled, bool? button, bool? link, bool? header, bool? textField, bool? slider, bool? keyboardKey, bool? readOnly, bool? focusable, bool? focused, bool? inMutuallyExclusiveGroup, bool? hidden, bool? obscured, bool? multiline, bool? scopesRoute, bool? namesRoute, bool? image, bool? liveRegion, int? maxValueLength, int? currentValueLength, String? identifier, String? label, AttributedString? attributedLabel, String? value, AttributedString? attributedValue, String? increasedValue, AttributedString? attributedIncreasedValue, String? decreasedValue, AttributedString? attributedDecreasedValue, String? hint, String? tooltip, AttributedString? attributedHint, SemanticsHintOverrides? hintOverrides, TextDirection? textDirection, SemanticsSortKey? sortKey, SemanticsTag? tagForChildren, void Function()? onTap, void Function()? onLongPress, void Function()? onScrollLeft, void Function()? onScrollRight, void Function()? onScrollUp, void Function()? onScrollDown, void Function()? onIncrease, void Function()? onDecrease, void Function()? onCopy, void Function()? onCut, void Function()? onPaste, void Function(bool)? onMoveCursorForwardByCharacter, void Function(bool)? onMoveCursorBackwardByCharacter, void Function(bool)? onMoveCursorForwardByWord, void Function(bool)? onMoveCursorBackwardByWord, void Function(TextSelection)? onSetSelection, void Function(String)? onSetText, void Function()? onDidGainAccessibilityFocus, void Function()? onDidLoseAccessibilityFocus, void Function()? onDismiss, Map? customSemanticsActions}) SemanticsProperties$Mate({ /// optionalParameters: {bool? enabled} , default:none super.enabled, @@ -545,6 +554,9 @@ class SemanticsProperties$Mate extends _i1.SemanticsProperties with _i2.Mate { /// optionalParameters: {int? currentValueLength} , default:none super.currentValueLength, + /// optionalParameters: {String? identifier} , default:none + super.identifier, + /// optionalParameters: {String? label} , default:none super.label, @@ -778,6 +790,11 @@ class SemanticsProperties$Mate extends _i1.SemanticsProperties with _i2.Mate { init: currentValueLength, isNamed: true, ), + 'identifier': _i2.BuilderArg( + name: 'identifier', + init: identifier, + isNamed: true, + ), 'label': _i2.BuilderArg( name: 'label', init: label, @@ -988,6 +1005,7 @@ class SemanticsProperties$Mate extends _i1.SemanticsProperties with _i2.Mate { liveRegion: p.get('liveRegion').build(), maxValueLength: p.get('maxValueLength').build(), currentValueLength: p.get('currentValueLength').build(), + identifier: p.get('identifier').build(), label: p.get('label').build(), attributedLabel: p.get('attributedLabel').build(), value: p.get('value').build(), diff --git a/mate_flutter/lib/src/services/hardware_keyboard.dart b/mate_flutter/lib/src/services/hardware_keyboard.dart index 7a516945..4f70a2f0 100644 --- a/mate_flutter/lib/src/services/hardware_keyboard.dart +++ b/mate_flutter/lib/src/services/hardware_keyboard.dart @@ -4,11 +4,12 @@ import 'package:flutter/src/services/hardware_keyboard.dart' as _i1; import 'package:mate/mate_core.dart' as _i2; import 'package:flutter/src/services/keyboard_key.g.dart' as _i3; -import 'package:flutter/src/services/raw_keyboard.dart' as _i4; +import 'dart:ui' as _i4; +import 'package:flutter/src/services/raw_keyboard.dart' as _i5; /// class KeyDownEvent extends KeyEvent class KeyDownEvent$Mate extends _i1.KeyDownEvent with _i2.Mate { - /// KeyDownEvent KeyDownEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, String? character, required Duration timeStamp, bool synthesized = false}) + /// KeyDownEvent KeyDownEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, String? character, required Duration timeStamp, bool synthesized = false, KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard}) KeyDownEvent$Mate({ /// optionalParameters: {required PhysicalKeyboardKey physicalKey} , default:none required super.physicalKey, @@ -24,6 +25,9 @@ class KeyDownEvent$Mate extends _i1.KeyDownEvent with _i2.Mate { /// optionalParameters: {bool synthesized = false} , default:processed=BooleanLiteralImpl super.synthesized, + + /// optionalParameters: {KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard} , default:unprocessed=PropertyAccessImpl + super.deviceType, }) : mateParams = { 'physicalKey': _i2.BuilderArg<_i3.PhysicalKeyboardKey>( name: 'physicalKey', @@ -51,6 +55,11 @@ class KeyDownEvent$Mate extends _i1.KeyDownEvent with _i2.Mate { isNamed: true, defaultValue: false, ), + 'deviceType': _i2.BuilderArg<_i4.KeyEventDeviceType>( + name: 'deviceType', + init: deviceType, + isNamed: true, + ), }, super() { mateBuilderName = 'KeyDownEvent'; @@ -61,6 +70,7 @@ class KeyDownEvent$Mate extends _i1.KeyDownEvent with _i2.Mate { character: p.get('character').build(), timeStamp: p.get('timeStamp').build(), synthesized: p.get('synthesized').build(), + deviceType: p.get('deviceType').build(), ); } @@ -70,7 +80,7 @@ class KeyDownEvent$Mate extends _i1.KeyDownEvent with _i2.Mate { /// class KeyUpEvent extends KeyEvent class KeyUpEvent$Mate extends _i1.KeyUpEvent with _i2.Mate { - /// KeyUpEvent KeyUpEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, required Duration timeStamp, bool synthesized = false}) + /// KeyUpEvent KeyUpEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, required Duration timeStamp, bool synthesized = false, KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard}) KeyUpEvent$Mate({ /// optionalParameters: {required PhysicalKeyboardKey physicalKey} , default:none required super.physicalKey, @@ -83,6 +93,9 @@ class KeyUpEvent$Mate extends _i1.KeyUpEvent with _i2.Mate { /// optionalParameters: {bool synthesized = false} , default:processed=BooleanLiteralImpl super.synthesized, + + /// optionalParameters: {KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard} , default:unprocessed=PropertyAccessImpl + super.deviceType, }) : mateParams = { 'physicalKey': _i2.BuilderArg<_i3.PhysicalKeyboardKey>( name: 'physicalKey', @@ -105,6 +118,11 @@ class KeyUpEvent$Mate extends _i1.KeyUpEvent with _i2.Mate { isNamed: true, defaultValue: false, ), + 'deviceType': _i2.BuilderArg<_i4.KeyEventDeviceType>( + name: 'deviceType', + init: deviceType, + isNamed: true, + ), }, super() { mateBuilderName = 'KeyUpEvent'; @@ -114,6 +132,7 @@ class KeyUpEvent$Mate extends _i1.KeyUpEvent with _i2.Mate { logicalKey: p.get('logicalKey').build(), timeStamp: p.get('timeStamp').build(), synthesized: p.get('synthesized').build(), + deviceType: p.get('deviceType').build(), ); } @@ -123,7 +142,7 @@ class KeyUpEvent$Mate extends _i1.KeyUpEvent with _i2.Mate { /// class KeyRepeatEvent extends KeyEvent class KeyRepeatEvent$Mate extends _i1.KeyRepeatEvent with _i2.Mate { - /// KeyRepeatEvent KeyRepeatEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, String? character, required Duration timeStamp}) + /// KeyRepeatEvent KeyRepeatEvent({required PhysicalKeyboardKey physicalKey, required LogicalKeyboardKey logicalKey, String? character, required Duration timeStamp, KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard}) KeyRepeatEvent$Mate({ /// optionalParameters: {required PhysicalKeyboardKey physicalKey} , default:none required super.physicalKey, @@ -136,6 +155,9 @@ class KeyRepeatEvent$Mate extends _i1.KeyRepeatEvent with _i2.Mate { /// optionalParameters: {required Duration timeStamp} , default:none required super.timeStamp, + + /// optionalParameters: {KeyEventDeviceType deviceType = ui.KeyEventDeviceType.keyboard} , default:unprocessed=PropertyAccessImpl + super.deviceType, }) : mateParams = { 'physicalKey': _i2.BuilderArg<_i3.PhysicalKeyboardKey>( name: 'physicalKey', @@ -157,6 +179,11 @@ class KeyRepeatEvent$Mate extends _i1.KeyRepeatEvent with _i2.Mate { init: timeStamp, isNamed: true, ), + 'deviceType': _i2.BuilderArg<_i4.KeyEventDeviceType>( + name: 'deviceType', + init: deviceType, + isNamed: true, + ), }, super() { mateBuilderName = 'KeyRepeatEvent'; @@ -166,6 +193,7 @@ class KeyRepeatEvent$Mate extends _i1.KeyRepeatEvent with _i2.Mate { logicalKey: p.get('logicalKey').build(), character: p.get('character').build(), timeStamp: p.get('timeStamp').build(), + deviceType: p.get('deviceType').build(), ); } @@ -188,7 +216,7 @@ class KeyMessage$Mate extends _i1.KeyMessage with _i2.Mate { init: events, isNamed: false, ), - 'rawEvent': _i2.BuilderArg<_i4.RawKeyEvent?>( + 'rawEvent': _i2.BuilderArg<_i5.RawKeyEvent?>( name: 'rawEvent', init: rawEvent, isNamed: false, @@ -222,7 +250,7 @@ class KeyEventManager$Mate extends _i1.KeyEventManager with _i2.Mate { init: _hardwareKeyboard, isNamed: false, ), - '_rawKeyboard': _i2.BuilderArg<_i4.RawKeyboard>( + '_rawKeyboard': _i2.BuilderArg<_i5.RawKeyboard>( name: '_rawKeyboard', init: _rawKeyboard, isNamed: false, diff --git a/mate_flutter/lib/src/services/process_text.dart b/mate_flutter/lib/src/services/process_text.dart new file mode 100644 index 00000000..ebd094f7 --- /dev/null +++ b/mate_flutter/lib/src/services/process_text.dart @@ -0,0 +1,39 @@ +// /// Generated by gen_maters.dart, please don't edit! + +// ignore_for_file: no_leading_underscores_for_library_prefixes +import 'package:flutter/src/services/process_text.dart' as _i1; +import 'package:mate/mate_core.dart' as _i2; + +/// class ProcessTextAction +class ProcessTextAction$Mate extends _i1.ProcessTextAction with _i2.Mate { + /// ProcessTextAction ProcessTextAction(String id, String label) + ProcessTextAction$Mate( + /// requiredParameters: String id + super.id, + + /// requiredParameters: String label + super.label, + ) : mateParams = { + 'id': _i2.BuilderArg( + name: 'id', + init: id, + isNamed: false, + ), + 'label': _i2.BuilderArg( + name: 'label', + init: label, + isNamed: false, + ), + }, + super() { + mateBuilderName = 'ProcessTextAction'; + matePackageUrl = 'package:flutter/services.dart'; + mateBuilder = (p) => ProcessTextAction$Mate( + p.get('id').value, + p.get('label').value, + ); + } + + @override + final Map mateParams; +} diff --git a/mate_flutter/lib/src/services/text_input.dart b/mate_flutter/lib/src/services/text_input.dart index 3b07a985..3fbfd85d 100644 --- a/mate_flutter/lib/src/services/text_input.dart +++ b/mate_flutter/lib/src/services/text_input.dart @@ -217,40 +217,6 @@ class TextInputConfiguration$Mate extends _i1.TextInputConfiguration with _i2.Ma final Map mateParams; } -/// class RawFloatingCursorPoint -class RawFloatingCursorPoint$Mate extends _i1.RawFloatingCursorPoint with _i2.Mate { - /// RawFloatingCursorPoint RawFloatingCursorPoint({Offset? offset, required FloatingCursorDragState state}) - RawFloatingCursorPoint$Mate({ - /// optionalParameters: {Offset? offset} , default:none - super.offset, - - /// optionalParameters: {required FloatingCursorDragState state} , default:none - required super.state, - }) : mateParams = { - 'offset': _i2.BuilderArg<_i4.Offset?>( - name: 'offset', - init: offset, - isNamed: true, - ), - 'state': _i2.BuilderArg<_i1.FloatingCursorDragState>( - name: 'state', - init: state, - isNamed: true, - ), - }, - super() { - mateBuilderName = 'RawFloatingCursorPoint'; - matePackageUrl = 'package:flutter/services.dart'; - mateBuilder = (p) => RawFloatingCursorPoint$Mate( - offset: p.get('offset').build(), - state: p.get('state').build(), - ); - } - - @override - final Map mateParams; -} - /// class TextEditingValue class TextEditingValue$Mate extends _i1.TextEditingValue with _i2.Mate { /// TextEditingValue TextEditingValue({String text = '', TextSelection selection = const TextSelection.collapsed(offset: -1), TextRange composing = TextRange.empty}) diff --git a/mate_flutter/lib/src/widgets/animated_size.dart b/mate_flutter/lib/src/widgets/animated_size.dart index 5bfb8121..6b3e2901 100644 --- a/mate_flutter/lib/src/widgets/animated_size.dart +++ b/mate_flutter/lib/src/widgets/animated_size.dart @@ -13,7 +13,7 @@ import 'dart:ui' as _i9; /// class AnimatedSize extends StatefulWidget class AnimatedSize$Mate extends _i1.AnimatedSize with _i2.Mate { - /// AnimatedSize AnimatedSize({Key? key, Widget? child, AlignmentGeometry alignment = Alignment.center, Curve curve = Curves.linear, required Duration duration, Duration? reverseDuration, Clip clipBehavior = Clip.hardEdge}) + /// AnimatedSize AnimatedSize({Key? key, Widget? child, AlignmentGeometry alignment = Alignment.center, Curve curve = Curves.linear, required Duration duration, Duration? reverseDuration, Clip clipBehavior = Clip.hardEdge, void Function()? onEnd}) AnimatedSize$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -35,6 +35,9 @@ class AnimatedSize$Mate extends _i1.AnimatedSize with _i2.Mate { /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl super.clipBehavior, + + /// optionalParameters: {void Function()? onEnd} , default:none + super.onEnd, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -74,6 +77,11 @@ class AnimatedSize$Mate extends _i1.AnimatedSize with _i2.Mate { isNamed: true, defaultValue: _i9.Clip.hardEdge, ), + 'onEnd': _i2.BuilderArg<_i9.VoidCallback?>( + name: 'onEnd', + init: onEnd, + isNamed: true, + ), }, super() { mateBuilderName = 'AnimatedSize'; @@ -86,6 +94,7 @@ class AnimatedSize$Mate extends _i1.AnimatedSize with _i2.Mate { duration: p.get('duration').build(), reverseDuration: p.get('reverseDuration').build(), clipBehavior: p.get('clipBehavior').build(), + onEnd: p.get('onEnd').build(), ); } diff --git a/mate_flutter/lib/src/widgets/banner.dart b/mate_flutter/lib/src/widgets/banner.dart index 8cb42a7e..4bd0a7ac 100644 --- a/mate_flutter/lib/src/widgets/banner.dart +++ b/mate_flutter/lib/src/widgets/banner.dart @@ -78,7 +78,7 @@ class BannerPainter$Mate extends _i1.BannerPainter with _i2.Mate { final Map mateParams; } -/// class Banner extends StatelessWidget +/// class Banner extends StatefulWidget class Banner$Mate extends _i1.Banner with _i2.Mate { /// Banner Banner({Key? key, Widget? child, required String message, TextDirection? textDirection, required BannerLocation location, TextDirection? layoutDirection, Color color = _kColor, TextStyle textStyle = _kTextStyle}) Banner$Mate({ diff --git a/mate_flutter/lib/src/widgets/basic.dart b/mate_flutter/lib/src/widgets/basic.dart index 3ba69ada..0e6327b4 100644 --- a/mate_flutter/lib/src/widgets/basic.dart +++ b/mate_flutter/lib/src/widgets/basic.dart @@ -21,21 +21,22 @@ import 'package:flutter/src/rendering/shifted_box.dart' as _i17; import 'package:flutter/src/rendering/custom_layout.dart' as _i18; import 'package:flutter/src/rendering/box.dart' as _i19; import 'package:flutter/src/painting/basic_types.dart' as _i20; -import 'package:flutter/src/rendering/stack.dart' as _i21; -import 'package:flutter/src/rendering/flex.dart' as _i22; -import 'package:flutter/src/rendering/wrap.dart' as _i23; -import 'package:flutter/src/rendering/flow.dart' as _i24; -import 'package:flutter/src/painting/inline_span.dart' as _i25; -import 'package:flutter/src/painting/text_painter.dart' as _i26; -import 'package:flutter/src/painting/text_scaler.dart' as _i27; -import 'package:flutter/src/painting/strut_style.dart' as _i28; -import 'package:flutter/src/rendering/selection.dart' as _i29; -import 'package:flutter/src/animation/animation.dart' as _i30; -import 'package:flutter/src/painting/decoration_image.dart' as _i31; -import 'package:flutter/src/services/asset_bundle.dart' as _i32; -import 'package:flutter/src/services/mouse_tracking.dart' as _i33; -import 'package:flutter/src/services/mouse_cursor.dart' as _i34; -import 'package:flutter/src/semantics/semantics.dart' as _i35; +import 'package:flutter/rendering.dart' as _i21; +import 'package:flutter/src/rendering/stack.dart' as _i22; +import 'package:flutter/src/rendering/flex.dart' as _i23; +import 'package:flutter/src/rendering/wrap.dart' as _i24; +import 'package:flutter/src/rendering/flow.dart' as _i25; +import 'package:flutter/src/painting/inline_span.dart' as _i26; +import 'package:flutter/src/painting/text_painter.dart' as _i27; +import 'package:flutter/src/painting/text_scaler.dart' as _i28; +import 'package:flutter/src/painting/strut_style.dart' as _i29; +import 'package:flutter/src/rendering/selection.dart' as _i30; +import 'package:flutter/src/animation/animation.dart' as _i31; +import 'package:flutter/src/painting/decoration_image.dart' as _i32; +import 'package:flutter/src/services/asset_bundle.dart' as _i33; +import 'package:flutter/src/services/mouse_tracking.dart' as _i34; +import 'package:flutter/src/services/mouse_cursor.dart' as _i35; +import 'package:flutter/src/semantics/semantics.dart' as _i36; export 'package:flutter/animation.dart'; export 'package:flutter/painting.dart'; @@ -2166,7 +2167,7 @@ class LimitedBox$Mate extends _i1.LimitedBox with _i2.Mate { /// class OverflowBox extends SingleChildRenderObjectWidget class OverflowBox$Mate extends _i1.OverflowBox with _i2.Mate { - /// OverflowBox OverflowBox({Key? key, AlignmentGeometry alignment = Alignment.center, double? minWidth, double? maxWidth, double? minHeight, double? maxHeight, Widget? child}) + /// OverflowBox OverflowBox({Key? key, AlignmentGeometry alignment = Alignment.center, double? minWidth, double? maxWidth, double? minHeight, double? maxHeight, OverflowBoxFit fit = OverflowBoxFit.max, Widget? child}) OverflowBox$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -2186,6 +2187,9 @@ class OverflowBox$Mate extends _i1.OverflowBox with _i2.Mate { /// optionalParameters: {double? maxHeight} , default:none super.maxHeight, + /// optionalParameters: {OverflowBoxFit fit = OverflowBoxFit.max} , default:processed=PrefixedIdentifierImpl + super.fit, + /// optionalParameters: {Widget? child} , default:none super.child, }) : mateParams = { @@ -2220,6 +2224,12 @@ class OverflowBox$Mate extends _i1.OverflowBox with _i2.Mate { init: maxHeight, isNamed: true, ), + 'fit': _i2.BuilderArg<_i17.OverflowBoxFit>( + name: 'fit', + init: fit, + isNamed: true, + defaultValue: _i21.OverflowBoxFit.max, + ), 'child': _i2.BuilderArg<_i5.Widget?>( name: 'child', init: child, @@ -2236,6 +2246,7 @@ class OverflowBox$Mate extends _i1.OverflowBox with _i2.Mate { maxWidth: p.get('maxWidth').build(), minHeight: p.get('minHeight').build(), maxHeight: p.get('maxHeight').build(), + fit: p.get('fit').build(), child: p.get('child').build(), ); } @@ -2725,7 +2736,7 @@ class Stack$Mate extends _i1.Stack with _i2.Mate { init: textDirection, isNamed: true, ), - 'fit': _i2.BuilderArg<_i21.StackFit>( + 'fit': _i2.BuilderArg<_i22.StackFit>( name: 'fit', init: fit, isNamed: true, @@ -2807,7 +2818,7 @@ class IndexedStack$Mate extends _i1.IndexedStack with _i2.Mate { isNamed: true, defaultValue: _i4.Clip.hardEdge, ), - 'sizing': _i2.BuilderArg<_i21.StackFit>( + 'sizing': _i2.BuilderArg<_i22.StackFit>( name: 'sizing', init: sizing, isNamed: true, @@ -2980,7 +2991,7 @@ class Positioned$Mate extends _i1.Positioned with _i2.Mate { init: key, isNamed: true, ), - 'rect': _i2.BuilderArg<_i21.RelativeRect>( + 'rect': _i2.BuilderArg<_i22.RelativeRect>( name: 'rect', init: rect, isNamed: true, @@ -3205,19 +3216,19 @@ class Flex$Mate extends _i1.Flex with _i2.Mate { init: direction, isNamed: true, ), - 'mainAxisAlignment': _i2.BuilderArg<_i22.MainAxisAlignment>( + 'mainAxisAlignment': _i2.BuilderArg<_i23.MainAxisAlignment>( name: 'mainAxisAlignment', init: mainAxisAlignment, isNamed: true, defaultValue: _i10.MainAxisAlignment.start, ), - 'mainAxisSize': _i2.BuilderArg<_i22.MainAxisSize>( + 'mainAxisSize': _i2.BuilderArg<_i23.MainAxisSize>( name: 'mainAxisSize', init: mainAxisSize, isNamed: true, defaultValue: _i10.MainAxisSize.max, ), - 'crossAxisAlignment': _i2.BuilderArg<_i22.CrossAxisAlignment>( + 'crossAxisAlignment': _i2.BuilderArg<_i23.CrossAxisAlignment>( name: 'crossAxisAlignment', init: crossAxisAlignment, isNamed: true, @@ -3305,19 +3316,19 @@ class Row$Mate extends _i1.Row with _i2.Mate { init: key, isNamed: true, ), - 'mainAxisAlignment': _i2.BuilderArg<_i22.MainAxisAlignment>( + 'mainAxisAlignment': _i2.BuilderArg<_i23.MainAxisAlignment>( name: 'mainAxisAlignment', init: mainAxisAlignment, isNamed: true, defaultValue: _i10.MainAxisAlignment.start, ), - 'mainAxisSize': _i2.BuilderArg<_i22.MainAxisSize>( + 'mainAxisSize': _i2.BuilderArg<_i23.MainAxisSize>( name: 'mainAxisSize', init: mainAxisSize, isNamed: true, defaultValue: _i10.MainAxisSize.max, ), - 'crossAxisAlignment': _i2.BuilderArg<_i22.CrossAxisAlignment>( + 'crossAxisAlignment': _i2.BuilderArg<_i23.CrossAxisAlignment>( name: 'crossAxisAlignment', init: crossAxisAlignment, isNamed: true, @@ -3397,19 +3408,19 @@ class Column$Mate extends _i1.Column with _i2.Mate { init: key, isNamed: true, ), - 'mainAxisAlignment': _i2.BuilderArg<_i22.MainAxisAlignment>( + 'mainAxisAlignment': _i2.BuilderArg<_i23.MainAxisAlignment>( name: 'mainAxisAlignment', init: mainAxisAlignment, isNamed: true, defaultValue: _i10.MainAxisAlignment.start, ), - 'mainAxisSize': _i2.BuilderArg<_i22.MainAxisSize>( + 'mainAxisSize': _i2.BuilderArg<_i23.MainAxisSize>( name: 'mainAxisSize', init: mainAxisSize, isNamed: true, defaultValue: _i10.MainAxisSize.max, ), - 'crossAxisAlignment': _i2.BuilderArg<_i22.CrossAxisAlignment>( + 'crossAxisAlignment': _i2.BuilderArg<_i23.CrossAxisAlignment>( name: 'crossAxisAlignment', init: crossAxisAlignment, isNamed: true, @@ -3483,7 +3494,7 @@ class Flexible$Mate extends _i1.Flexible with _i2.Mate { isNamed: true, defaultValue: 1, ), - 'fit': _i2.BuilderArg<_i22.FlexFit>( + 'fit': _i2.BuilderArg<_i23.FlexFit>( name: 'fit', init: fit, isNamed: true, @@ -3602,7 +3613,7 @@ class Wrap$Mate extends _i1.Wrap with _i2.Mate { isNamed: true, defaultValue: _i10.Axis.horizontal, ), - 'alignment': _i2.BuilderArg<_i23.WrapAlignment>( + 'alignment': _i2.BuilderArg<_i24.WrapAlignment>( name: 'alignment', init: alignment, isNamed: true, @@ -3614,7 +3625,7 @@ class Wrap$Mate extends _i1.Wrap with _i2.Mate { isNamed: true, defaultValue: 0.0, ), - 'runAlignment': _i2.BuilderArg<_i23.WrapAlignment>( + 'runAlignment': _i2.BuilderArg<_i24.WrapAlignment>( name: 'runAlignment', init: runAlignment, isNamed: true, @@ -3626,7 +3637,7 @@ class Wrap$Mate extends _i1.Wrap with _i2.Mate { isNamed: true, defaultValue: 0.0, ), - 'crossAxisAlignment': _i2.BuilderArg<_i23.WrapCrossAlignment>( + 'crossAxisAlignment': _i2.BuilderArg<_i24.WrapCrossAlignment>( name: 'crossAxisAlignment', init: crossAxisAlignment, isNamed: true, @@ -3698,7 +3709,7 @@ class Flow$Mate extends _i1.Flow with _i2.Mate { init: key, isNamed: true, ), - 'delegate': _i2.BuilderArg<_i24.FlowDelegate>( + 'delegate': _i2.BuilderArg<_i25.FlowDelegate>( name: 'delegate', init: delegate, isNamed: true, @@ -3745,7 +3756,7 @@ class Flow$Mate extends _i1.Flow with _i2.Mate { init: key, isNamed: true, ), - 'delegate': _i2.BuilderArg<_i24.FlowDelegate>( + 'delegate': _i2.BuilderArg<_i25.FlowDelegate>( name: 'delegate', init: delegate, isNamed: true, @@ -3828,7 +3839,7 @@ class RichText$Mate extends _i1.RichText with _i2.Mate { init: key, isNamed: true, ), - 'text': _i2.BuilderArg<_i25.InlineSpan>( + 'text': _i2.BuilderArg<_i26.InlineSpan>( name: 'text', init: text, isNamed: true, @@ -3850,13 +3861,13 @@ class RichText$Mate extends _i1.RichText with _i2.Mate { isNamed: true, defaultValue: true, ), - 'overflow': _i2.BuilderArg<_i26.TextOverflow>( + 'overflow': _i2.BuilderArg<_i27.TextOverflow>( name: 'overflow', init: overflow, isNamed: true, defaultValue: _i10.TextOverflow.clip, ), - 'textScaler': _i2.BuilderArg<_i27.TextScaler>( + 'textScaler': _i2.BuilderArg<_i28.TextScaler>( name: 'textScaler', init: textScaler, isNamed: true, @@ -3872,12 +3883,12 @@ class RichText$Mate extends _i1.RichText with _i2.Mate { init: locale, isNamed: true, ), - 'strutStyle': _i2.BuilderArg<_i28.StrutStyle?>( + 'strutStyle': _i2.BuilderArg<_i29.StrutStyle?>( name: 'strutStyle', init: strutStyle, isNamed: true, ), - 'textWidthBasis': _i2.BuilderArg<_i26.TextWidthBasis>( + 'textWidthBasis': _i2.BuilderArg<_i27.TextWidthBasis>( name: 'textWidthBasis', init: textWidthBasis, isNamed: true, @@ -3888,7 +3899,7 @@ class RichText$Mate extends _i1.RichText with _i2.Mate { init: textHeightBehavior, isNamed: true, ), - 'selectionRegistrar': _i2.BuilderArg<_i29.SelectionRegistrar?>( + 'selectionRegistrar': _i2.BuilderArg<_i30.SelectionRegistrar?>( name: 'selectionRegistrar', init: selectionRegistrar, isNamed: true, @@ -4015,7 +4026,7 @@ class RawImage$Mate extends _i1.RawImage with _i2.Mate { init: color, isNamed: true, ), - 'opacity': _i2.BuilderArg<_i30.Animation?>( + 'opacity': _i2.BuilderArg<_i31.Animation?>( name: 'opacity', init: opacity, isNamed: true, @@ -4036,7 +4047,7 @@ class RawImage$Mate extends _i1.RawImage with _i2.Mate { isNamed: true, defaultValue: _i10.Alignment.center, ), - 'repeat': _i2.BuilderArg<_i31.ImageRepeat>( + 'repeat': _i2.BuilderArg<_i32.ImageRepeat>( name: 'repeat', init: repeat, isNamed: true, @@ -4118,7 +4129,7 @@ class DefaultAssetBundle$Mate extends _i1.DefaultAssetBundle with _i2.Mate { init: key, isNamed: true, ), - 'bundle': _i2.BuilderArg<_i32.AssetBundle>( + 'bundle': _i2.BuilderArg<_i33.AssetBundle>( name: 'bundle', init: bundle, isNamed: true, @@ -4246,7 +4257,7 @@ class Listener$Mate extends _i1.Listener with _i2.Mate { init: onPointerUp, isNamed: true, ), - 'onPointerHover': _i2.BuilderArg<_i33.PointerHoverEventListener?>( + 'onPointerHover': _i2.BuilderArg<_i34.PointerHoverEventListener?>( name: 'onPointerHover', init: onPointerHover, isNamed: true, @@ -4344,22 +4355,22 @@ class MouseRegion$Mate extends _i1.MouseRegion with _i2.Mate { init: key, isNamed: true, ), - 'onEnter': _i2.BuilderArg<_i33.PointerEnterEventListener?>( + 'onEnter': _i2.BuilderArg<_i34.PointerEnterEventListener?>( name: 'onEnter', init: onEnter, isNamed: true, ), - 'onExit': _i2.BuilderArg<_i33.PointerExitEventListener?>( + 'onExit': _i2.BuilderArg<_i34.PointerExitEventListener?>( name: 'onExit', init: onExit, isNamed: true, ), - 'onHover': _i2.BuilderArg<_i33.PointerHoverEventListener?>( + 'onHover': _i2.BuilderArg<_i34.PointerHoverEventListener?>( name: 'onHover', init: onHover, isNamed: true, ), - 'cursor': _i2.BuilderArg<_i34.MouseCursor>( + 'cursor': _i2.BuilderArg<_i35.MouseCursor>( name: 'cursor', init: cursor, isNamed: true, @@ -4578,7 +4589,7 @@ class MetaData$Mate extends _i1.MetaData with _i2.Mate { /// class Semantics extends SingleChildRenderObjectWidget class Semantics$Mate extends _i1.Semantics with _i2.Mate { - /// Semantics Semantics({Key? key, Widget? child, bool container = false, bool explicitChildNodes = false, bool excludeSemantics = false, bool blockUserActions = false, bool? enabled, bool? checked, bool? mixed, bool? selected, bool? toggled, bool? button, bool? slider, bool? keyboardKey, bool? link, bool? header, bool? textField, bool? readOnly, bool? focusable, bool? focused, bool? inMutuallyExclusiveGroup, bool? obscured, bool? multiline, bool? scopesRoute, bool? namesRoute, bool? hidden, bool? image, bool? liveRegion, bool? expanded, int? maxValueLength, int? currentValueLength, String? label, AttributedString? attributedLabel, String? value, AttributedString? attributedValue, String? increasedValue, AttributedString? attributedIncreasedValue, String? decreasedValue, AttributedString? attributedDecreasedValue, String? hint, AttributedString? attributedHint, String? tooltip, String? onTapHint, String? onLongPressHint, TextDirection? textDirection, SemanticsSortKey? sortKey, SemanticsTag? tagForChildren, void Function()? onTap, void Function()? onLongPress, void Function()? onScrollLeft, void Function()? onScrollRight, void Function()? onScrollUp, void Function()? onScrollDown, void Function()? onIncrease, void Function()? onDecrease, void Function()? onCopy, void Function()? onCut, void Function()? onPaste, void Function()? onDismiss, void Function(bool)? onMoveCursorForwardByCharacter, void Function(bool)? onMoveCursorBackwardByCharacter, void Function(TextSelection)? onSetSelection, void Function(String)? onSetText, void Function()? onDidGainAccessibilityFocus, void Function()? onDidLoseAccessibilityFocus, Map? customSemanticsActions}) + /// Semantics Semantics({Key? key, Widget? child, bool container = false, bool explicitChildNodes = false, bool excludeSemantics = false, bool blockUserActions = false, bool? enabled, bool? checked, bool? mixed, bool? selected, bool? toggled, bool? button, bool? slider, bool? keyboardKey, bool? link, bool? header, bool? textField, bool? readOnly, bool? focusable, bool? focused, bool? inMutuallyExclusiveGroup, bool? obscured, bool? multiline, bool? scopesRoute, bool? namesRoute, bool? hidden, bool? image, bool? liveRegion, bool? expanded, int? maxValueLength, int? currentValueLength, String? identifier, String? label, AttributedString? attributedLabel, String? value, AttributedString? attributedValue, String? increasedValue, AttributedString? attributedIncreasedValue, String? decreasedValue, AttributedString? attributedDecreasedValue, String? hint, AttributedString? attributedHint, String? tooltip, String? onTapHint, String? onLongPressHint, TextDirection? textDirection, SemanticsSortKey? sortKey, SemanticsTag? tagForChildren, void Function()? onTap, void Function()? onLongPress, void Function()? onScrollLeft, void Function()? onScrollRight, void Function()? onScrollUp, void Function()? onScrollDown, void Function()? onIncrease, void Function()? onDecrease, void Function()? onCopy, void Function()? onCut, void Function()? onPaste, void Function()? onDismiss, void Function(bool)? onMoveCursorForwardByCharacter, void Function(bool)? onMoveCursorBackwardByCharacter, void Function(TextSelection)? onSetSelection, void Function(String)? onSetText, void Function()? onDidGainAccessibilityFocus, void Function()? onDidLoseAccessibilityFocus, Map? customSemanticsActions}) Semantics$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -4673,6 +4684,9 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { /// optionalParameters: {int? currentValueLength} , default:none super.currentValueLength, + /// optionalParameters: {String? identifier} , default:none + super.identifier, + /// optionalParameters: {String? label} , default:none super.label, @@ -4937,12 +4951,17 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: currentValueLength, isNamed: true, ), + 'identifier': _i2.BuilderArg( + name: 'identifier', + init: identifier, + isNamed: true, + ), 'label': _i2.BuilderArg( name: 'label', init: label, isNamed: true, ), - 'attributedLabel': _i2.BuilderArg<_i35.AttributedString?>( + 'attributedLabel': _i2.BuilderArg<_i36.AttributedString?>( name: 'attributedLabel', init: attributedLabel, isNamed: true, @@ -4952,7 +4971,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: value, isNamed: true, ), - 'attributedValue': _i2.BuilderArg<_i35.AttributedString?>( + 'attributedValue': _i2.BuilderArg<_i36.AttributedString?>( name: 'attributedValue', init: attributedValue, isNamed: true, @@ -4962,7 +4981,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: increasedValue, isNamed: true, ), - 'attributedIncreasedValue': _i2.BuilderArg<_i35.AttributedString?>( + 'attributedIncreasedValue': _i2.BuilderArg<_i36.AttributedString?>( name: 'attributedIncreasedValue', init: attributedIncreasedValue, isNamed: true, @@ -4972,7 +4991,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: decreasedValue, isNamed: true, ), - 'attributedDecreasedValue': _i2.BuilderArg<_i35.AttributedString?>( + 'attributedDecreasedValue': _i2.BuilderArg<_i36.AttributedString?>( name: 'attributedDecreasedValue', init: attributedDecreasedValue, isNamed: true, @@ -4982,7 +5001,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: hint, isNamed: true, ), - 'attributedHint': _i2.BuilderArg<_i35.AttributedString?>( + 'attributedHint': _i2.BuilderArg<_i36.AttributedString?>( name: 'attributedHint', init: attributedHint, isNamed: true, @@ -5007,12 +5026,12 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: textDirection, isNamed: true, ), - 'sortKey': _i2.BuilderArg<_i35.SemanticsSortKey?>( + 'sortKey': _i2.BuilderArg<_i36.SemanticsSortKey?>( name: 'sortKey', init: sortKey, isNamed: true, ), - 'tagForChildren': _i2.BuilderArg<_i35.SemanticsTag?>( + 'tagForChildren': _i2.BuilderArg<_i36.SemanticsTag?>( name: 'tagForChildren', init: tagForChildren, isNamed: true, @@ -5077,22 +5096,22 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: onDismiss, isNamed: true, ), - 'onMoveCursorForwardByCharacter': _i2.BuilderArg<_i35.MoveCursorHandler?>( + 'onMoveCursorForwardByCharacter': _i2.BuilderArg<_i36.MoveCursorHandler?>( name: 'onMoveCursorForwardByCharacter', init: onMoveCursorForwardByCharacter, isNamed: true, ), - 'onMoveCursorBackwardByCharacter': _i2.BuilderArg<_i35.MoveCursorHandler?>( + 'onMoveCursorBackwardByCharacter': _i2.BuilderArg<_i36.MoveCursorHandler?>( name: 'onMoveCursorBackwardByCharacter', init: onMoveCursorBackwardByCharacter, isNamed: true, ), - 'onSetSelection': _i2.BuilderArg<_i35.SetSelectionHandler?>( + 'onSetSelection': _i2.BuilderArg<_i36.SetSelectionHandler?>( name: 'onSetSelection', init: onSetSelection, isNamed: true, ), - 'onSetText': _i2.BuilderArg<_i35.SetTextHandler?>( + 'onSetText': _i2.BuilderArg<_i36.SetTextHandler?>( name: 'onSetText', init: onSetText, isNamed: true, @@ -5107,7 +5126,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { init: onDidLoseAccessibilityFocus, isNamed: true, ), - 'customSemanticsActions': _i2.BuilderArg?>( + 'customSemanticsActions': _i2.BuilderArg?>( name: 'customSemanticsActions', init: customSemanticsActions, isNamed: true, @@ -5148,6 +5167,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { expanded: p.get('expanded').build(), maxValueLength: p.get('maxValueLength').build(), currentValueLength: p.get('currentValueLength').build(), + identifier: p.get('identifier').build(), label: p.get('label').build(), attributedLabel: p.get('attributedLabel').build(), value: p.get('value').build(), @@ -5243,7 +5263,7 @@ class Semantics$Mate extends _i1.Semantics with _i2.Mate { isNamed: true, defaultValue: false, ), - 'properties': _i2.BuilderArg<_i35.SemanticsProperties>( + 'properties': _i2.BuilderArg<_i36.SemanticsProperties>( name: 'properties', init: properties, isNamed: true, diff --git a/mate_flutter/lib/src/widgets/bottom_navigation_bar_item.dart b/mate_flutter/lib/src/widgets/bottom_navigation_bar_item.dart index d5467bcd..64160b58 100644 --- a/mate_flutter/lib/src/widgets/bottom_navigation_bar_item.dart +++ b/mate_flutter/lib/src/widgets/bottom_navigation_bar_item.dart @@ -3,13 +3,17 @@ // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:flutter/src/widgets/bottom_navigation_bar_item.dart' as _i1; import 'package:mate/mate_core.dart' as _i2; -import 'package:flutter/src/widgets/framework.dart' as _i3; -import 'dart:ui' as _i4; +import 'package:flutter/src/foundation/key.dart' as _i3; +import 'package:flutter/src/widgets/framework.dart' as _i4; +import 'dart:ui' as _i5; /// class BottomNavigationBarItem class BottomNavigationBarItem$Mate extends _i1.BottomNavigationBarItem with _i2.Mate { - /// BottomNavigationBarItem BottomNavigationBarItem({required Widget icon, String? label, Widget? activeIcon, Color? backgroundColor, String? tooltip}) + /// BottomNavigationBarItem BottomNavigationBarItem({Key? key, required Widget icon, String? label, Widget? activeIcon, Color? backgroundColor, String? tooltip}) BottomNavigationBarItem$Mate({ + /// optionalParameters: {Key? key} , default:none + super.key, + /// optionalParameters: {required Widget icon} , default:none required super.icon, @@ -25,7 +29,12 @@ class BottomNavigationBarItem$Mate extends _i1.BottomNavigationBarItem with _i2. /// optionalParameters: {String? tooltip} , default:none super.tooltip, }) : mateParams = { - 'icon': _i2.BuilderArg<_i3.Widget>( + 'key': _i2.BuilderArg<_i3.Key?>( + name: 'key', + init: key, + isNamed: true, + ), + 'icon': _i2.BuilderArg<_i4.Widget>( name: 'icon', init: icon, isNamed: true, @@ -35,12 +44,12 @@ class BottomNavigationBarItem$Mate extends _i1.BottomNavigationBarItem with _i2. init: label, isNamed: true, ), - 'activeIcon': _i2.BuilderArg<_i3.Widget?>( + 'activeIcon': _i2.BuilderArg<_i4.Widget?>( name: 'activeIcon', init: activeIcon, isNamed: true, ), - 'backgroundColor': _i2.BuilderArg<_i4.Color?>( + 'backgroundColor': _i2.BuilderArg<_i5.Color?>( name: 'backgroundColor', init: backgroundColor, isNamed: true, @@ -55,6 +64,7 @@ class BottomNavigationBarItem$Mate extends _i1.BottomNavigationBarItem with _i2. mateBuilderName = 'BottomNavigationBarItem'; matePackageUrl = 'package:flutter/cupertino.dart'; mateBuilder = (p) => BottomNavigationBarItem$Mate( + key: p.get('key').build(), icon: p.get('icon').build(), label: p.get('label').build(), activeIcon: p.get('activeIcon').build(), diff --git a/mate_flutter/lib/src/widgets/drag_target.dart b/mate_flutter/lib/src/widgets/drag_target.dart index 7d789e9e..e5a8d7ab 100644 --- a/mate_flutter/lib/src/widgets/drag_target.dart +++ b/mate_flutter/lib/src/widgets/drag_target.dart @@ -493,15 +493,9 @@ class DragTarget$Mate extends _i1.DragTarget with _i2.Mate /// optionalParameters: {required Widget Function(BuildContext, List, List) builder} , default:none required super.builder, - /// optionalParameters: {bool Function(T?)? onWillAccept} , default:none - super.onWillAccept, - /// optionalParameters: {bool Function(DragTargetDetails)? onWillAcceptWithDetails} , default:none super.onWillAcceptWithDetails, - /// optionalParameters: {void Function(T)? onAccept} , default:none - super.onAccept, - /// optionalParameters: {void Function(DragTargetDetails)? onAcceptWithDetails} , default:none super.onAcceptWithDetails, @@ -524,21 +518,11 @@ class DragTarget$Mate extends _i1.DragTarget with _i2.Mate init: builder, isNamed: true, ), - 'onWillAccept': _i2.BuilderArg<_i1.DragTargetWillAccept?>( - name: 'onWillAccept', - init: onWillAccept, - isNamed: true, - ), 'onWillAcceptWithDetails': _i2.BuilderArg<_i1.DragTargetWillAcceptWithDetails?>( name: 'onWillAcceptWithDetails', init: onWillAcceptWithDetails, isNamed: true, ), - 'onAccept': _i2.BuilderArg<_i1.DragTargetAccept?>( - name: 'onAccept', - init: onAccept, - isNamed: true, - ), 'onAcceptWithDetails': _i2.BuilderArg<_i1.DragTargetAcceptWithDetails?>( name: 'onAcceptWithDetails', init: onAcceptWithDetails, @@ -567,9 +551,7 @@ class DragTarget$Mate extends _i1.DragTarget with _i2.Mate mateBuilder = (p) => DragTarget$Mate( key: p.get('key').build(), builder: p.get('builder').build(), - onWillAccept: p.get('onWillAccept').build(), onWillAcceptWithDetails: p.get('onWillAcceptWithDetails').build(), - onAccept: p.get('onAccept').build(), onAcceptWithDetails: p.get('onAcceptWithDetails').build(), onLeave: p.get('onLeave').build(), onMove: p.get('onMove').build(), diff --git a/mate_flutter/lib/src/widgets/fade_in_image.dart b/mate_flutter/lib/src/widgets/fade_in_image.dart index c10b672c..b3f81cda 100644 --- a/mate_flutter/lib/src/widgets/fade_in_image.dart +++ b/mate_flutter/lib/src/widgets/fade_in_image.dart @@ -8,8 +8,8 @@ import 'package:flutter/src/painting/image_provider.dart' as _i4; import 'package:flutter/src/widgets/image.dart' as _i5; import 'package:flutter/src/animation/curves.dart' as _i6; import 'package:flutter/animation.dart' as _i7; -import 'package:flutter/src/painting/box_fit.dart' as _i8; -import 'dart:ui' as _i9; +import 'dart:ui' as _i8; +import 'package:flutter/src/painting/box_fit.dart' as _i9; import 'package:flutter/src/painting/alignment.dart' as _i10; import 'package:flutter/cupertino.dart' as _i11; import 'package:flutter/src/painting/decoration_image.dart' as _i12; @@ -18,7 +18,7 @@ import 'package:flutter/src/services/asset_bundle.dart' as _i14; /// class FadeInImage extends StatefulWidget class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { - /// FadeInImage FadeInImage({Key? key, required ImageProvider placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required ImageProvider image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, double? width, double? height, BoxFit? fit, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false}) + /// FadeInImage FadeInImage({Key? key, required ImageProvider placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required ImageProvider image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, Color? color, BlendMode? colorBlendMode, Color? placeholderColor, BlendMode? placeholderColorBlendMode, double? width, double? height, BoxFit? fit, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false}) FadeInImage$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -53,6 +53,18 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { /// optionalParameters: {Curve fadeInCurve = Curves.easeIn} , default:processed=PrefixedIdentifierImpl super.fadeInCurve, + /// optionalParameters: {Color? color} , default:none + super.color, + + /// optionalParameters: {BlendMode? colorBlendMode} , default:none + super.colorBlendMode, + + /// optionalParameters: {Color? placeholderColor} , default:none + super.placeholderColor, + + /// optionalParameters: {BlendMode? placeholderColorBlendMode} , default:none + super.placeholderColorBlendMode, + /// optionalParameters: {double? width} , default:none super.width, @@ -138,6 +150,26 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { isNamed: true, defaultValue: _i7.Curves.easeIn, ), + 'color': _i2.BuilderArg<_i8.Color?>( + name: 'color', + init: color, + isNamed: true, + ), + 'colorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'colorBlendMode', + init: colorBlendMode, + isNamed: true, + ), + 'placeholderColor': _i2.BuilderArg<_i8.Color?>( + name: 'placeholderColor', + init: placeholderColor, + isNamed: true, + ), + 'placeholderColorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'placeholderColorBlendMode', + init: placeholderColorBlendMode, + isNamed: true, + ), 'width': _i2.BuilderArg( name: 'width', init: width, @@ -148,23 +180,23 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { init: height, isNamed: true, ), - 'fit': _i2.BuilderArg<_i8.BoxFit?>( + 'fit': _i2.BuilderArg<_i9.BoxFit?>( name: 'fit', init: fit, isNamed: true, ), - 'placeholderFit': _i2.BuilderArg<_i8.BoxFit?>( + 'placeholderFit': _i2.BuilderArg<_i9.BoxFit?>( name: 'placeholderFit', init: placeholderFit, isNamed: true, ), - 'filterQuality': _i2.BuilderArg<_i9.FilterQuality>( + 'filterQuality': _i2.BuilderArg<_i8.FilterQuality>( name: 'filterQuality', init: filterQuality, isNamed: true, - defaultValue: _i9.FilterQuality.low, + defaultValue: _i8.FilterQuality.low, ), - 'placeholderFilterQuality': _i2.BuilderArg<_i9.FilterQuality?>( + 'placeholderFilterQuality': _i2.BuilderArg<_i8.FilterQuality?>( name: 'placeholderFilterQuality', init: placeholderFilterQuality, isNamed: true, @@ -203,6 +235,10 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { fadeOutCurve: p.get('fadeOutCurve').build(), fadeInDuration: p.get('fadeInDuration').build(), fadeInCurve: p.get('fadeInCurve').build(), + color: p.get('color').build(), + colorBlendMode: p.get('colorBlendMode').build(), + placeholderColor: p.get('placeholderColor').build(), + placeholderColorBlendMode: p.get('placeholderColorBlendMode').build(), width: p.get('width').build(), height: p.get('height').build(), fit: p.get('fit').build(), @@ -215,7 +251,7 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { ); } - /// FadeInImage FadeInImage.memoryNetwork({Key? key, required Uint8List placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required String image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, double placeholderScale = 1.0, double imageScale = 1.0, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, double? width, double? height, BoxFit? fit, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false, int? placeholderCacheWidth, int? placeholderCacheHeight, int? imageCacheWidth, int? imageCacheHeight}) + /// FadeInImage FadeInImage.memoryNetwork({Key? key, required Uint8List placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required String image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, double placeholderScale = 1.0, double imageScale = 1.0, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, double? width, double? height, BoxFit? fit, Color? color, BlendMode? colorBlendMode, Color? placeholderColor, BlendMode? placeholderColorBlendMode, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false, int? placeholderCacheWidth, int? placeholderCacheHeight, int? imageCacheWidth, int? imageCacheHeight}) FadeInImage$Mate.memoryNetwork({ /// optionalParameters: {Key? key} , default:none super.key, @@ -265,6 +301,18 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { /// optionalParameters: {BoxFit? fit} , default:none super.fit, + /// optionalParameters: {Color? color} , default:none + super.color, + + /// optionalParameters: {BlendMode? colorBlendMode} , default:none + super.colorBlendMode, + + /// optionalParameters: {Color? placeholderColor} , default:none + super.placeholderColor, + + /// optionalParameters: {BlendMode? placeholderColorBlendMode} , default:none + super.placeholderColorBlendMode, + /// optionalParameters: {BoxFit? placeholderFit} , default:none super.placeholderFit, @@ -375,23 +423,43 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { init: height, isNamed: true, ), - 'fit': _i2.BuilderArg<_i8.BoxFit?>( + 'fit': _i2.BuilderArg<_i9.BoxFit?>( name: 'fit', init: fit, isNamed: true, ), - 'placeholderFit': _i2.BuilderArg<_i8.BoxFit?>( + 'color': _i2.BuilderArg<_i8.Color?>( + name: 'color', + init: color, + isNamed: true, + ), + 'colorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'colorBlendMode', + init: colorBlendMode, + isNamed: true, + ), + 'placeholderColor': _i2.BuilderArg<_i8.Color?>( + name: 'placeholderColor', + init: placeholderColor, + isNamed: true, + ), + 'placeholderColorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'placeholderColorBlendMode', + init: placeholderColorBlendMode, + isNamed: true, + ), + 'placeholderFit': _i2.BuilderArg<_i9.BoxFit?>( name: 'placeholderFit', init: placeholderFit, isNamed: true, ), - 'filterQuality': _i2.BuilderArg<_i9.FilterQuality>( + 'filterQuality': _i2.BuilderArg<_i8.FilterQuality>( name: 'filterQuality', init: filterQuality, isNamed: true, - defaultValue: _i9.FilterQuality.low, + defaultValue: _i8.FilterQuality.low, ), - 'placeholderFilterQuality': _i2.BuilderArg<_i9.FilterQuality?>( + 'placeholderFilterQuality': _i2.BuilderArg<_i8.FilterQuality?>( name: 'placeholderFilterQuality', init: placeholderFilterQuality, isNamed: true, @@ -455,6 +523,10 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { width: p.get('width').build(), height: p.get('height').build(), fit: p.get('fit').build(), + color: p.get('color').build(), + colorBlendMode: p.get('colorBlendMode').build(), + placeholderColor: p.get('placeholderColor').build(), + placeholderColorBlendMode: p.get('placeholderColorBlendMode').build(), placeholderFit: p.get('placeholderFit').build(), filterQuality: p.get('filterQuality').build(), placeholderFilterQuality: p.get('placeholderFilterQuality').build(), @@ -468,7 +540,7 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { ); } - /// FadeInImage FadeInImage.assetNetwork({Key? key, required String placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required String image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, AssetBundle? bundle, double? placeholderScale, double imageScale = 1.0, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, double? width, double? height, BoxFit? fit, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false, int? placeholderCacheWidth, int? placeholderCacheHeight, int? imageCacheWidth, int? imageCacheHeight}) + /// FadeInImage FadeInImage.assetNetwork({Key? key, required String placeholder, Widget Function(BuildContext, Object, StackTrace?)? placeholderErrorBuilder, required String image, Widget Function(BuildContext, Object, StackTrace?)? imageErrorBuilder, AssetBundle? bundle, double? placeholderScale, double imageScale = 1.0, bool excludeFromSemantics = false, String? imageSemanticLabel, Duration fadeOutDuration = const Duration(milliseconds: 300), Curve fadeOutCurve = Curves.easeOut, Duration fadeInDuration = const Duration(milliseconds: 700), Curve fadeInCurve = Curves.easeIn, double? width, double? height, BoxFit? fit, Color? color, BlendMode? colorBlendMode, Color? placeholderColor, BlendMode? placeholderColorBlendMode, BoxFit? placeholderFit, FilterQuality filterQuality = FilterQuality.low, FilterQuality? placeholderFilterQuality, AlignmentGeometry alignment = Alignment.center, ImageRepeat repeat = ImageRepeat.noRepeat, bool matchTextDirection = false, int? placeholderCacheWidth, int? placeholderCacheHeight, int? imageCacheWidth, int? imageCacheHeight}) FadeInImage$Mate.assetNetwork({ /// optionalParameters: {Key? key} , default:none super.key, @@ -521,6 +593,18 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { /// optionalParameters: {BoxFit? fit} , default:none super.fit, + /// optionalParameters: {Color? color} , default:none + super.color, + + /// optionalParameters: {BlendMode? colorBlendMode} , default:none + super.colorBlendMode, + + /// optionalParameters: {Color? placeholderColor} , default:none + super.placeholderColor, + + /// optionalParameters: {BlendMode? placeholderColorBlendMode} , default:none + super.placeholderColorBlendMode, + /// optionalParameters: {BoxFit? placeholderFit} , default:none super.placeholderFit, @@ -635,23 +719,43 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { init: height, isNamed: true, ), - 'fit': _i2.BuilderArg<_i8.BoxFit?>( + 'fit': _i2.BuilderArg<_i9.BoxFit?>( name: 'fit', init: fit, isNamed: true, ), - 'placeholderFit': _i2.BuilderArg<_i8.BoxFit?>( + 'color': _i2.BuilderArg<_i8.Color?>( + name: 'color', + init: color, + isNamed: true, + ), + 'colorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'colorBlendMode', + init: colorBlendMode, + isNamed: true, + ), + 'placeholderColor': _i2.BuilderArg<_i8.Color?>( + name: 'placeholderColor', + init: placeholderColor, + isNamed: true, + ), + 'placeholderColorBlendMode': _i2.BuilderArg<_i8.BlendMode?>( + name: 'placeholderColorBlendMode', + init: placeholderColorBlendMode, + isNamed: true, + ), + 'placeholderFit': _i2.BuilderArg<_i9.BoxFit?>( name: 'placeholderFit', init: placeholderFit, isNamed: true, ), - 'filterQuality': _i2.BuilderArg<_i9.FilterQuality>( + 'filterQuality': _i2.BuilderArg<_i8.FilterQuality>( name: 'filterQuality', init: filterQuality, isNamed: true, - defaultValue: _i9.FilterQuality.low, + defaultValue: _i8.FilterQuality.low, ), - 'placeholderFilterQuality': _i2.BuilderArg<_i9.FilterQuality?>( + 'placeholderFilterQuality': _i2.BuilderArg<_i8.FilterQuality?>( name: 'placeholderFilterQuality', init: placeholderFilterQuality, isNamed: true, @@ -716,6 +820,10 @@ class FadeInImage$Mate extends _i1.FadeInImage with _i2.Mate { width: p.get('width').build(), height: p.get('height').build(), fit: p.get('fit').build(), + color: p.get('color').build(), + colorBlendMode: p.get('colorBlendMode').build(), + placeholderColor: p.get('placeholderColor').build(), + placeholderColorBlendMode: p.get('placeholderColorBlendMode').build(), placeholderFit: p.get('placeholderFit').build(), filterQuality: p.get('filterQuality').build(), placeholderFilterQuality: p.get('placeholderFilterQuality').build(), diff --git a/mate_flutter/lib/src/widgets/focus_manager.dart b/mate_flutter/lib/src/widgets/focus_manager.dart index f3ae8407..4eb6b58d 100644 --- a/mate_flutter/lib/src/widgets/focus_manager.dart +++ b/mate_flutter/lib/src/widgets/focus_manager.dart @@ -13,9 +13,6 @@ class FocusNode$Mate extends _i1.FocusNode with _i2.Mate { /// optionalParameters: {String? debugLabel} , default:none super.debugLabel, - /// optionalParameters: {KeyEventResult Function(FocusNode, RawKeyEvent)? onKey} , default:none - super.onKey, - /// optionalParameters: {KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent} , default:none super.onKeyEvent, @@ -36,11 +33,6 @@ class FocusNode$Mate extends _i1.FocusNode with _i2.Mate { init: debugLabel, isNamed: true, ), - 'onKey': _i2.BuilderArg<_i1.FocusOnKeyCallback?>( - name: 'onKey', - init: onKey, - isNamed: true, - ), 'onKeyEvent': _i2.BuilderArg<_i1.FocusOnKeyEventCallback?>( name: 'onKeyEvent', init: onKeyEvent, @@ -76,7 +68,6 @@ class FocusNode$Mate extends _i1.FocusNode with _i2.Mate { matePackageUrl = 'package:flutter/cupertino.dart'; mateBuilder = (p) => FocusNode$Mate( debugLabel: p.get('debugLabel').build(), - onKey: p.get('onKey').build(), onKeyEvent: p.get('onKeyEvent').build(), skipTraversal: p.get('skipTraversal').build(), canRequestFocus: p.get('canRequestFocus').build(), @@ -99,9 +90,6 @@ class FocusScopeNode$Mate extends _i1.FocusScopeNode with _i2.Mate { /// optionalParameters: {KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent} , default:none super.onKeyEvent, - /// optionalParameters: {KeyEventResult Function(FocusNode, RawKeyEvent)? onKey} , default:none - super.onKey, - /// optionalParameters: {bool skipTraversal = false} , default:processed=BooleanLiteralImpl super.skipTraversal, @@ -121,11 +109,6 @@ class FocusScopeNode$Mate extends _i1.FocusScopeNode with _i2.Mate { init: onKeyEvent, isNamed: true, ), - 'onKey': _i2.BuilderArg<_i1.FocusOnKeyCallback?>( - name: 'onKey', - init: onKey, - isNamed: true, - ), 'skipTraversal': _i2.BuilderArg( name: 'skipTraversal', init: skipTraversal, @@ -151,7 +134,6 @@ class FocusScopeNode$Mate extends _i1.FocusScopeNode with _i2.Mate { mateBuilder = (p) => FocusScopeNode$Mate( debugLabel: p.get('debugLabel').build(), onKeyEvent: p.get('onKeyEvent').build(), - onKey: p.get('onKey').build(), skipTraversal: p.get('skipTraversal').build(), canRequestFocus: p.get('canRequestFocus').build(), traversalEdgeBehavior: p.get('traversalEdgeBehavior').build(), diff --git a/mate_flutter/lib/src/widgets/focus_scope.dart b/mate_flutter/lib/src/widgets/focus_scope.dart index b1412a63..bc56ca10 100644 --- a/mate_flutter/lib/src/widgets/focus_scope.dart +++ b/mate_flutter/lib/src/widgets/focus_scope.dart @@ -33,9 +33,6 @@ class Focus$Mate extends _i1.Focus with _i2.Mate { /// optionalParameters: {KeyEventResult Function(FocusNode, KeyEvent)? onKeyEvent} , default:none super.onKeyEvent, - /// optionalParameters: {KeyEventResult Function(FocusNode, RawKeyEvent)? onKey} , default:none - super.onKey, - /// optionalParameters: {bool? canRequestFocus} , default:none super.canRequestFocus, @@ -90,11 +87,6 @@ class Focus$Mate extends _i1.Focus with _i2.Mate { init: onKeyEvent, isNamed: true, ), - 'onKey': _i2.BuilderArg<_i5.FocusOnKeyCallback?>( - name: 'onKey', - init: onKey, - isNamed: true, - ), 'canRequestFocus': _i2.BuilderArg( name: 'canRequestFocus', init: canRequestFocus, @@ -138,7 +130,6 @@ class Focus$Mate extends _i1.Focus with _i2.Mate { autofocus: p.get('autofocus').build(), onFocusChange: p.get('onFocusChange').build(), onKeyEvent: p.get('onKeyEvent').build(), - onKey: p.get('onKey').build(), canRequestFocus: p.get('canRequestFocus').build(), skipTraversal: p.get('skipTraversal').build(), descendantsAreFocusable: p.get('descendantsAreFocusable').build(), diff --git a/mate_flutter/lib/src/widgets/icon.dart b/mate_flutter/lib/src/widgets/icon.dart index 13530c1f..80fa0167 100644 --- a/mate_flutter/lib/src/widgets/icon.dart +++ b/mate_flutter/lib/src/widgets/icon.dart @@ -9,7 +9,7 @@ import 'dart:ui' as _i5; /// class Icon extends StatelessWidget class Icon$Mate extends _i1.Icon with _i2.Mate { - /// Icon Icon(IconData? icon, {Key? key, double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, List? shadows, String? semanticLabel, TextDirection? textDirection}) + /// Icon Icon(IconData? icon, {Key? key, double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, List? shadows, String? semanticLabel, TextDirection? textDirection, bool? applyTextScaling}) Icon$Mate( /// requiredParameters: IconData? icon super.icon, { @@ -42,6 +42,9 @@ class Icon$Mate extends _i1.Icon with _i2.Mate { /// optionalParameters: {TextDirection? textDirection} , default:none super.textDirection, + + /// optionalParameters: {bool? applyTextScaling} , default:none + super.applyTextScaling, }) : mateParams = { 'icon': _i2.BuilderArg<_i3.IconData?>( name: 'icon', @@ -98,6 +101,11 @@ class Icon$Mate extends _i1.Icon with _i2.Mate { init: textDirection, isNamed: true, ), + 'applyTextScaling': _i2.BuilderArg( + name: 'applyTextScaling', + init: applyTextScaling, + isNamed: true, + ), }, super() { mateBuilderName = 'Icon'; @@ -114,6 +122,7 @@ class Icon$Mate extends _i1.Icon with _i2.Mate { shadows: p.get('shadows').build(), semanticLabel: p.get('semanticLabel').build(), textDirection: p.get('textDirection').build(), + applyTextScaling: p.get('applyTextScaling').build(), ); } diff --git a/mate_flutter/lib/src/widgets/icon_data.dart b/mate_flutter/lib/src/widgets/icon_data.dart index 9a44698c..160bfcc0 100644 --- a/mate_flutter/lib/src/widgets/icon_data.dart +++ b/mate_flutter/lib/src/widgets/icon_data.dart @@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart' as _i4; /// class IconDataProperty extends DiagnosticsProperty class IconDataProperty$Mate extends _i1.IconDataProperty with _i2.Mate { - /// IconDataProperty IconDataProperty(String name, IconData? value, {String? ifNull, bool showName = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.app_info}) + /// IconDataProperty IconDataProperty(String name, IconData? value, {String? ifNull, bool showName = true, DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine, DiagnosticLevel level = DiagnosticLevel.info}) IconDataProperty$Mate( /// requiredParameters: String name super.name, @@ -24,7 +24,7 @@ class IconDataProperty$Mate extends _i1.IconDataProperty with _i2.Mate { /// optionalParameters: {DiagnosticsTreeStyle style = DiagnosticsTreeStyle.singleLine} , default:processed=PrefixedIdentifierImpl super.style, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, }) : mateParams = { 'name': _i2.BuilderArg( diff --git a/mate_flutter/lib/src/widgets/icon_theme_data.dart b/mate_flutter/lib/src/widgets/icon_theme_data.dart index 54a6de13..9443260f 100644 --- a/mate_flutter/lib/src/widgets/icon_theme_data.dart +++ b/mate_flutter/lib/src/widgets/icon_theme_data.dart @@ -7,7 +7,7 @@ import 'dart:ui' as _i3; /// class IconThemeData with Diagnosticable class IconThemeData$Mate extends _i1.IconThemeData with _i2.Mate { - /// IconThemeData IconThemeData({double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, double? opacity, List? shadows}) + /// IconThemeData IconThemeData({double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, double? opacity, List? shadows, bool? applyTextScaling}) IconThemeData$Mate({ /// optionalParameters: {double? size} , default:none super.size, @@ -32,6 +32,9 @@ class IconThemeData$Mate extends _i1.IconThemeData with _i2.Mate { /// optionalParameters: {List? shadows} , default:none super.shadows, + + /// optionalParameters: {bool? applyTextScaling} , default:none + super.applyTextScaling, }) : mateParams = { 'size': _i2.BuilderArg( name: 'size', @@ -73,6 +76,11 @@ class IconThemeData$Mate extends _i1.IconThemeData with _i2.Mate { init: shadows, isNamed: true, ), + 'applyTextScaling': _i2.BuilderArg( + name: 'applyTextScaling', + init: applyTextScaling, + isNamed: true, + ), }, super() { mateBuilderName = 'IconThemeData'; @@ -86,6 +94,7 @@ class IconThemeData$Mate extends _i1.IconThemeData with _i2.Mate { color: p.get('color').build(), opacity: p.get('opacity').build(), shadows: p.get('shadows').build(), + applyTextScaling: p.get('applyTextScaling').build(), ); } diff --git a/mate_flutter/lib/src/widgets/list_wheel_scroll_view.dart b/mate_flutter/lib/src/widgets/list_wheel_scroll_view.dart index b1f7aaa0..3eec4d56 100644 --- a/mate_flutter/lib/src/widgets/list_wheel_scroll_view.dart +++ b/mate_flutter/lib/src/widgets/list_wheel_scroll_view.dart @@ -4,10 +4,10 @@ import 'package:flutter/src/widgets/list_wheel_scroll_view.dart' as _i1; import 'package:mate/mate_core.dart' as _i2; import 'package:flutter/src/widgets/framework.dart' as _i3; -import 'package:flutter/src/painting/basic_types.dart' as _i4; -import 'package:flutter/src/widgets/scroll_physics.dart' as _i5; -import 'package:flutter/src/foundation/key.dart' as _i6; -import 'package:flutter/src/widgets/scroll_controller.dart' as _i7; +import 'package:flutter/src/widgets/scroll_controller.dart' as _i4; +import 'package:flutter/src/painting/basic_types.dart' as _i5; +import 'package:flutter/src/widgets/scroll_physics.dart' as _i6; +import 'package:flutter/src/foundation/key.dart' as _i7; import 'package:flutter/rendering.dart' as _i8; import 'package:flutter/src/foundation/basic_types.dart' as _i9; import 'dart:ui' as _i10; @@ -98,23 +98,42 @@ class ListWheelChildBuilderDelegate$Mate extends _i1.ListWheelChildBuilderDelega /// class FixedExtentScrollController extends ScrollController class FixedExtentScrollController$Mate extends _i1.FixedExtentScrollController with _i2.Mate { - /// FixedExtentScrollController FixedExtentScrollController({int initialItem = 0}) - FixedExtentScrollController$Mate( - { - /// optionalParameters: {int initialItem = 0} , default:processed=IntegerLiteralImpl - super.initialItem}) - : mateParams = { + /// FixedExtentScrollController FixedExtentScrollController({int initialItem = 0, void Function(ScrollPosition)? onAttach, void Function(ScrollPosition)? onDetach}) + FixedExtentScrollController$Mate({ + /// optionalParameters: {int initialItem = 0} , default:processed=IntegerLiteralImpl + super.initialItem, + + /// optionalParameters: {void Function(ScrollPosition)? onAttach} , default:none + super.onAttach, + + /// optionalParameters: {void Function(ScrollPosition)? onDetach} , default:none + super.onDetach, + }) : mateParams = { 'initialItem': _i2.BuilderArg( name: 'initialItem', init: initialItem, isNamed: true, defaultValue: 0, - ) + ), + 'onAttach': _i2.BuilderArg<_i4.ScrollControllerCallback?>( + name: 'onAttach', + init: onAttach, + isNamed: true, + ), + 'onDetach': _i2.BuilderArg<_i4.ScrollControllerCallback?>( + name: 'onDetach', + init: onDetach, + isNamed: true, + ), }, super() { mateBuilderName = 'FixedExtentScrollController'; matePackageUrl = 'package:flutter/cupertino.dart'; - mateBuilder = (p) => FixedExtentScrollController$Mate(initialItem: p.get('initialItem').build()); + mateBuilder = (p) => FixedExtentScrollController$Mate( + initialItem: p.get('initialItem').build(), + onAttach: p.get('onAttach').build(), + onDetach: p.get('onDetach').build(), + ); } @override @@ -166,7 +185,7 @@ class FixedExtentMetrics$Mate extends _i1.FixedExtentMetrics with _i2.Mate { init: viewportDimension, isNamed: true, ), - 'axisDirection': _i2.BuilderArg<_i4.AxisDirection>( + 'axisDirection': _i2.BuilderArg<_i5.AxisDirection>( name: 'axisDirection', init: axisDirection, isNamed: true, @@ -208,7 +227,7 @@ class FixedExtentScrollPhysics$Mate extends _i1.FixedExtentScrollPhysics with _i /// optionalParameters: {ScrollPhysics? parent} , default:none super.parent}) : mateParams = { - 'parent': _i2.BuilderArg<_i5.ScrollPhysics?>( + 'parent': _i2.BuilderArg<_i6.ScrollPhysics?>( name: 'parent', init: parent, isNamed: true, @@ -279,17 +298,17 @@ class ListWheelScrollView$Mate extends _i1.ListWheelScrollView with _i2.Mate { /// optionalParameters: {required List children} , default:none required super.children, }) : mateParams = { - 'key': _i2.BuilderArg<_i6.Key?>( + 'key': _i2.BuilderArg<_i7.Key?>( name: 'key', init: key, isNamed: true, ), - 'controller': _i2.BuilderArg<_i7.ScrollController?>( + 'controller': _i2.BuilderArg<_i4.ScrollController?>( name: 'controller', init: controller, isNamed: true, ), - 'physics': _i2.BuilderArg<_i5.ScrollPhysics?>( + 'physics': _i2.BuilderArg<_i6.ScrollPhysics?>( name: 'physics', init: physics, isNamed: true, @@ -451,17 +470,17 @@ class ListWheelScrollView$Mate extends _i1.ListWheelScrollView with _i2.Mate { /// optionalParameters: {required ListWheelChildDelegate childDelegate} , default:none required super.childDelegate, }) : mateParams = { - 'key': _i2.BuilderArg<_i6.Key?>( + 'key': _i2.BuilderArg<_i7.Key?>( name: 'key', init: key, isNamed: true, ), - 'controller': _i2.BuilderArg<_i7.ScrollController?>( + 'controller': _i2.BuilderArg<_i4.ScrollController?>( name: 'controller', init: controller, isNamed: true, ), - 'physics': _i2.BuilderArg<_i5.ScrollPhysics?>( + 'physics': _i2.BuilderArg<_i6.ScrollPhysics?>( name: 'physics', init: physics, isNamed: true, @@ -641,7 +660,7 @@ class ListWheelViewport$Mate extends _i1.ListWheelViewport with _i2.Mate { /// optionalParameters: {Clip clipBehavior = Clip.hardEdge} , default:processed=PrefixedIdentifierImpl super.clipBehavior, }) : mateParams = { - 'key': _i2.BuilderArg<_i6.Key?>( + 'key': _i2.BuilderArg<_i7.Key?>( name: 'key', init: key, isNamed: true, diff --git a/mate_flutter/lib/src/widgets/overlay.dart b/mate_flutter/lib/src/widgets/overlay.dart index 44c98dd0..8fc30f93 100644 --- a/mate_flutter/lib/src/widgets/overlay.dart +++ b/mate_flutter/lib/src/widgets/overlay.dart @@ -9,7 +9,7 @@ import 'dart:ui' as _i5; /// class OverlayEntry implements Listenable class OverlayEntry$Mate extends _i1.OverlayEntry with _i2.Mate { - /// OverlayEntry OverlayEntry({required Widget Function(BuildContext) builder, bool opaque = false, bool maintainState = false}) + /// OverlayEntry OverlayEntry({required Widget Function(BuildContext) builder, bool opaque = false, bool maintainState = false, bool canSizeOverlay = false}) OverlayEntry$Mate({ /// optionalParameters: {required Widget Function(BuildContext) builder} , default:none required super.builder, @@ -19,6 +19,9 @@ class OverlayEntry$Mate extends _i1.OverlayEntry with _i2.Mate { /// optionalParameters: {bool maintainState = false} , default:processed=BooleanLiteralImpl super.maintainState, + + /// optionalParameters: {bool canSizeOverlay = false} , default:processed=BooleanLiteralImpl + super.canSizeOverlay, }) : mateParams = { 'builder': _i2.BuilderArg<_i3.WidgetBuilder>( name: 'builder', @@ -37,6 +40,12 @@ class OverlayEntry$Mate extends _i1.OverlayEntry with _i2.Mate { isNamed: true, defaultValue: false, ), + 'canSizeOverlay': _i2.BuilderArg( + name: 'canSizeOverlay', + init: canSizeOverlay, + isNamed: true, + defaultValue: false, + ), }, super() { mateBuilderName = 'OverlayEntry'; @@ -45,6 +54,7 @@ class OverlayEntry$Mate extends _i1.OverlayEntry with _i2.Mate { builder: p.get('builder').build(), opaque: p.get('opaque').build(), maintainState: p.get('maintainState').build(), + canSizeOverlay: p.get('canSizeOverlay').build(), ); } diff --git a/mate_flutter/lib/src/widgets/page_view.dart b/mate_flutter/lib/src/widgets/page_view.dart index f59c446c..a8003d30 100644 --- a/mate_flutter/lib/src/widgets/page_view.dart +++ b/mate_flutter/lib/src/widgets/page_view.dart @@ -3,21 +3,22 @@ // ignore_for_file: no_leading_underscores_for_library_prefixes import 'package:flutter/src/widgets/page_view.dart' as _i1; import 'package:mate/mate_core.dart' as _i2; -import 'package:flutter/src/painting/basic_types.dart' as _i3; -import 'package:flutter/src/widgets/scroll_physics.dart' as _i4; -import 'package:flutter/src/foundation/key.dart' as _i5; -import 'package:flutter/cupertino.dart' as _i6; -import 'package:flutter/src/foundation/basic_types.dart' as _i7; -import 'package:flutter/src/widgets/framework.dart' as _i8; -import 'package:flutter/src/gestures/recognizer.dart' as _i9; -import 'package:flutter/gestures.dart' as _i10; -import 'dart:ui' as _i11; -import 'package:flutter/src/widgets/scroll_configuration.dart' as _i12; -import 'package:flutter/src/widgets/scroll_delegate.dart' as _i13; +import 'package:flutter/src/widgets/scroll_controller.dart' as _i3; +import 'package:flutter/src/painting/basic_types.dart' as _i4; +import 'package:flutter/src/widgets/scroll_physics.dart' as _i5; +import 'package:flutter/src/foundation/key.dart' as _i6; +import 'package:flutter/cupertino.dart' as _i7; +import 'package:flutter/src/foundation/basic_types.dart' as _i8; +import 'package:flutter/src/widgets/framework.dart' as _i9; +import 'package:flutter/src/gestures/recognizer.dart' as _i10; +import 'package:flutter/gestures.dart' as _i11; +import 'dart:ui' as _i12; +import 'package:flutter/src/widgets/scroll_configuration.dart' as _i13; +import 'package:flutter/src/widgets/scroll_delegate.dart' as _i14; /// class PageController extends ScrollController class PageController$Mate extends _i1.PageController with _i2.Mate { - /// PageController PageController({int initialPage = 0, bool keepPage = true, double viewportFraction = 1.0}) + /// PageController PageController({int initialPage = 0, bool keepPage = true, double viewportFraction = 1.0, void Function(ScrollPosition)? onAttach, void Function(ScrollPosition)? onDetach}) PageController$Mate({ /// optionalParameters: {int initialPage = 0} , default:processed=IntegerLiteralImpl super.initialPage, @@ -27,6 +28,12 @@ class PageController$Mate extends _i1.PageController with _i2.Mate { /// optionalParameters: {double viewportFraction = 1.0} , default:processed=DoubleLiteralImpl super.viewportFraction, + + /// optionalParameters: {void Function(ScrollPosition)? onAttach} , default:none + super.onAttach, + + /// optionalParameters: {void Function(ScrollPosition)? onDetach} , default:none + super.onDetach, }) : mateParams = { 'initialPage': _i2.BuilderArg( name: 'initialPage', @@ -46,6 +53,16 @@ class PageController$Mate extends _i1.PageController with _i2.Mate { isNamed: true, defaultValue: 1.0, ), + 'onAttach': _i2.BuilderArg<_i3.ScrollControllerCallback?>( + name: 'onAttach', + init: onAttach, + isNamed: true, + ), + 'onDetach': _i2.BuilderArg<_i3.ScrollControllerCallback?>( + name: 'onDetach', + init: onDetach, + isNamed: true, + ), }, super() { mateBuilderName = 'PageController'; @@ -54,6 +71,8 @@ class PageController$Mate extends _i1.PageController with _i2.Mate { initialPage: p.get('initialPage').build(), keepPage: p.get('keepPage').build(), viewportFraction: p.get('viewportFraction').build(), + onAttach: p.get('onAttach').build(), + onDetach: p.get('onDetach').build(), ); } @@ -106,7 +125,7 @@ class PageMetrics$Mate extends _i1.PageMetrics with _i2.Mate { init: viewportDimension, isNamed: true, ), - 'axisDirection': _i2.BuilderArg<_i3.AxisDirection>( + 'axisDirection': _i2.BuilderArg<_i4.AxisDirection>( name: 'axisDirection', init: axisDirection, isNamed: true, @@ -148,7 +167,7 @@ class PageScrollPhysics$Mate extends _i1.PageScrollPhysics with _i2.Mate { /// optionalParameters: {ScrollPhysics? parent} , default:none super.parent}) : mateParams = { - 'parent': _i2.BuilderArg<_i4.ScrollPhysics?>( + 'parent': _i2.BuilderArg<_i5.ScrollPhysics?>( name: 'parent', init: parent, isNamed: true, @@ -210,16 +229,16 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { /// optionalParameters: {bool padEnds = true} , default:processed=BooleanLiteralImpl super.padEnds, }) : mateParams = { - 'key': _i2.BuilderArg<_i5.Key?>( + 'key': _i2.BuilderArg<_i6.Key?>( name: 'key', init: key, isNamed: true, ), - 'scrollDirection': _i2.BuilderArg<_i3.Axis>( + 'scrollDirection': _i2.BuilderArg<_i4.Axis>( name: 'scrollDirection', init: scrollDirection, isNamed: true, - defaultValue: _i6.Axis.horizontal, + defaultValue: _i7.Axis.horizontal, ), 'reverse': _i2.BuilderArg( name: 'reverse', @@ -232,7 +251,7 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: controller, isNamed: true, ), - 'physics': _i2.BuilderArg<_i4.ScrollPhysics?>( + 'physics': _i2.BuilderArg<_i5.ScrollPhysics?>( name: 'physics', init: physics, isNamed: true, @@ -243,21 +262,21 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { isNamed: true, defaultValue: true, ), - 'onPageChanged': _i2.BuilderArg<_i7.ValueChanged?>( + 'onPageChanged': _i2.BuilderArg<_i8.ValueChanged?>( name: 'onPageChanged', init: onPageChanged, isNamed: true, ), - 'children': _i2.BuilderArg>( + 'children': _i2.BuilderArg>( name: 'children', init: children, isNamed: true, ), - 'dragStartBehavior': _i2.BuilderArg<_i9.DragStartBehavior>( + 'dragStartBehavior': _i2.BuilderArg<_i10.DragStartBehavior>( name: 'dragStartBehavior', init: dragStartBehavior, isNamed: true, - defaultValue: _i10.DragStartBehavior.start, + defaultValue: _i11.DragStartBehavior.start, ), 'allowImplicitScrolling': _i2.BuilderArg( name: 'allowImplicitScrolling', @@ -270,13 +289,13 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: restorationId, isNamed: true, ), - 'clipBehavior': _i2.BuilderArg<_i11.Clip>( + 'clipBehavior': _i2.BuilderArg<_i12.Clip>( name: 'clipBehavior', init: clipBehavior, isNamed: true, - defaultValue: _i11.Clip.hardEdge, + defaultValue: _i12.Clip.hardEdge, ), - 'scrollBehavior': _i2.BuilderArg<_i12.ScrollBehavior?>( + 'scrollBehavior': _i2.BuilderArg<_i13.ScrollBehavior?>( name: 'scrollBehavior', init: scrollBehavior, isNamed: true, @@ -359,16 +378,16 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { /// optionalParameters: {bool padEnds = true} , default:processed=BooleanLiteralImpl super.padEnds, }) : mateParams = { - 'key': _i2.BuilderArg<_i5.Key?>( + 'key': _i2.BuilderArg<_i6.Key?>( name: 'key', init: key, isNamed: true, ), - 'scrollDirection': _i2.BuilderArg<_i3.Axis>( + 'scrollDirection': _i2.BuilderArg<_i4.Axis>( name: 'scrollDirection', init: scrollDirection, isNamed: true, - defaultValue: _i6.Axis.horizontal, + defaultValue: _i7.Axis.horizontal, ), 'reverse': _i2.BuilderArg( name: 'reverse', @@ -381,7 +400,7 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: controller, isNamed: true, ), - 'physics': _i2.BuilderArg<_i4.ScrollPhysics?>( + 'physics': _i2.BuilderArg<_i5.ScrollPhysics?>( name: 'physics', init: physics, isNamed: true, @@ -392,17 +411,17 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { isNamed: true, defaultValue: true, ), - 'onPageChanged': _i2.BuilderArg<_i7.ValueChanged?>( + 'onPageChanged': _i2.BuilderArg<_i8.ValueChanged?>( name: 'onPageChanged', init: onPageChanged, isNamed: true, ), - 'itemBuilder': _i2.BuilderArg<_i8.NullableIndexedWidgetBuilder>( + 'itemBuilder': _i2.BuilderArg<_i9.NullableIndexedWidgetBuilder>( name: 'itemBuilder', init: itemBuilder, isNamed: true, ), - 'findChildIndexCallback': _i2.BuilderArg<_i13.ChildIndexGetter?>( + 'findChildIndexCallback': _i2.BuilderArg<_i14.ChildIndexGetter?>( name: 'findChildIndexCallback', init: findChildIndexCallback, isNamed: true, @@ -412,11 +431,11 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: itemCount, isNamed: true, ), - 'dragStartBehavior': _i2.BuilderArg<_i9.DragStartBehavior>( + 'dragStartBehavior': _i2.BuilderArg<_i10.DragStartBehavior>( name: 'dragStartBehavior', init: dragStartBehavior, isNamed: true, - defaultValue: _i10.DragStartBehavior.start, + defaultValue: _i11.DragStartBehavior.start, ), 'allowImplicitScrolling': _i2.BuilderArg( name: 'allowImplicitScrolling', @@ -429,13 +448,13 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: restorationId, isNamed: true, ), - 'clipBehavior': _i2.BuilderArg<_i11.Clip>( + 'clipBehavior': _i2.BuilderArg<_i12.Clip>( name: 'clipBehavior', init: clipBehavior, isNamed: true, - defaultValue: _i11.Clip.hardEdge, + defaultValue: _i12.Clip.hardEdge, ), - 'scrollBehavior': _i2.BuilderArg<_i12.ScrollBehavior?>( + 'scrollBehavior': _i2.BuilderArg<_i13.ScrollBehavior?>( name: 'scrollBehavior', init: scrollBehavior, isNamed: true, @@ -514,16 +533,16 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { /// optionalParameters: {bool padEnds = true} , default:processed=BooleanLiteralImpl super.padEnds, }) : mateParams = { - 'key': _i2.BuilderArg<_i5.Key?>( + 'key': _i2.BuilderArg<_i6.Key?>( name: 'key', init: key, isNamed: true, ), - 'scrollDirection': _i2.BuilderArg<_i3.Axis>( + 'scrollDirection': _i2.BuilderArg<_i4.Axis>( name: 'scrollDirection', init: scrollDirection, isNamed: true, - defaultValue: _i6.Axis.horizontal, + defaultValue: _i7.Axis.horizontal, ), 'reverse': _i2.BuilderArg( name: 'reverse', @@ -536,7 +555,7 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: controller, isNamed: true, ), - 'physics': _i2.BuilderArg<_i4.ScrollPhysics?>( + 'physics': _i2.BuilderArg<_i5.ScrollPhysics?>( name: 'physics', init: physics, isNamed: true, @@ -547,21 +566,21 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { isNamed: true, defaultValue: true, ), - 'onPageChanged': _i2.BuilderArg<_i7.ValueChanged?>( + 'onPageChanged': _i2.BuilderArg<_i8.ValueChanged?>( name: 'onPageChanged', init: onPageChanged, isNamed: true, ), - 'childrenDelegate': _i2.BuilderArg<_i13.SliverChildDelegate>( + 'childrenDelegate': _i2.BuilderArg<_i14.SliverChildDelegate>( name: 'childrenDelegate', init: childrenDelegate, isNamed: true, ), - 'dragStartBehavior': _i2.BuilderArg<_i9.DragStartBehavior>( + 'dragStartBehavior': _i2.BuilderArg<_i10.DragStartBehavior>( name: 'dragStartBehavior', init: dragStartBehavior, isNamed: true, - defaultValue: _i10.DragStartBehavior.start, + defaultValue: _i11.DragStartBehavior.start, ), 'allowImplicitScrolling': _i2.BuilderArg( name: 'allowImplicitScrolling', @@ -574,13 +593,13 @@ class PageView$Mate extends _i1.PageView with _i2.Mate { init: restorationId, isNamed: true, ), - 'clipBehavior': _i2.BuilderArg<_i11.Clip>( + 'clipBehavior': _i2.BuilderArg<_i12.Clip>( name: 'clipBehavior', init: clipBehavior, isNamed: true, - defaultValue: _i11.Clip.hardEdge, + defaultValue: _i12.Clip.hardEdge, ), - 'scrollBehavior': _i2.BuilderArg<_i12.ScrollBehavior?>( + 'scrollBehavior': _i2.BuilderArg<_i13.ScrollBehavior?>( name: 'scrollBehavior', init: scrollBehavior, isNamed: true, diff --git a/mate_flutter/lib/src/widgets/platform_menu_bar.dart b/mate_flutter/lib/src/widgets/platform_menu_bar.dart index 7b158960..ac58d3d2 100644 --- a/mate_flutter/lib/src/widgets/platform_menu_bar.dart +++ b/mate_flutter/lib/src/widgets/platform_menu_bar.dart @@ -148,7 +148,7 @@ class DefaultPlatformMenuDelegate$Mate extends _i1.DefaultPlatformMenuDelegate w /// class PlatformMenuBar extends StatefulWidget with DiagnosticableTreeMixin class PlatformMenuBar$Mate extends _i1.PlatformMenuBar with _i2.Mate { - /// PlatformMenuBar PlatformMenuBar({Key? key, required List menus, Widget? child, Widget? body}) + /// PlatformMenuBar PlatformMenuBar({Key? key, required List menus, Widget? child}) PlatformMenuBar$Mate({ /// optionalParameters: {Key? key} , default:none super.key, diff --git a/mate_flutter/lib/src/widgets/scroll_controller.dart b/mate_flutter/lib/src/widgets/scroll_controller.dart index bf12909a..13322268 100644 --- a/mate_flutter/lib/src/widgets/scroll_controller.dart +++ b/mate_flutter/lib/src/widgets/scroll_controller.dart @@ -69,7 +69,7 @@ class ScrollController$Mate extends _i1.ScrollController with _i2.Mate { /// class TrackingScrollController extends ScrollController class TrackingScrollController$Mate extends _i1.TrackingScrollController with _i2.Mate { - /// TrackingScrollController TrackingScrollController({double initialScrollOffset = 0.0, bool keepScrollOffset = true, String? debugLabel}) + /// TrackingScrollController TrackingScrollController({double initialScrollOffset = 0.0, bool keepScrollOffset = true, String? debugLabel, void Function(ScrollPosition)? onAttach, void Function(ScrollPosition)? onDetach}) TrackingScrollController$Mate({ /// optionalParameters: {double initialScrollOffset = 0.0} , default:processed=DoubleLiteralImpl super.initialScrollOffset, @@ -79,6 +79,12 @@ class TrackingScrollController$Mate extends _i1.TrackingScrollController with _i /// optionalParameters: {String? debugLabel} , default:none super.debugLabel, + + /// optionalParameters: {void Function(ScrollPosition)? onAttach} , default:none + super.onAttach, + + /// optionalParameters: {void Function(ScrollPosition)? onDetach} , default:none + super.onDetach, }) : mateParams = { 'initialScrollOffset': _i2.BuilderArg( name: 'initialScrollOffset', @@ -97,6 +103,16 @@ class TrackingScrollController$Mate extends _i1.TrackingScrollController with _i init: debugLabel, isNamed: true, ), + 'onAttach': _i2.BuilderArg<_i1.ScrollControllerCallback?>( + name: 'onAttach', + init: onAttach, + isNamed: true, + ), + 'onDetach': _i2.BuilderArg<_i1.ScrollControllerCallback?>( + name: 'onDetach', + init: onDetach, + isNamed: true, + ), }, super() { mateBuilderName = 'TrackingScrollController'; @@ -105,6 +121,8 @@ class TrackingScrollController$Mate extends _i1.TrackingScrollController with _i initialScrollOffset: p.get('initialScrollOffset').build(), keepScrollOffset: p.get('keepScrollOffset').build(), debugLabel: p.get('debugLabel').build(), + onAttach: p.get('onAttach').build(), + onDetach: p.get('onDetach').build(), ); } diff --git a/mate_flutter/lib/src/widgets/shortcuts.dart b/mate_flutter/lib/src/widgets/shortcuts.dart index a272dce7..2286f911 100644 --- a/mate_flutter/lib/src/widgets/shortcuts.dart +++ b/mate_flutter/lib/src/widgets/shortcuts.dart @@ -153,7 +153,7 @@ class LogicalKeySet$Mate extends _i2.LogicalKeySet with _i3.Mate { /// class ShortcutMapProperty extends DiagnosticsProperty> class ShortcutMapProperty$Mate extends _i2.ShortcutMapProperty with _i3.Mate { - /// ShortcutMapProperty ShortcutMapProperty(String name, Map value, {bool showName = true, Object defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.app_info, String? description}) + /// ShortcutMapProperty ShortcutMapProperty(String name, Map value, {bool showName = true, Object defaultValue = kNoDefaultValue, DiagnosticLevel level = DiagnosticLevel.info, String? description}) ShortcutMapProperty$Mate( /// requiredParameters: String name super.name, @@ -166,7 +166,7 @@ class ShortcutMapProperty$Mate extends _i2.ShortcutMapProperty with _i3.Mate { /// optionalParameters: {Object defaultValue = kNoDefaultValue} , default:unprocessed=SimpleIdentifierImpl super.defaultValue, - /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.app_info} , default:processed=PrefixedIdentifierImpl + /// optionalParameters: {DiagnosticLevel level = DiagnosticLevel.info} , default:processed=PrefixedIdentifierImpl super.level, /// optionalParameters: {String? description} , default:none diff --git a/mate_flutter/lib/src/widgets/tap_region.dart b/mate_flutter/lib/src/widgets/tap_region.dart index 95da1f90..c59d37df 100644 --- a/mate_flutter/lib/src/widgets/tap_region.dart +++ b/mate_flutter/lib/src/widgets/tap_region.dart @@ -44,7 +44,7 @@ class TapRegionSurface$Mate extends _i1.TapRegionSurface with _i2.Mate { /// class TapRegion extends SingleChildRenderObjectWidget class TapRegion$Mate extends _i1.TapRegion with _i2.Mate { - /// TapRegion TapRegion({Key? key, required Widget? child, bool enabled = true, HitTestBehavior behavior = HitTestBehavior.deferToChild, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, Object? groupId, String? debugLabel}) + /// TapRegion TapRegion({Key? key, required Widget? child, bool enabled = true, HitTestBehavior behavior = HitTestBehavior.deferToChild, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, Object? groupId, bool consumeOutsideTaps = false, String? debugLabel}) TapRegion$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -67,6 +67,9 @@ class TapRegion$Mate extends _i1.TapRegion with _i2.Mate { /// optionalParameters: {Object? groupId} , default:none super.groupId, + /// optionalParameters: {bool consumeOutsideTaps = false} , default:processed=BooleanLiteralImpl + super.consumeOutsideTaps, + /// optionalParameters: {String? debugLabel} , default:none super.debugLabel, }) : mateParams = { @@ -107,6 +110,12 @@ class TapRegion$Mate extends _i1.TapRegion with _i2.Mate { init: groupId, isNamed: true, ), + 'consumeOutsideTaps': _i2.BuilderArg( + name: 'consumeOutsideTaps', + init: consumeOutsideTaps, + isNamed: true, + defaultValue: false, + ), 'debugLabel': _i2.BuilderArg( name: 'debugLabel', init: debugLabel, @@ -124,6 +133,7 @@ class TapRegion$Mate extends _i1.TapRegion with _i2.Mate { onTapOutside: p.get('onTapOutside').build(), onTapInside: p.get('onTapInside').build(), groupId: p.get('groupId').build(), + consumeOutsideTaps: p.get('consumeOutsideTaps').build(), debugLabel: p.get('debugLabel').build(), ); } @@ -134,7 +144,7 @@ class TapRegion$Mate extends _i1.TapRegion with _i2.Mate { /// class RenderTapRegion extends RenderProxyBoxWithHitTestBehavior class RenderTapRegion$Mate extends _i1.RenderTapRegion with _i2.Mate { - /// RenderTapRegion RenderTapRegion({TapRegionRegistry? registry, bool enabled = true, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, HitTestBehavior behavior = HitTestBehavior.deferToChild, Object? groupId, String? debugLabel}) + /// RenderTapRegion RenderTapRegion({TapRegionRegistry? registry, bool enabled = true, bool consumeOutsideTaps = false, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, HitTestBehavior behavior = HitTestBehavior.deferToChild, Object? groupId, String? debugLabel}) RenderTapRegion$Mate({ /// optionalParameters: {TapRegionRegistry? registry} , default:none super.registry, @@ -142,6 +152,9 @@ class RenderTapRegion$Mate extends _i1.RenderTapRegion with _i2.Mate { /// optionalParameters: {bool enabled = true} , default:processed=BooleanLiteralImpl super.enabled, + /// optionalParameters: {bool consumeOutsideTaps = false} , default:processed=BooleanLiteralImpl + super.consumeOutsideTaps, + /// optionalParameters: {void Function(PointerDownEvent)? onTapOutside} , default:none super.onTapOutside, @@ -168,6 +181,12 @@ class RenderTapRegion$Mate extends _i1.RenderTapRegion with _i2.Mate { isNamed: true, defaultValue: true, ), + 'consumeOutsideTaps': _i2.BuilderArg( + name: 'consumeOutsideTaps', + init: consumeOutsideTaps, + isNamed: true, + defaultValue: false, + ), 'onTapOutside': _i2.BuilderArg<_i1.TapRegionCallback?>( name: 'onTapOutside', init: onTapOutside, @@ -201,6 +220,7 @@ class RenderTapRegion$Mate extends _i1.RenderTapRegion with _i2.Mate { mateBuilder = (p) => RenderTapRegion$Mate( registry: p.get('registry').build(), enabled: p.get('enabled').build(), + consumeOutsideTaps: p.get('consumeOutsideTaps').build(), onTapOutside: p.get('onTapOutside').build(), onTapInside: p.get('onTapInside').build(), behavior: p.get('behavior').build(), @@ -215,7 +235,7 @@ class RenderTapRegion$Mate extends _i1.RenderTapRegion with _i2.Mate { /// class TextFieldTapRegion extends TapRegion class TextFieldTapRegion$Mate extends _i1.TextFieldTapRegion with _i2.Mate { - /// TextFieldTapRegion TextFieldTapRegion({Key? key, required Widget? child, bool enabled = true, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, String? debugLabel}) + /// TextFieldTapRegion TextFieldTapRegion({Key? key, required Widget? child, bool enabled = true, void Function(PointerDownEvent)? onTapOutside, void Function(PointerDownEvent)? onTapInside, bool consumeOutsideTaps = false, String? debugLabel}) TextFieldTapRegion$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -232,6 +252,9 @@ class TextFieldTapRegion$Mate extends _i1.TextFieldTapRegion with _i2.Mate { /// optionalParameters: {void Function(PointerDownEvent)? onTapInside} , default:none super.onTapInside, + /// optionalParameters: {bool consumeOutsideTaps = false} , default:processed=BooleanLiteralImpl + super.consumeOutsideTaps, + /// optionalParameters: {String? debugLabel} , default:none super.debugLabel, }) : mateParams = { @@ -261,6 +284,12 @@ class TextFieldTapRegion$Mate extends _i1.TextFieldTapRegion with _i2.Mate { init: onTapInside, isNamed: true, ), + 'consumeOutsideTaps': _i2.BuilderArg( + name: 'consumeOutsideTaps', + init: consumeOutsideTaps, + isNamed: true, + defaultValue: false, + ), 'debugLabel': _i2.BuilderArg( name: 'debugLabel', init: debugLabel, @@ -276,6 +305,7 @@ class TextFieldTapRegion$Mate extends _i1.TextFieldTapRegion with _i2.Mate { enabled: p.get('enabled').build(), onTapOutside: p.get('onTapOutside').build(), onTapInside: p.get('onTapInside').build(), + consumeOutsideTaps: p.get('consumeOutsideTaps').build(), debugLabel: p.get('debugLabel').build(), ); } diff --git a/mate_flutter/lib/src/widgets/text_selection.dart b/mate_flutter/lib/src/widgets/text_selection.dart index 5dc478a0..f46c0ca9 100644 --- a/mate_flutter/lib/src/widgets/text_selection.dart +++ b/mate_flutter/lib/src/widgets/text_selection.dart @@ -445,7 +445,7 @@ class TextSelectionGestureDetectorBuilder$Mate extends _i1.TextSelectionGestureD /// class TextSelectionGestureDetector extends StatefulWidget class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector with _i2.Mate { - /// TextSelectionGestureDetector TextSelectionGestureDetector({Key? key, void Function()? onTapTrackStart, void Function()? onTapTrackReset, void Function(TapDragDownDetails)? onTapDown, void Function(ForcePressDetails)? onForcePressStart, void Function(ForcePressDetails)? onForcePressEnd, void Function()? onSecondaryTap, void Function(TapDownDetails)? onSecondaryTapDown, void Function(TapDragUpDetails)? onSingleTapUp, void Function()? onSingleTapCancel, void Function(LongPressStartDetails)? onSingleLongTapStart, void Function(LongPressMoveUpdateDetails)? onSingleLongTapMoveUpdate, void Function(LongPressEndDetails)? onSingleLongTapEnd, void Function(TapDragDownDetails)? onDoubleTapDown, void Function(TapDragDownDetails)? onTripleTapDown, void Function(TapDragStartDetails)? onDragSelectionStart, void Function(TapDragUpdateDetails)? onDragSelectionUpdate, void Function(TapDragEndDetails)? onDragSelectionEnd, HitTestBehavior? behavior, required Widget child}) + /// TextSelectionGestureDetector TextSelectionGestureDetector({Key? key, void Function()? onTapTrackStart, void Function()? onTapTrackReset, void Function(TapDragDownDetails)? onTapDown, void Function(ForcePressDetails)? onForcePressStart, void Function(ForcePressDetails)? onForcePressEnd, void Function()? onSecondaryTap, void Function(TapDownDetails)? onSecondaryTapDown, void Function(TapDragUpDetails)? onSingleTapUp, void Function()? onSingleTapCancel, void Function()? onUserTap, void Function(LongPressStartDetails)? onSingleLongTapStart, void Function(LongPressMoveUpdateDetails)? onSingleLongTapMoveUpdate, void Function(LongPressEndDetails)? onSingleLongTapEnd, void Function(TapDragDownDetails)? onDoubleTapDown, void Function(TapDragDownDetails)? onTripleTapDown, void Function(TapDragStartDetails)? onDragSelectionStart, void Function(TapDragUpdateDetails)? onDragSelectionUpdate, void Function(TapDragEndDetails)? onDragSelectionEnd, bool onUserTapAlwaysCalled = false, HitTestBehavior? behavior, required Widget child}) TextSelectionGestureDetector$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -477,6 +477,9 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector /// optionalParameters: {void Function()? onSingleTapCancel} , default:none super.onSingleTapCancel, + /// optionalParameters: {void Function()? onUserTap} , default:none + super.onUserTap, + /// optionalParameters: {void Function(LongPressStartDetails)? onSingleLongTapStart} , default:none super.onSingleLongTapStart, @@ -501,6 +504,9 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector /// optionalParameters: {void Function(TapDragEndDetails)? onDragSelectionEnd} , default:none super.onDragSelectionEnd, + /// optionalParameters: {bool onUserTapAlwaysCalled = false} , default:processed=BooleanLiteralImpl + super.onUserTapAlwaysCalled, + /// optionalParameters: {HitTestBehavior? behavior} , default:none super.behavior, @@ -557,6 +563,11 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector init: onSingleTapCancel, isNamed: true, ), + 'onUserTap': _i2.BuilderArg<_i19.GestureTapCallback?>( + name: 'onUserTap', + init: onUserTap, + isNamed: true, + ), 'onSingleLongTapStart': _i2.BuilderArg<_i20.GestureLongPressStartCallback?>( name: 'onSingleLongTapStart', init: onSingleLongTapStart, @@ -597,6 +608,12 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector init: onDragSelectionEnd, isNamed: true, ), + 'onUserTapAlwaysCalled': _i2.BuilderArg( + name: 'onUserTapAlwaysCalled', + init: onUserTapAlwaysCalled, + isNamed: true, + defaultValue: false, + ), 'behavior': _i2.BuilderArg<_i21.HitTestBehavior?>( name: 'behavior', init: behavior, @@ -622,6 +639,7 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector onSecondaryTapDown: p.get('onSecondaryTapDown').build(), onSingleTapUp: p.get('onSingleTapUp').build(), onSingleTapCancel: p.get('onSingleTapCancel').build(), + onUserTap: p.get('onUserTap').build(), onSingleLongTapStart: p.get('onSingleLongTapStart').build(), onSingleLongTapMoveUpdate: p.get('onSingleLongTapMoveUpdate').build(), onSingleLongTapEnd: p.get('onSingleLongTapEnd').build(), @@ -630,6 +648,7 @@ class TextSelectionGestureDetector$Mate extends _i1.TextSelectionGestureDetector onDragSelectionStart: p.get('onDragSelectionStart').build(), onDragSelectionUpdate: p.get('onDragSelectionUpdate').build(), onDragSelectionEnd: p.get('onDragSelectionEnd').build(), + onUserTapAlwaysCalled: p.get('onUserTapAlwaysCalled').build(), behavior: p.get('behavior').build(), child: p.get('child').build(), ); diff --git a/mate_flutter/lib/src/widgets/transitions.dart b/mate_flutter/lib/src/widgets/transitions.dart index c84bc0d0..7e4b490c 100644 --- a/mate_flutter/lib/src/widgets/transitions.dart +++ b/mate_flutter/lib/src/widgets/transitions.dart @@ -276,7 +276,7 @@ class RotationTransition$Mate extends _i1.RotationTransition with _i2.Mate { /// class SizeTransition extends AnimatedWidget class SizeTransition$Mate extends _i1.SizeTransition with _i2.Mate { - /// SizeTransition SizeTransition({Key? key, Axis axis = Axis.vertical, required Animation sizeFactor, double axisAlignment = 0.0, Widget? child}) + /// SizeTransition SizeTransition({Key? key, Axis axis = Axis.vertical, required Animation sizeFactor, double axisAlignment = 0.0, double? fixedCrossAxisSizeFactor, Widget? child}) SizeTransition$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -290,6 +290,9 @@ class SizeTransition$Mate extends _i1.SizeTransition with _i2.Mate { /// optionalParameters: {double axisAlignment = 0.0} , default:processed=DoubleLiteralImpl super.axisAlignment, + /// optionalParameters: {double? fixedCrossAxisSizeFactor} , default:none + super.fixedCrossAxisSizeFactor, + /// optionalParameters: {Widget? child} , default:none super.child, }) : mateParams = { @@ -315,6 +318,11 @@ class SizeTransition$Mate extends _i1.SizeTransition with _i2.Mate { isNamed: true, defaultValue: 0.0, ), + 'fixedCrossAxisSizeFactor': _i2.BuilderArg( + name: 'fixedCrossAxisSizeFactor', + init: fixedCrossAxisSizeFactor, + isNamed: true, + ), 'child': _i2.BuilderArg<_i6.Widget?>( name: 'child', init: child, @@ -329,6 +337,7 @@ class SizeTransition$Mate extends _i1.SizeTransition with _i2.Mate { axis: p.get('axis').build(), sizeFactor: p.get('sizeFactor').build(), axisAlignment: p.get('axisAlignment').build(), + fixedCrossAxisSizeFactor: p.get('fixedCrossAxisSizeFactor').build(), child: p.get('child').build(), ); } diff --git a/mate_flutter/lib/src/widgets/undo_history.dart b/mate_flutter/lib/src/widgets/undo_history.dart index a802fefe..413a5bf0 100644 --- a/mate_flutter/lib/src/widgets/undo_history.dart +++ b/mate_flutter/lib/src/widgets/undo_history.dart @@ -10,7 +10,7 @@ import 'package:flutter/src/widgets/framework.dart' as _i6; /// class UndoHistory extends StatefulWidget class UndoHistory$Mate extends _i1.UndoHistory with _i2.Mate { - /// UndoHistory UndoHistory({Key? key, bool Function(T?, T)? shouldChangeUndoStack, required ValueNotifier value, required void Function(T) onTriggered, required FocusNode focusNode, UndoHistoryController? controller, required Widget child}) + /// UndoHistory UndoHistory({Key? key, bool Function(T?, T)? shouldChangeUndoStack, required ValueNotifier value, required void Function(T) onTriggered, required FocusNode focusNode, T Function(T)? undoStackModifier, UndoHistoryController? controller, required Widget child}) UndoHistory$Mate({ /// optionalParameters: {Key? key} , default:none super.key, @@ -27,6 +27,9 @@ class UndoHistory$Mate extends _i1.UndoHistory with _i2.Mate { /// optionalParameters: {required FocusNode focusNode} , default:none required super.focusNode, + /// optionalParameters: {T Function(T)? undoStackModifier} , default:none + super.undoStackModifier, + /// optionalParameters: {UndoHistoryController? controller} , default:none super.controller, @@ -62,6 +65,11 @@ class UndoHistory$Mate extends _i1.UndoHistory with _i2.Mate { init: focusNode, isNamed: true, ), + 'undoStackModifier': _i2.BuilderArg( + name: 'undoStackModifier', + init: undoStackModifier, + isNamed: true, + ), 'controller': _i2.BuilderArg<_i1.UndoHistoryController?>( name: 'controller', init: controller, @@ -82,6 +90,7 @@ class UndoHistory$Mate extends _i1.UndoHistory with _i2.Mate { value: p.get('value').build(), onTriggered: p.get('onTriggered').build(), focusNode: p.get('focusNode').build(), + undoStackModifier: p.get('undoStackModifier').build(), controller: p.get('controller').build(), child: p.get('child').build(), ); diff --git a/mate_flutter/lib/src/widgets/view.dart b/mate_flutter/lib/src/widgets/view.dart index c68f8514..efec8ca5 100644 --- a/mate_flutter/lib/src/widgets/view.dart +++ b/mate_flutter/lib/src/widgets/view.dart @@ -58,7 +58,7 @@ class ViewCollection$Mate extends _i1.ViewCollection with _i2.Mate { super.key, /// optionalParameters: {required List views = const []} , default:unprocessed=ListLiteralImpl - super.views, + required super.views, }) : mateParams = { 'key': _i2.BuilderArg<_i3.Key?>( name: 'key', @@ -76,7 +76,7 @@ class ViewCollection$Mate extends _i1.ViewCollection with _i2.Mate { matePackageUrl = 'package:flutter/cupertino.dart'; mateBuilder = (p) => ViewCollection$Mate( key: p.get('key').build(), - views: p.get('views').build(), + views: p.get('views').build() as List<_i5.Widget>, ); } diff --git a/mate_flutter/tools/gen_mates.dart b/mate_flutter/tools/gen_mates.dart index b4091454..36bc6573 100644 --- a/mate_flutter/tools/gen_mates.dart +++ b/mate_flutter/tools/gen_mates.dart @@ -342,10 +342,13 @@ bool classFilter(ClassElement clazz) { !clazz.name.startsWith("_") && !clazz.library.typeProvider.isNonSubtypableClass(clazz) && clazz.constructors.where(constructorFilter).isNotEmpty && + !clazz.isFinal && // This application cannot tree shake icons fonts. It has non-constant instances of IconData at the following locations: // file:///Users/cccc/git/chen56/note/mate_flutter/lib/src/widgets/icon_data.dart:30:23 // Target web_release_bundle failed: Exception: Avoid non-constant invocations of IconData or try to build again with --no-tree-shake-icons. - !clazz.name.endsWith("IconData"); + !clazz.name.endsWith("IconData") && + //这个类有个结构参数，暂时不支持了，mate模式准备放弃(Offset, TextPosition)? startLocation + !clazz.name.contains("RawFloatingCursorPoint"); } bool libFilter(LibraryElement lib) { diff --git a/note/lib/note.dart b/note/lib/note.dart index da07b514..8c29c7a3 100644 --- a/note/lib/note.dart +++ b/note/lib/note.dart @@ -1,19 +1,4 @@ library note; -export 'src/note_core.dart' - show - NoteSystem, - Note, - NotePage, - NoteContent, - Outline, - OutlineNode, - NoteContentWidgetMixin, - Pen, - NoteCell, - NoteSourceData, - DeferredNotePageBuilder, - NoteContentExt, - NoteContentExts, - NoteContentArg; -export 'src/content_builtin.dart' show MarkdownPenExtension, WidgetContent; +export 'src/note_core.dart' show NoteSystem, Note, NotePage, NoteContent, Outline, OutlineNode, NoteContentWidgetMixin, Pen, NoteCell, NoteSourceData, DeferredNotePageBuilder, NoteContentExt, NoteContentExts, NoteContentArg; +export 'src/content_builtin.dart' show MarkdownPenExtension, WidgetContent, WindowContent; diff --git a/note/lib/src/content_builtin.dart b/note/lib/src/content_builtin.dart index ab3692aa..af38baa4 100644 --- a/note/lib/src/content_builtin.dart +++ b/note/lib/src/content_builtin.dart @@ -234,3 +234,57 @@ class _PreBuilder extends MarkdownElementBuilder { ); } } + +/// 我们约束child为tight模式，以模仿最外层窗口 +class WindowContent extends StatelessWidget { + final Widget? child; + final double? width; + final double? height; + final String title; + + WindowContent({ + super.key, + this.title = "模仿窗口固定宽高限制", + double? width, + double? height, + this.child, + }) : width = (width == null || width == double.infinity) ? 400 : width, + height = (height == null || height == double.infinity) ? 50 : height; + + /// call() == withChild copy + WindowContent call(Widget child) { + return WindowContent( + key: key, + width: width, + height: height, + child: child, + ); + } + + WindowContent withChild(Widget child) { + return WindowContent( + key: key, + child: child, + ); + } + + @override + Widget build(BuildContext context) { + return Card( + child: Column( + children: [ + AppBar( + title: Text(title), + leading: IconButton(icon: const Icon(Icons.fullscreen_exit), onPressed: () {}), + actions: [ + IconButton(icon: const Icon(Icons.fullscreen_exit), onPressed: () {}), + IconButton(icon: const Icon(Icons.fullscreen), onPressed: () {}), + ], + ), + // Column是无限高，但我们约束child为tight模式，以模仿窗口 + ConstrainedBox(constraints: BoxConstraints.tightFor(width: width, height: height), child: child), + ], + ), + ); + } +} diff --git a/spaces/flutter_note/lib/notes.g.dart b/spaces/flutter_note/lib/notes.g.dart index 67e8ba07..83860745 100644 --- a/spaces/flutter_note/lib/notes.g.dart +++ b/spaces/flutter_note/lib/notes.g.dart @@ -3,7 +3,7 @@ import 'package:note/note.dart'; // Generated by gen_maters.dart, please don't edit! // ignore_for_file: library_prefixes, non_constant_identifier_names -import 'package:flutter_note/notes/1.welcome/note.dart' deferred as welcome_;import 'package:flutter_note/notes/1.welcome/note.g.dart' as welcome_g;import 'package:flutter_note/notes/cheatsheet_draft/async/note.dart' deferred as cheatsheet_draft_async_;import 'package:flutter_note/notes/cheatsheet_draft/async/note.g.dart' as cheatsheet_draft_async_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/bar/note.dart' deferred as cheatsheet_draft_container_widgets_bar_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/bar/note.g.dart' as cheatsheet_draft_container_widgets_bar_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/menu/note.dart' deferred as cheatsheet_draft_container_widgets_menu_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/menu/note.g.dart' as cheatsheet_draft_container_widgets_menu_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/navigation/adaptive_navigation/note.dart' deferred as cheatsheet_draft_container_widgets_navigation_adaptive_navigation_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/navigation/adaptive_navigation/note.g.dart' as cheatsheet_draft_container_widgets_navigation_adaptive_navigation_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/scrollable/Dismissible/note.dart' deferred as cheatsheet_draft_container_widgets_scrollable_Dismissible_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/scrollable/Dismissible/note.g.dart' as cheatsheet_draft_container_widgets_scrollable_Dismissible_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/assets/note.dart' deferred as cheatsheet_draft_media_assets_file_assets_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/assets/note.g.dart' as cheatsheet_draft_media_assets_file_assets_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/file/note.dart' deferred as cheatsheet_draft_media_assets_file_file_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/file/note.g.dart' as cheatsheet_draft_media_assets_file_file_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/icon/note.dart' deferred as cheatsheet_draft_media_assets_file_icon_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/icon/note.g.dart' as cheatsheet_draft_media_assets_file_icon_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/ButtonStyleButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_ButtonStyleButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/ButtonStyleButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_ButtonStyleButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/FloatingActionButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_FloatingActionButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/FloatingActionButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_FloatingActionButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/IconButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_IconButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/IconButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_IconButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/input/note.dart' deferred as cheatsheet_draft_specific_widgets_input_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/input/note.g.dart' as cheatsheet_draft_specific_widgets_input_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/selectable/note.dart' deferred as cheatsheet_draft_specific_widgets_selectable_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/selectable/note.g.dart' as cheatsheet_draft_specific_widgets_selectable_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/slider/note.dart' deferred as cheatsheet_draft_specific_widgets_slider_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/slider/note.g.dart' as cheatsheet_draft_specific_widgets_slider_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/RichText/note.dart' deferred as cheatsheet_draft_specific_widgets_text_RichText_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/RichText/note.g.dart' as cheatsheet_draft_specific_widgets_text_RichText_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/Text/note.dart' deferred as cheatsheet_draft_specific_widgets_text_Text_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/Text/note.g.dart' as cheatsheet_draft_specific_widgets_text_Text_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/webview/note.dart' deferred as cheatsheet_draft_specific_widgets_webview_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/webview/note.g.dart' as cheatsheet_draft_specific_widgets_webview_g;import 'package:flutter_note/notes/cheatsheet_draft/style&theming/material3/note.dart' deferred as cheatsheet_draft_style_theming_material3_;import 'package:flutter_note/notes/cheatsheet_draft/style&theming/material3/note.g.dart' as cheatsheet_draft_style_theming_material3_g;import 'package:flutter_note/notes/cheetsheet/container/bar/note.dart' deferred as cheetsheet_container_bar_;import 'package:flutter_note/notes/cheetsheet/container/bar/note.g.dart' as cheetsheet_container_bar_g;import 'package:flutter_note/notes/cheetsheet/specific/button/note.dart' deferred as cheetsheet_specific_button_;import 'package:flutter_note/notes/cheetsheet/specific/button/note.g.dart' as cheetsheet_specific_button_g;import 'package:flutter_note/notes/core_concepts/layout/constraints/note.dart' deferred as core_concepts_layout_constraints_;import 'package:flutter_note/notes/core_concepts/layout/constraints/note.g.dart' as core_concepts_layout_constraints_g;import 'package:flutter_note/notes/core_concepts/layout/note.dart' deferred as core_concepts_layout_;import 'package:flutter_note/notes/core_concepts/layout/note.g.dart' as core_concepts_layout_g;import 'package:flutter_note/notes/core_concepts/layout/old/layout/note.dart' deferred as core_concepts_layout_old_layout_;import 'package:flutter_note/notes/core_concepts/layout/old/layout/note.g.dart' as core_concepts_layout_old_layout_g;import 'package:flutter_note/notes/core_concepts/navigation/note.dart' deferred as core_concepts_navigation_;import 'package:flutter_note/notes/core_concepts/navigation/note.g.dart' as core_concepts_navigation_g;import 'package:flutter_note/notes/core_concepts/state/1.vanilla_state/note.dart' deferred as core_concepts_state_vanilla_state_;import 'package:flutter_note/notes/core_concepts/state/1.vanilla_state/note.g.dart' as core_concepts_state_vanilla_state_g;import 'package:flutter_note/notes/core_concepts/state/note.dart' deferred as core_concepts_state_;import 'package:flutter_note/notes/core_concepts/state/note.g.dart' as core_concepts_state_g;import 'package:flutter_note/notes/core_concepts/state/StatefulBuilder/note.dart' deferred as core_concepts_state_StatefulBuilder_;import 'package:flutter_note/notes/core_concepts/state/StatefulBuilder/note.g.dart' as core_concepts_state_StatefulBuilder_g;import 'package:flutter_note/notes/dev/debug/note.dart' deferred as dev_debug_;import 'package:flutter_note/notes/dev/debug/note.g.dart' as dev_debug_g;import 'package:flutter_note/notes/dev/devtool/note.dart' deferred as dev_devtool_;import 'package:flutter_note/notes/dev/devtool/note.g.dart' as dev_devtool_g;import 'package:flutter_note/notes/dev/devtool/vmservice/note.dart' deferred as dev_devtool_vmservice_;import 'package:flutter_note/notes/dev/devtool/vmservice/note.g.dart' as dev_devtool_vmservice_g;import 'package:flutter_note/notes/dev/host_mirror/note.dart' deferred as dev_host_mirror_;import 'package:flutter_note/notes/dev/host_mirror/note.g.dart' as dev_host_mirror_g;import 'package:flutter_note/notes/dev/macos_config/note.dart' deferred as dev_macos_config_;import 'package:flutter_note/notes/dev/macos_config/note.g.dart' as dev_macos_config_g;import 'package:flutter_note/notes/Improve_app/1.overview/note.dart' deferred as Improve_app_overview_;import 'package:flutter_note/notes/Improve_app/1.overview/note.g.dart' as Improve_app_overview_g;import 'package:flutter_note/notes/Improve_app/note.dart' deferred as Improve_app_;import 'package:flutter_note/notes/Improve_app/note.g.dart' as Improve_app_g;import 'package:flutter_note/notes/Improve_app/web_optimization/note.dart' deferred as Improve_app_web_optimization_;import 'package:flutter_note/notes/Improve_app/web_optimization/note.g.dart' as Improve_app_web_optimization_g;import 'package:flutter_note/notes/note.dart' deferred as root_;import 'package:flutter_note/notes/note.g.dart' as root_g;import 'package:flutter_note/notes/pure_dart/analyzer/note.dart' deferred as pure_dart_analyzer_;import 'package:flutter_note/notes/pure_dart/analyzer/note.g.dart' as pure_dart_analyzer_g;import 'package:flutter_note/notes/pure_dart/dart3/note.dart' deferred as pure_dart_dart3_;import 'package:flutter_note/notes/pure_dart/dart3/note.g.dart' as pure_dart_dart3_g;import 'package:flutter_note/notes/pure_dart/execption/note.dart' deferred as pure_dart_execption_;import 'package:flutter_note/notes/pure_dart/execption/note.g.dart' as pure_dart_execption_g;import 'package:flutter_note/notes/pure_dart/serialization_json/note.dart' deferred as pure_dart_serialization_json_;import 'package:flutter_note/notes/pure_dart/serialization_json/note.g.dart' as pure_dart_serialization_json_g;import 'package:flutter_note/notes/research/remote_view/note.dart' deferred as research_remote_view_;import 'package:flutter_note/notes/research/remote_view/note.g.dart' as research_remote_view_g;import 'package:flutter_note/notes/thinking_in_ui/readable_html_vs_dart/note.dart' deferred as thinking_in_ui_readable_html_vs_dart_;import 'package:flutter_note/notes/thinking_in_ui/readable_html_vs_dart/note.g.dart' as thinking_in_ui_readable_html_vs_dart_g;import 'package:flutter_note/notes/z.note_inside/app_info/note.dart' deferred as z_note_inside_app_info_;import 'package:flutter_note/notes/z.note_inside/app_info/note.g.dart' as z_note_inside_app_info_g;import 'package:flutter_note/notes/z.note_inside/how_note_work/note.dart' deferred as z_note_inside_how_note_work_;import 'package:flutter_note/notes/z.note_inside/how_note_work/note.g.dart' as z_note_inside_how_note_work_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/nobody/note.dart' deferred as z_note_inside_note_test_self_nobody_;import 'package:flutter_note/notes/z.note_inside/note_test_self/nobody/note.g.dart' as z_note_inside_note_test_self_nobody_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/note.dart' deferred as z_note_inside_note_test_self_;import 'package:flutter_note/notes/z.note_inside/note_test_self/note.g.dart' as z_note_inside_note_test_self_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/temp/note.dart' deferred as z_note_inside_note_test_self_temp_;import 'package:flutter_note/notes/z.note_inside/note_test_self/temp/note.g.dart' as z_note_inside_note_test_self_temp_g;import 'package:flutter_note/notes/z.note_inside/research_parameterized_example/note.dart' deferred as z_note_inside_research_parameterized_example_;import 'package:flutter_note/notes/z.note_inside/research_parameterized_example/note.g.dart' as z_note_inside_research_parameterized_example_g; +import 'package:flutter_note/notes/1.welcome/note.dart' deferred as welcome_;import 'package:flutter_note/notes/1.welcome/note.g.dart' as welcome_g;import 'package:flutter_note/notes/cheatsheet_draft/async/note.dart' deferred as cheatsheet_draft_async_;import 'package:flutter_note/notes/cheatsheet_draft/async/note.g.dart' as cheatsheet_draft_async_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/bar/note.dart' deferred as cheatsheet_draft_container_widgets_bar_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/bar/note.g.dart' as cheatsheet_draft_container_widgets_bar_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/menu/note.dart' deferred as cheatsheet_draft_container_widgets_menu_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/menu/note.g.dart' as cheatsheet_draft_container_widgets_menu_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/navigation/adaptive_navigation/note.dart' deferred as cheatsheet_draft_container_widgets_navigation_adaptive_navigation_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/navigation/adaptive_navigation/note.g.dart' as cheatsheet_draft_container_widgets_navigation_adaptive_navigation_g;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/scrollable/Dismissible/note.dart' deferred as cheatsheet_draft_container_widgets_scrollable_Dismissible_;import 'package:flutter_note/notes/cheatsheet_draft/container_widgets/scrollable/Dismissible/note.g.dart' as cheatsheet_draft_container_widgets_scrollable_Dismissible_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/assets/note.dart' deferred as cheatsheet_draft_media_assets_file_assets_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/assets/note.g.dart' as cheatsheet_draft_media_assets_file_assets_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/file/note.dart' deferred as cheatsheet_draft_media_assets_file_file_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/file/note.g.dart' as cheatsheet_draft_media_assets_file_file_g;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/icon/note.dart' deferred as cheatsheet_draft_media_assets_file_icon_;import 'package:flutter_note/notes/cheatsheet_draft/media&assets&file/icon/note.g.dart' as cheatsheet_draft_media_assets_file_icon_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/ButtonStyleButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_ButtonStyleButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/ButtonStyleButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_ButtonStyleButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/FloatingActionButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_FloatingActionButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/FloatingActionButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_FloatingActionButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/IconButton/note.dart' deferred as cheatsheet_draft_specific_widgets_button_IconButton_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/button/IconButton/note.g.dart' as cheatsheet_draft_specific_widgets_button_IconButton_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/input/note.dart' deferred as cheatsheet_draft_specific_widgets_input_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/input/note.g.dart' as cheatsheet_draft_specific_widgets_input_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/selectable/note.dart' deferred as cheatsheet_draft_specific_widgets_selectable_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/selectable/note.g.dart' as cheatsheet_draft_specific_widgets_selectable_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/slider/note.dart' deferred as cheatsheet_draft_specific_widgets_slider_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/slider/note.g.dart' as cheatsheet_draft_specific_widgets_slider_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/RichText/note.dart' deferred as cheatsheet_draft_specific_widgets_text_RichText_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/RichText/note.g.dart' as cheatsheet_draft_specific_widgets_text_RichText_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/Text/note.dart' deferred as cheatsheet_draft_specific_widgets_text_Text_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/text/Text/note.g.dart' as cheatsheet_draft_specific_widgets_text_Text_g;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/webview/note.dart' deferred as cheatsheet_draft_specific_widgets_webview_;import 'package:flutter_note/notes/cheatsheet_draft/specific_widgets/webview/note.g.dart' as cheatsheet_draft_specific_widgets_webview_g;import 'package:flutter_note/notes/cheatsheet_draft/style&theming/material3/note.dart' deferred as cheatsheet_draft_style_theming_material3_;import 'package:flutter_note/notes/cheatsheet_draft/style&theming/material3/note.g.dart' as cheatsheet_draft_style_theming_material3_g;import 'package:flutter_note/notes/cheetsheet/container/bar/note.dart' deferred as cheetsheet_container_bar_;import 'package:flutter_note/notes/cheetsheet/container/bar/note.g.dart' as cheetsheet_container_bar_g;import 'package:flutter_note/notes/cheetsheet/specific/button/note.dart' deferred as cheetsheet_specific_button_;import 'package:flutter_note/notes/cheetsheet/specific/button/note.g.dart' as cheetsheet_specific_button_g;import 'package:flutter_note/notes/core_concepts/layout/box/note.dart' deferred as core_concepts_layout_box_;import 'package:flutter_note/notes/core_concepts/layout/box/note.g.dart' as core_concepts_layout_box_g;import 'package:flutter_note/notes/core_concepts/layout/constraints/note.dart' deferred as core_concepts_layout_constraints_;import 'package:flutter_note/notes/core_concepts/layout/constraints/note.g.dart' as core_concepts_layout_constraints_g;import 'package:flutter_note/notes/core_concepts/layout/note.dart' deferred as core_concepts_layout_;import 'package:flutter_note/notes/core_concepts/layout/note.g.dart' as core_concepts_layout_g;import 'package:flutter_note/notes/core_concepts/layout/old/layout/note.dart' deferred as core_concepts_layout_old_layout_;import 'package:flutter_note/notes/core_concepts/layout/old/layout/note.g.dart' as core_concepts_layout_old_layout_g;import 'package:flutter_note/notes/core_concepts/navigation/note.dart' deferred as core_concepts_navigation_;import 'package:flutter_note/notes/core_concepts/navigation/note.g.dart' as core_concepts_navigation_g;import 'package:flutter_note/notes/core_concepts/state/1.vanilla_state/note.dart' deferred as core_concepts_state_vanilla_state_;import 'package:flutter_note/notes/core_concepts/state/1.vanilla_state/note.g.dart' as core_concepts_state_vanilla_state_g;import 'package:flutter_note/notes/core_concepts/state/note.dart' deferred as core_concepts_state_;import 'package:flutter_note/notes/core_concepts/state/note.g.dart' as core_concepts_state_g;import 'package:flutter_note/notes/core_concepts/state/StatefulBuilder/note.dart' deferred as core_concepts_state_StatefulBuilder_;import 'package:flutter_note/notes/core_concepts/state/StatefulBuilder/note.g.dart' as core_concepts_state_StatefulBuilder_g;import 'package:flutter_note/notes/dev/debug/note.dart' deferred as dev_debug_;import 'package:flutter_note/notes/dev/debug/note.g.dart' as dev_debug_g;import 'package:flutter_note/notes/dev/devtool/note.dart' deferred as dev_devtool_;import 'package:flutter_note/notes/dev/devtool/note.g.dart' as dev_devtool_g;import 'package:flutter_note/notes/dev/devtool/vmservice/note.dart' deferred as dev_devtool_vmservice_;import 'package:flutter_note/notes/dev/devtool/vmservice/note.g.dart' as dev_devtool_vmservice_g;import 'package:flutter_note/notes/dev/host_mirror/note.dart' deferred as dev_host_mirror_;import 'package:flutter_note/notes/dev/host_mirror/note.g.dart' as dev_host_mirror_g;import 'package:flutter_note/notes/dev/macos_config/note.dart' deferred as dev_macos_config_;import 'package:flutter_note/notes/dev/macos_config/note.g.dart' as dev_macos_config_g;import 'package:flutter_note/notes/Improve_app/1.overview/note.dart' deferred as Improve_app_overview_;import 'package:flutter_note/notes/Improve_app/1.overview/note.g.dart' as Improve_app_overview_g;import 'package:flutter_note/notes/Improve_app/note.dart' deferred as Improve_app_;import 'package:flutter_note/notes/Improve_app/note.g.dart' as Improve_app_g;import 'package:flutter_note/notes/Improve_app/web_optimization/note.dart' deferred as Improve_app_web_optimization_;import 'package:flutter_note/notes/Improve_app/web_optimization/note.g.dart' as Improve_app_web_optimization_g;import 'package:flutter_note/notes/note.dart' deferred as root_;import 'package:flutter_note/notes/note.g.dart' as root_g;import 'package:flutter_note/notes/pure_dart/analyzer/note.dart' deferred as pure_dart_analyzer_;import 'package:flutter_note/notes/pure_dart/analyzer/note.g.dart' as pure_dart_analyzer_g;import 'package:flutter_note/notes/pure_dart/dart3/note.dart' deferred as pure_dart_dart3_;import 'package:flutter_note/notes/pure_dart/dart3/note.g.dart' as pure_dart_dart3_g;import 'package:flutter_note/notes/pure_dart/execption/note.dart' deferred as pure_dart_execption_;import 'package:flutter_note/notes/pure_dart/execption/note.g.dart' as pure_dart_execption_g;import 'package:flutter_note/notes/pure_dart/serialization_json/note.dart' deferred as pure_dart_serialization_json_;import 'package:flutter_note/notes/pure_dart/serialization_json/note.g.dart' as pure_dart_serialization_json_g;import 'package:flutter_note/notes/research/remote_view/note.dart' deferred as research_remote_view_;import 'package:flutter_note/notes/research/remote_view/note.g.dart' as research_remote_view_g;import 'package:flutter_note/notes/thinking_in_ui/readable_html_vs_dart/note.dart' deferred as thinking_in_ui_readable_html_vs_dart_;import 'package:flutter_note/notes/thinking_in_ui/readable_html_vs_dart/note.g.dart' as thinking_in_ui_readable_html_vs_dart_g;import 'package:flutter_note/notes/z.note_inside/app_info/note.dart' deferred as z_note_inside_app_info_;import 'package:flutter_note/notes/z.note_inside/app_info/note.g.dart' as z_note_inside_app_info_g;import 'package:flutter_note/notes/z.note_inside/how_note_work/note.dart' deferred as z_note_inside_how_note_work_;import 'package:flutter_note/notes/z.note_inside/how_note_work/note.g.dart' as z_note_inside_how_note_work_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/nobody/note.dart' deferred as z_note_inside_note_test_self_nobody_;import 'package:flutter_note/notes/z.note_inside/note_test_self/nobody/note.g.dart' as z_note_inside_note_test_self_nobody_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/note.dart' deferred as z_note_inside_note_test_self_;import 'package:flutter_note/notes/z.note_inside/note_test_self/note.g.dart' as z_note_inside_note_test_self_g;import 'package:flutter_note/notes/z.note_inside/note_test_self/temp/note.dart' deferred as z_note_inside_note_test_self_temp_;import 'package:flutter_note/notes/z.note_inside/note_test_self/temp/note.g.dart' as z_note_inside_note_test_self_temp_g;import 'package:flutter_note/notes/z.note_inside/research_parameterized_example/note.dart' deferred as z_note_inside_research_parameterized_example_;import 'package:flutter_note/notes/z.note_inside/research_parameterized_example/note.g.dart' as z_note_inside_research_parameterized_example_g; abstract class BaseNotes { static final Note rootroot = Note.root(); @@ -17,6 +17,7 @@ abstract class BaseNotes { final Note z_note_inside_note_test_self_temp = put("/z.note_inside/note_test_self/temp",z_note_inside_note_test_self_temp_g.noteInfo(), (note) async => note.loadPage(builder:await z_note_inside_note_test_self_temp_.loadLibrary().then((value) => z_note_inside_note_test_self_temp_.build))); final Note z_note_inside_note_test_self_nobody = put("/z.note_inside/note_test_self/nobody",z_note_inside_note_test_self_nobody_g.noteInfo(), (note) async => note.loadPage(builder:await z_note_inside_note_test_self_nobody_.loadLibrary().then((value) => z_note_inside_note_test_self_nobody_.build))); final Note z_note_inside_note_test_self = put("/z.note_inside/note_test_self",z_note_inside_note_test_self_g.noteInfo(), (note) async => note.loadPage(builder:await z_note_inside_note_test_self_.loadLibrary().then((value) => z_note_inside_note_test_self_.build))); + final Note core_concepts_layout_box = put("/core_concepts/layout/box",core_concepts_layout_box_g.noteInfo(), (note) async => note.loadPage(builder:await core_concepts_layout_box_.loadLibrary().then((value) => core_concepts_layout_box_.build))); final Note core_concepts_layout_constraints = put("/core_concepts/layout/constraints",core_concepts_layout_constraints_g.noteInfo(), (note) async => note.loadPage(builder:await core_concepts_layout_constraints_.loadLibrary().then((value) => core_concepts_layout_constraints_.build))); final Note core_concepts_layout_old_layout = put("/core_concepts/layout/old/layout",core_concepts_layout_old_layout_g.noteInfo(), (note) async => note.loadPage(builder:await core_concepts_layout_old_layout_.loadLibrary().then((value) => core_concepts_layout_old_layout_.build))); final Note core_concepts_layout = put("/core_concepts/layout",core_concepts_layout_g.noteInfo(), (note) async => note.loadPage(builder:await core_concepts_layout_.loadLibrary().then((value) => core_concepts_layout_.build))); diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.dart new file mode 100644 index 00000000..407d8759 --- /dev/null +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.dart @@ -0,0 +1,64 @@ +// ignore_for_file: prefer_const_constructors + +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:note/note.dart'; + +build(BuildContext context, Pen print) { + print.markdown(r''' +# box layout + +## 常用 + +垂直&水平排列的组件 +Column ,Row, ListView + +对齐 +Center,Align + + '''); + + print(WindowContent()(LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return ColoredBox( + color: Colors.red, + child: Text(" $constraints"), + ); + }))); + print(WindowContent()(LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return Text(" $constraints"); + }))); + + print(WindowContent( + width: 100000, + )(LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return SizedBox.square( + dimension: 10000, + child: Text("$constraints"), + ); + }))); + print(WindowContent( + height: 100, + width: 10000, + )(LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return ListView( + + children: [ + // Expanded(child: Icon(Icons.add, size: 100)), + // Expanded(child: Icon(Icons.add, size: 100)), + LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return Text(" $constraints"); + }), + Align(alignment:Alignment.bottomRight ,child: LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return Text(" $constraints"); + }),), + Align(alignment:Alignment.bottomRight ,child: Icon(Icons.add, size: 100),), + Icon(Icons.add, size: 100), + Icon(Icons.add, size: 100), + LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) { + return Text(" $constraints"); + }), + // Container(height: double.infinity,width: 100, color: Colors.red,) + ], + ); + }))); +} diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.g.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.g.dart new file mode 100644 index 00000000..5fb100d8 --- /dev/null +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/box/note.g.dart @@ -0,0 +1,41 @@ +// /// Generated by gen_maters.dart, please don't edit! + +noteInfo() => ( + cells: [ + /// () + ( + cellType: 'header', + offset: 0, + end: 202, + specialNodes: <({ + String nodeType, + int end, + int offset, + })>[], + ), + + /// (print.markdown(r''' # box layo, print(WindowContent()(LayoutBu, print(WindowContent()(LayoutBu, print(WindowContent(width: 100, print(WindowContent(height: 10) + ( + cellType: 'body', + offset: 202, + end: 1875, + specialNodes: <({ + String nodeType, + int end, + int offset, + })>[], + ), + + /// () + ( + cellType: 'tail', + offset: 1875, + end: 1877, + specialNodes: <({ + String nodeType, + int end, + int offset, + })>[], + ) + ], + ); diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.dart index 4ac38634..be6b3fec 100644 --- a/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.dart +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.dart @@ -59,7 +59,7 @@ ${BoxConstraints.tightFor(width: 600, height: 800)} BoxConstraints的print结果中： w是width,h是height '''); - print(WindowContent(width: 400, height: 500)( + print(WindowContent()( LayoutBuilder(builder: (context, constraints) { return Text("WindowContent: ${constraints}"); }), @@ -91,59 +91,3 @@ BoxConstraints(w=1103.0, h=566.0) // w是width,h是height '''); BoxConstraints.tightFor(width: 1, height: 2); } - -class WindowContent extends StatelessWidget { - final Widget? child; - final BoxConstraints constraints; - - WindowContent({ - super.key, - double width = 600, - double height = 200, - this.child, - }) : constraints = BoxConstraints.tightFor(width: width, height: height); - - /// call() == withChild copy - WindowContent call(Widget child) { - return WindowContent( - key: key, - width: constraints.maxWidth, - height: constraints.maxHeight, - child: child, - ); - } - - WindowContent withChild(Widget child) { - return WindowContent( - key: key, - width: constraints.maxWidth, - height: constraints.maxHeight, - child: child, - ); - } - - @override - Widget build(BuildContext context) { - return ConstrainedBox( - constraints: constraints, - child: Card( - child: Column( - children: [ - AppBar( - title: Text("模仿Windows"), - leading: IconButton(icon: const Icon(Icons.fullscreen_exit), onPressed: () {}), - actions: [ - IconButton(icon: const Icon(Icons.fullscreen_exit), onPressed: () {}), - IconButton(icon: const Icon(Icons.fullscreen), onPressed: () {}), - ], - ), - // ConstrainedBox( - // constraints: constraints, - // child: child, - // ), - ], - ), - ), - ); - } -} diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.g.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.g.dart index 28590fa3..65b865ef 100644 --- a/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.g.dart +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/constraints/note.g.dart @@ -18,7 +18,7 @@ noteInfo() => ( ( cellType: 'body', offset: 161, - end: 2430, + end: 2407, specialNodes: <({ String nodeType, int end, @@ -29,8 +29,8 @@ noteInfo() => ( /// () ( cellType: 'tail', - offset: 2430, - end: 3847, + offset: 2407, + end: 2409, specialNodes: <({ String nodeType, int end, diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/note.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/note.dart index 8306285b..5bb6f4e6 100644 --- a/spaces/flutter_note/lib/notes/core_concepts/layout/note.dart +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/note.dart @@ -5,5 +5,9 @@ import 'package:flutter/material.dart'; import 'package:note/note.dart'; build(BuildContext context, Pen print) { - + StatefulBuilder( + builder: (BuildContext context, StateSetter setState) { + return Text("data"); + }, + ); } diff --git a/spaces/flutter_note/lib/notes/core_concepts/layout/note.g.dart b/spaces/flutter_note/lib/notes/core_concepts/layout/note.g.dart index 5d3a2fa4..35527e80 100644 --- a/spaces/flutter_note/lib/notes/core_concepts/layout/note.g.dart +++ b/spaces/flutter_note/lib/notes/core_concepts/layout/note.g.dart @@ -14,11 +14,11 @@ noteInfo() => ( })>[], ), - /// () + /// (StatefulBuilder(builder: (Buil) ( cellType: 'body', offset: 202, - end: 204, + end: 321, specialNodes: <({ String nodeType, int end, @@ -29,8 +29,8 @@ noteInfo() => ( /// () ( cellType: 'tail', - offset: 204, - end: 206, + offset: 321, + end: 323, specialNodes: <({ String nodeType, int end, diff --git a/spaces/flutter_note/pubspec.yaml b/spaces/flutter_note/pubspec.yaml index 60882be6..b7710ba8 100644 --- a/spaces/flutter_note/pubspec.yaml +++ b/spaces/flutter_note/pubspec.yaml @@ -116,6 +116,7 @@ flutter: - lib/notes/Improve_app/ - lib/notes/Improve_app/1.overview/ - lib/notes/Improve_app/web_optimization/ + - lib/notes/core_concepts/layout/box/ # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware diff --git a/test/bake2_test.bash b/test/bake2_test.bash index 0b515091..aeb27977 100755 --- a/test/bake2_test.bash +++ b/test/bake2_test.bash @@ -407,14 +407,12 @@ test.data.children(){ test.bake._opt_cmd_chain_opts(){ assert "$(bake._opt_cmd_chain_opts "_root")" @is \ "_root/opts/debug -_root/opts/help -_root/opts/verbose" +_root/opts/help" # "include parent option" assert "$(bake._opt_cmd_chain_opts "bake.@opt")" @is \ "_root/opts/debug _root/opts/help -_root/opts/verbose bake.@opt/opts/abbr bake.@opt/opts/cmd bake.@opt/opts/default