Skip to content

Commit

Permalink
update flutter 3.13
Browse files Browse the repository at this point in the history
  • Loading branch information
chen56 committed Sep 8, 2023
1 parent 8f37013 commit 71025ae
Show file tree
Hide file tree
Showing 93 changed files with 3,595 additions and 473 deletions.
22 changes: 20 additions & 2 deletions bake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o pipefail # default pipeline status==last command status, If set, status=
#set -o nounset # -u: don't use it ,it is crazy, 1.bash version is diff Behavior 2.we need like this: ${arr[@]+"${arr[@]}"}

# v0.2.20230525 - It can run normally on macos
# todo
# todo
# 1. sub cmd help not work
# 2. cmd help use @cmd define?
# 3. split to common bash script , can use git tree use it
Expand Down Expand Up @@ -775,18 +775,36 @@ run.macos() {
flutter_note flutter run --device-id macos "$@"
}

build() {
build.web_canvaskit() {
flutter_note flutter build web -v \
--release --tree-shake-icons \
--web-renderer canvaskit "$@"
}
build.web_html() {
flutter_note flutter build web -v \
--release --tree-shake-icons \
--web-renderer html "$@"
}

# skwasm无法运行
build.web_skwasm() {
flutter_note flutter build web -v \
--release --tree-shake-icons \
--web-renderer skwasm "$@"
}

preview.web() {
# http-server 不支持base href设置,所以单独build,并设置base-href为"/",而github-pages的base-href必须是repository名
build "$@"
# npx http-server ./flutter_note/build/web --port 8000
_exec flutter_note deno run --allow-env --allow-read --allow-sys --allow-net npm:http-server ./build/web --port 8000 -g --brotli
}
web.serve() {
# http-server 不支持base href设置,所以单独build,并设置base-href为"/",而github-pages的base-href必须是repository名
# build "$@"
# npx http-server ./flutter_note/build/web --port 8000
_exec flutter_note deno run --allow-env --allow-read --allow-sys --allow-net npm:http-server ./build/web --port 8000 -g --brotli
}
preview.macos() (
_exec flutter_note flutter build macos -v \
--release --tree-shake-icons "$@"
Expand Down
1 change: 1 addition & 0 deletions mate_flutter/lib/foundation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ export 'src/foundation/serialization.dart';
export 'src/foundation/service_extensions.dart';
export 'src/foundation/stack_frame.dart';
export 'src/foundation/synchronous_future.dart';
export 'src/foundation/timeline.dart';
export 'src/foundation/unicode.dart';
6 changes: 5 additions & 1 deletion mate_flutter/lib/mate_enums.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ EnumRegister registerEnum() {
result.register(_i3.PointerChange.values);
result.register(_i3.PointerDeviceKind.values);
result.register(_i3.PointerSignalKind.values);
result.register(_i3.PointerPreferredStylusAuxiliaryAction.values);
result.register(_i3.FontStyle.values);
result.register(_i3.TextAlign.values);
result.register(_i3.TextBaseline.values);
Expand Down Expand Up @@ -119,10 +118,12 @@ EnumRegister registerEnum() {
result.register(_i6.ScrollDecelerationRate.values);
result.register(_i6.ScrollPositionAlignmentPolicy.values);
result.register(_i6.ScrollViewKeyboardDismissBehavior.values);
result.register(_i6.DiagonalDragBehavior.values);
result.register(_i6.ScrollIncrementType.values);
result.register(_i6.ScrollbarOrientation.values);
result.register(_i6.SnapshotMode.values);
result.register(_i6.ClipboardStatus.values);
result.register(_i6.LiveTextInputStatus.values);
result.register(_i6.TextSelectionHandleType.values);
result.register(_i6.FlexFit.values);
result.register(_i6.MainAxisSize.values);
Expand Down Expand Up @@ -186,13 +187,15 @@ EnumRegister registerEnum() {
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);
Expand All @@ -201,5 +204,6 @@ EnumRegister registerEnum() {
result.register(_i13.TooltipTriggerMode.values);
result.register(_i13.ScriptCategory.values);
result.register(_i14.Direction.values);
result.register(_i14.Variant.values);
return result;
}
2 changes: 2 additions & 0 deletions mate_flutter/lib/rendering.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export 'src/rendering/custom_layout.dart';
export 'src/rendering/custom_paint.dart';
export 'src/rendering/debug.dart';
export 'src/rendering/debug_overflow_indicator.dart';
export 'src/rendering/decorated_sliver.dart';
export 'src/rendering/editable.dart';
export 'src/rendering/error.dart';
export 'src/rendering/flex.dart';
Expand All @@ -34,6 +35,7 @@ export 'src/rendering/sliver.dart';
export 'src/rendering/sliver_fill.dart';
export 'src/rendering/sliver_fixed_extent_list.dart';
export 'src/rendering/sliver_grid.dart';
export 'src/rendering/sliver_group.dart';
export 'src/rendering/sliver_list.dart';
export 'src/rendering/sliver_multi_box_adaptor.dart';
export 'src/rendering/sliver_padding.dart';
Expand Down
1 change: 1 addition & 0 deletions mate_flutter/lib/services.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export 'src/services/hardware_keyboard.dart';
export 'src/services/keyboard_inserted_content.dart';
export 'src/services/keyboard_key.g.dart';
export 'src/services/keyboard_maps.g.dart';
export 'src/services/live_text.dart';
export 'src/services/message_codec.dart';
export 'src/services/message_codecs.dart';
export 'src/services/mouse_cursor.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class CupertinoAdaptiveTextSelectionToolbar$Mate extends _i1.CupertinoAdaptiveTe
);
}

/// CupertinoAdaptiveTextSelectionToolbar CupertinoAdaptiveTextSelectionToolbar.editable({Key? key, required ClipboardStatus clipboardStatus, required void Function()? onCopy, required void Function()? onCut, required void Function()? onPaste, required void Function()? onSelectAll, required TextSelectionToolbarAnchors anchors})
/// CupertinoAdaptiveTextSelectionToolbar CupertinoAdaptiveTextSelectionToolbar.editable({Key? key, required ClipboardStatus clipboardStatus, required void Function()? onCopy, required void Function()? onCut, required void Function()? onPaste, required void Function()? onSelectAll, required void Function()? onLiveTextInput, required TextSelectionToolbarAnchors anchors})
CupertinoAdaptiveTextSelectionToolbar$Mate.editable({
/// optionalParameters: {Key? key} , default:none
super.key,
Expand All @@ -108,6 +108,9 @@ class CupertinoAdaptiveTextSelectionToolbar$Mate extends _i1.CupertinoAdaptiveTe
/// optionalParameters: {required void Function()? onSelectAll} , default:none
required super.onSelectAll,

/// optionalParameters: {required void Function()? onLiveTextInput} , default:none
required super.onLiveTextInput,

/// optionalParameters: {required TextSelectionToolbarAnchors anchors} , default:none
required super.anchors,
}) : mateParams = {
Expand Down Expand Up @@ -141,6 +144,11 @@ class CupertinoAdaptiveTextSelectionToolbar$Mate extends _i1.CupertinoAdaptiveTe
init: onSelectAll,
isNamed: true,
),
'onLiveTextInput': _i2.BuilderArg<_i8.VoidCallback?>(
name: 'onLiveTextInput',
init: onLiveTextInput,
isNamed: true,
),
'anchors': _i2.BuilderArg<_i5.TextSelectionToolbarAnchors>(
name: 'anchors',
init: anchors,
Expand All @@ -157,6 +165,7 @@ class CupertinoAdaptiveTextSelectionToolbar$Mate extends _i1.CupertinoAdaptiveTe
onCut: p.get('onCut').build(),
onPaste: p.get('onPaste').build(),
onSelectAll: p.get('onSelectAll').build(),
onLiveTextInput: p.get('onLiveTextInput').build(),
anchors: p.get('anchors').build(),
);
}
Expand Down
22 changes: 20 additions & 2 deletions mate_flutter/lib/src/cupertino/date_picker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:flutter/src/painting/alignment.dart' as _i8;

/// class CupertinoDatePicker extends StatefulWidget
class CupertinoDatePicker$Mate extends _i1.CupertinoDatePicker with _i2.Mate {
/// CupertinoDatePicker CupertinoDatePicker({Key? key, CupertinoDatePickerMode mode = CupertinoDatePickerMode.dateAndTime, required void Function(DateTime) onDateTimeChanged, DateTime? initialDateTime, DateTime? minimumDate, DateTime? maximumDate, int minimumYear = 1, int? maximumYear, int minuteInterval = 1, bool use24hFormat = false, DatePickerDateOrder? dateOrder, Color? backgroundColor, bool showDayOfWeek = false})
/// CupertinoDatePicker CupertinoDatePicker({Key? key, CupertinoDatePickerMode mode = CupertinoDatePickerMode.dateAndTime, required void Function(DateTime) onDateTimeChanged, DateTime? initialDateTime, DateTime? minimumDate, DateTime? maximumDate, int minimumYear = 1, int? maximumYear, int minuteInterval = 1, bool use24hFormat = false, DatePickerDateOrder? dateOrder, Color? backgroundColor, bool showDayOfWeek = false, double itemExtent = _kItemExtent})
CupertinoDatePicker$Mate({
/// optionalParameters: {Key? key} , default:none
super.key,
Expand Down Expand Up @@ -52,6 +52,9 @@ class CupertinoDatePicker$Mate extends _i1.CupertinoDatePicker with _i2.Mate {

/// optionalParameters: {bool showDayOfWeek = false} , default:processed=BooleanLiteralImpl
super.showDayOfWeek,

/// optionalParameters: {double itemExtent = _kItemExtent} , default:unprocessed=SimpleIdentifierImpl
super.itemExtent,
}) : mateParams = {
'key': _i2.BuilderArg<_i3.Key?>(
name: 'key',
Expand Down Expand Up @@ -123,6 +126,11 @@ class CupertinoDatePicker$Mate extends _i1.CupertinoDatePicker with _i2.Mate {
isNamed: true,
defaultValue: false,
),
'itemExtent': _i2.BuilderArg<double>(
name: 'itemExtent',
init: itemExtent,
isNamed: true,
),
},
super() {
mateBuilderName = 'CupertinoDatePicker';
Expand All @@ -141,6 +149,7 @@ class CupertinoDatePicker$Mate extends _i1.CupertinoDatePicker with _i2.Mate {
dateOrder: p.get('dateOrder').build(),
backgroundColor: p.get('backgroundColor').build(),
showDayOfWeek: p.get('showDayOfWeek').build(),
itemExtent: p.get('itemExtent').build(),
);
}

Expand All @@ -150,7 +159,7 @@ class CupertinoDatePicker$Mate extends _i1.CupertinoDatePicker with _i2.Mate {

/// class CupertinoTimerPicker extends StatefulWidget
class CupertinoTimerPicker$Mate extends _i1.CupertinoTimerPicker with _i2.Mate {
/// CupertinoTimerPicker CupertinoTimerPicker({Key? key, CupertinoTimerPickerMode mode = CupertinoTimerPickerMode.hms, Duration initialTimerDuration = Duration.zero, int minuteInterval = 1, int secondInterval = 1, AlignmentGeometry alignment = Alignment.center, Color? backgroundColor, required void Function(Duration) onTimerDurationChanged})
/// CupertinoTimerPicker CupertinoTimerPicker({Key? key, CupertinoTimerPickerMode mode = CupertinoTimerPickerMode.hms, Duration initialTimerDuration = Duration.zero, int minuteInterval = 1, int secondInterval = 1, AlignmentGeometry alignment = Alignment.center, Color? backgroundColor, double itemExtent = _kItemExtent, required void Function(Duration) onTimerDurationChanged})
CupertinoTimerPicker$Mate({
/// optionalParameters: {Key? key} , default:none
super.key,
Expand All @@ -173,6 +182,9 @@ class CupertinoTimerPicker$Mate extends _i1.CupertinoTimerPicker with _i2.Mate {
/// optionalParameters: {Color? backgroundColor} , default:none
super.backgroundColor,

/// optionalParameters: {double itemExtent = _kItemExtent} , default:unprocessed=SimpleIdentifierImpl
super.itemExtent,

/// optionalParameters: {required void Function(Duration) onTimerDurationChanged} , default:none
required super.onTimerDurationChanged,
}) : mateParams = {
Expand Down Expand Up @@ -216,6 +228,11 @@ class CupertinoTimerPicker$Mate extends _i1.CupertinoTimerPicker with _i2.Mate {
init: backgroundColor,
isNamed: true,
),
'itemExtent': _i2.BuilderArg<double>(
name: 'itemExtent',
init: itemExtent,
isNamed: true,
),
'onTimerDurationChanged': _i2.BuilderArg<_i5.ValueChanged<Duration>>(
name: 'onTimerDurationChanged',
init: onTimerDurationChanged,
Expand All @@ -233,6 +250,7 @@ class CupertinoTimerPicker$Mate extends _i1.CupertinoTimerPicker with _i2.Mate {
secondInterval: p.get('secondInterval').build(),
alignment: p.get('alignment').build(),
backgroundColor: p.get('backgroundColor').build(),
itemExtent: p.get('itemExtent').build(),
onTimerDurationChanged: p.get('onTimerDurationChanged').build(),
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import 'package:flutter/src/widgets/context_menu_button_item.dart' as _i6;
/// class CupertinoDesktopTextSelectionToolbarButton extends StatefulWidget
class CupertinoDesktopTextSelectionToolbarButton$Mate extends _i1.CupertinoDesktopTextSelectionToolbarButton
with _i2.Mate {
/// CupertinoDesktopTextSelectionToolbarButton CupertinoDesktopTextSelectionToolbarButton({Key? key, required void Function() onPressed, required Widget child})
/// CupertinoDesktopTextSelectionToolbarButton CupertinoDesktopTextSelectionToolbarButton({Key? key, required void Function()? onPressed, required Widget child})
CupertinoDesktopTextSelectionToolbarButton$Mate({
/// optionalParameters: {Key? key} , default:none
super.key,

/// optionalParameters: {required void Function() onPressed} , default:none
/// optionalParameters: {required void Function()? onPressed} , default:none
required super.onPressed,

/// optionalParameters: {required Widget child} , default:none
Expand All @@ -27,7 +27,7 @@ class CupertinoDesktopTextSelectionToolbarButton$Mate extends _i1.CupertinoDeskt
init: key,
isNamed: true,
),
'onPressed': _i2.BuilderArg<_i4.VoidCallback>(
'onPressed': _i2.BuilderArg<_i4.VoidCallback?>(
name: 'onPressed',
init: onPressed,
isNamed: true,
Expand All @@ -48,36 +48,28 @@ class CupertinoDesktopTextSelectionToolbarButton$Mate extends _i1.CupertinoDeskt
);
}

/// CupertinoDesktopTextSelectionToolbarButton CupertinoDesktopTextSelectionToolbarButton.text({Key? key, required BuildContext context, required void Function() onPressed, required String text})
/// CupertinoDesktopTextSelectionToolbarButton CupertinoDesktopTextSelectionToolbarButton.text({Key? key, required void Function()? onPressed, required String? text})
CupertinoDesktopTextSelectionToolbarButton$Mate.text({
/// optionalParameters: {Key? key} , default:none
super.key,

/// optionalParameters: {required BuildContext context} , default:none
required super.context,

/// optionalParameters: {required void Function() onPressed} , default:none
/// optionalParameters: {required void Function()? onPressed} , default:none
required super.onPressed,

/// optionalParameters: {required String text} , default:none
/// optionalParameters: {required String? text} , default:none
required super.text,
}) : mateParams = {
'key': _i2.BuilderArg<_i3.Key?>(
name: 'key',
init: key,
isNamed: true,
),
'context': _i2.BuilderArg<_i5.BuildContext>(
name: 'context',
init: context,
isNamed: true,
),
'onPressed': _i2.BuilderArg<_i4.VoidCallback>(
'onPressed': _i2.BuilderArg<_i4.VoidCallback?>(
name: 'onPressed',
init: onPressed,
isNamed: true,
),
'text': _i2.BuilderArg<String>(
'text': _i2.BuilderArg<String?>(
name: 'text',
init: text,
isNamed: true,
Expand All @@ -88,7 +80,6 @@ class CupertinoDesktopTextSelectionToolbarButton$Mate extends _i1.CupertinoDeskt
matePackageUrl = 'package:flutter/cupertino.dart';
mateBuilder = (p) => CupertinoDesktopTextSelectionToolbarButton$Mate.text(
key: p.get('key').build(),
context: p.get('context').build(),
onPressed: p.get('onPressed').build(),
text: p.get('text').build(),
);
Expand Down
Loading

0 comments on commit 71025ae

Please sign in to comment.