upgrade dart2 to dart3

Panway · Mar 27, 2024 · 2246ace · 2246ace
1 parent 2c9afc7
commit 2246ace
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 117 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,7 +31,6 @@
 /build/
 
 # Web related
-lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
diff --git a/README.md b/README.md
@@ -1,7 +1,13 @@
-# flutter_blog
+## flutter_blog
+
 我山寨的[苹果官网 demo](https://panway.github.io/flutter_blog)，右边是原生页面，可以看到用flutter同时适配PC和手机宽度都不是问题
 ![flutterdemo.gif](https://upload-images.jianshu.io/upload_images/530140-5bdf95690f87552f.gif?imageMogr2/auto-orient/strip)
 
+编译成web：
+
+``` bash
+flutter build web
+```
 ## Getting Started
 
 This project is a starting point for a Flutter application.

diff --git a/lib/main.dart b/lib/main.dart
@@ -26,7 +26,7 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
+  MyHomePage({Key? key, this.title = ''}) : super(key: key);
 
   final String title;
 
@@ -248,7 +248,11 @@ class _MyHomePageState extends State<MyHomePage> {
 }
 
 class Product {
-  const Product({this.imageURL, this.title, this.subTitle, this.desc});
+  const Product(
+      {this.imageURL = "",
+      this.title = '',
+      this.subTitle = '',
+      this.desc = ''});
   final String imageURL;
   final String title;
   final String subTitle;
@@ -258,21 +262,24 @@ class Product {
 typedef void CartChangedCallback(Product product, bool lightBackground);
 
 class ShoppingListItem extends StatelessWidget {
-  ShoppingListItem(
-      {Product product,
-      this.lightBackground,
-      this.fullWidth,
-      this.imagePadding,
-      this.onCartChanged})
-      : product = product,
+  ShoppingListItem({
+    required Product product,
+    this.lightBackground = true,
+    this.fullWidth = false,
+    this.imagePadding = const EdgeInsets.all(0.0),
+    CartChangedCallback? onCartChanged, // 将onCartChanged设置为可选的命名参数并声明为可空类型
+  })  : product = product,
+        onCartChanged = onCartChanged ?? _defaultCartChanged, // 设置默认值
         super(key: ObjectKey(product));
 
   final Product product;
   final bool lightBackground;
   final bool fullWidth;
   final EdgeInsetsGeometry imagePadding;
   final CartChangedCallback onCartChanged;
-
+  static void _defaultCartChanged(Product product, bool lightBackground) {
+    // 设置默认的onCartChanged回调函数
+  }
   @override
   Widget build(BuildContext context) {
     print("======" + product.subTitle.length.toString());
@@ -333,7 +340,7 @@ class ShoppingListItem extends StatelessWidget {
                 ),
               ),
             ),
-            _ppText(null),
+            _ppText(""),
             _ppText(product.subTitle,
                 padding: const EdgeInsets.only(top: 5.0),
                 fontSize: 15.0,
@@ -375,10 +382,10 @@ class ShoppingListItem extends StatelessWidget {
   }
 
   Widget _ppText(String text,
-      {Color textColor,
-      Color backgroundColor,
-      double fontSize,
-      EdgeInsetsGeometry padding}) {
+      {Color textColor = Colors.black,
+      Color backgroundColor = Colors.transparent,
+      double fontSize = 16.0,
+      EdgeInsetsGeometry padding = const EdgeInsets.all(8.0)}) {
     if (text != null && text.length > 0) {
       return Padding(
         // color: Colors.green,

diff --git a/pubspec.lock b/pubspec.lock
@@ -1,69 +1,62 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  archive:
-    dependency: transitive
-    description:
-      name: archive
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.11"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.2"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.5"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.2"
-  collection:
+    version: "2.1.1"
+  characters:
     dependency: transitive
     description:
-      name: collection
-      url: "https://pub.dartlang.org"
+      name: characters
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.14.11"
-  convert:
+    version: "1.3.0"
+  clock:
     dependency: transitive
     description:
-      name: convert
-      url: "https://pub.dartlang.org"
+      name: clock
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
-  crypto:
+    version: "1.1.1"
+  collection:
     dependency: transitive
     description:
-      name: crypto
-      url: "https://pub.dartlang.org"
+      name: collection
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "1.18.0"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.6"
+  fake_async:
+    dependency: transitive
+    description:
+      name: fake_async
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "1.3.1"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -74,55 +67,38 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  image:
+  matcher:
     dependency: transitive
     description:
-      name: image
-      url: "https://pub.dartlang.org"
+      name: matcher
+      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
-  matcher:
+    version: "0.12.16"
+  material_color_utilities:
     dependency: transitive
     description:
-      name: matcher
-      url: "https://pub.dartlang.org"
+      name: material_color_utilities
+      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.6"
+    version: "0.5.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.8"
+    version: "1.10.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.6.4"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.0+1"
-  petitparser:
-    dependency: transitive
-    description:
-      name: petitparser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.4.0"
-  quiver:
-    dependency: transitive
-    description:
-      name: quiver
-      url: "https://pub.dartlang.org"
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "1.8.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -132,64 +108,65 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.5.5"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.9.3"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.11"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.6"
+    version: "0.6.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.8"
-  xml:
+    version: "2.1.4"
+  web:
     dependency: transitive
     description:
-      name: xml
-      url: "https://pub.dartlang.org"
+      name: web
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
+      url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "0.3.0"
 sdks:
-  dart: ">=2.4.0 <3.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -14,15 +14,15 @@ description: A new Flutter project.
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
   flutter:
     sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^0.1.2
+  cupertino_icons: ^1.0.6
 
 dev_dependencies:
   flutter_test: