mate_flutter项目修正编译错误，暂时不用了

chen56 · Mar 26, 2024 · fb48986 · fb48986
1 parent 1608039
commit fb48986
Show file tree

Hide file tree

Showing 74 changed files with 1,662 additions and 538 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<Duration?>(
+            name: 'duration',
+            init: duration,
+            isNamed: true,
+          ),
+          'reverseCurve': _i2.BuilderArg<_i3.Curve?>(
+            name: 'reverseCurve',
+            init: reverseCurve,
+            isNamed: true,
+          ),
+          'reverseDuration': _i2.BuilderArg<Duration?>(
+            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<String, _i2.BuilderArg> mateParams;
+}
diff --git 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
@@ -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<Shadow>? shadows})
+  /// CupertinoIconThemeData CupertinoIconThemeData({double? size, double? fill, double? weight, double? grade, double? opticalSize, Color? color, double? opacity, List<Shadow>? 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<Shadow>? shadows} , default:none
     super.shadows,
+
+    /// optionalParameters: {bool? applyTextScaling} , default:none
+    super.applyTextScaling,
   })  : mateParams = {
           'size': _i2.BuilderArg<double?>(
             name: 'size',
@@ -73,6 +76,11 @@ class CupertinoIconThemeData$Mate extends _i1.CupertinoIconThemeData with _i2.Ma
             init: shadows,
             isNamed: true,
           ),
+          'applyTextScaling': _i2.BuilderArg<bool?>(
+            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(),
         );
   }